From a49a6a80a76b2642232b887dd646a255cf5eaa4e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 18:16:01 +0800
Subject: [PATCH] changes
---
dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 2
dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java | 19 +++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 6 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 37 ++++++++++-
dao/src/main/java/com/sandu/ximon/dao/domain/C3mCharging.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 32 +++++++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 4
dao/src/main/resources/mapper/C3mChargingMapper.xml | 24 ++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 7 +
10 files changed, 105 insertions(+), 30 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mCharging.java b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mCharging.java
index 193878e..b41a11d 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mCharging.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mCharging.java
@@ -56,6 +56,8 @@
*/
private LocalDateTime updateTime;
+ private LocalDateTime createTime;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
index 0be2cf4..8607ab3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
@@ -20,14 +20,14 @@
* 璇虹摝-鑺傜洰鍒楄〃
*/
//鍒涘缓鏃堕棿
- LED_N_PROGRAM_CREATE_TIME("create_date"),
+ LED_N_PROGRAM_CREATE_TIME("create_time"),
/**
* 璇虹摝-鎾斁璁″垝鍒楄〃
*/
//鍒涘缓鏃堕棿
- LED_N_PLAY_PLAN_CREATE_TIME("create_date"),
+ LED_N_PLAY_PLAN_CREATE_TIME("create_time"),
/**
* 鐔欒繀-鍒楄〃
@@ -39,13 +39,13 @@
//缁戝畾鐏潌鍚嶇О
LED_S_POLE_NAME("t3.pole_name"),
//鍒涘缓鏃堕棿
- LED_S_CREATE_TIME("t1.create_date"),
+ LED_S_CREATE_TIME("t1.create_time"),
/**
* 鐔欒繀-鑺傜洰鍒楄〃
*/
- LED_S_PROGRAM_CREATE_TIME("create_date"),
+ LED_S_PROGRAM_CREATE_TIME("create_time"),
/**
* 璺伅浠诲姟鍒楄〃
@@ -128,6 +128,17 @@
ASC("ASC"),
//鍊掑簭
DESC("DESC"),
+
+
+ /**
+ * 鍗曠伅鏁版嵁鍒楄〃
+ */
+ LIGHT_DATA_CREATE_TIME("t1.create_time"),
+
+ /**
+ * 鍏呯數妗╁垪琛�
+ */
+ CHARGE_POLE_CREATE_TIME("t1.create_time"),
;
private final String code;
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
index ae51d2e..df37499 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
@@ -16,7 +16,7 @@
C3mCharging getAllByC3Mac(String c3Mac);
- List<C3ChargingBo> listC3mChargingDto(String keyword, Long userid);
+ List<C3ChargingBo> listC3mChargingDto(String keyword, Long userid,String orderBy);
}
diff --git a/dao/src/main/resources/mapper/C3mChargingMapper.xml b/dao/src/main/resources/mapper/C3mChargingMapper.xml
index f903047..ea9ef97 100644
--- a/dao/src/main/resources/mapper/C3mChargingMapper.xml
+++ b/dao/src/main/resources/mapper/C3mChargingMapper.xml
@@ -5,18 +5,20 @@
<mapper namespace="com.sandu.ximon.dao.mapper.C3mChargingMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.C3mCharging">
- <id property="c3Id" column="c3_id" jdbcType="BIGINT"/>
- <result property="mcuUdid" column="mcu_udid" jdbcType="VARCHAR"/>
- <result property="c3Name" column="c3_name" jdbcType="VARCHAR"/>
- <result property="c3Mac" column="c3_mac" jdbcType="VARCHAR"/>
- <result property="statusBit" column="status_bit" jdbcType="INTEGER"/>
- <result property="deviceTemperature" column="device_temperature" jdbcType="VARCHAR"/>
- <result property="poleDevicesCode" column="pole_devices_code" jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="c3Id" column="c3_id" jdbcType="BIGINT"/>
+ <result property="mcuUdid" column="mcu_udid" jdbcType="VARCHAR"/>
+ <result property="c3Name" column="c3_name" jdbcType="VARCHAR"/>
+ <result property="c3Mac" column="c3_mac" jdbcType="VARCHAR"/>
+ <result property="statusBit" column="status_bit" jdbcType="INTEGER"/>
+ <result property="deviceTemperature" column="device_temperature" jdbcType="VARCHAR"/>
+ <result property="poleDevicesCode" column="pole_devices_code" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
- c3_id,mcu_udid,c3_name,
+ c3_id
+ ,mcu_udid,c3_name,
c3_mac,status_bit,device_temperature,
pole_devices_code,update_time
</sql>
@@ -36,12 +38,14 @@
LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
<if test="keyword != null and keyword != ''">
- AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')))
+ AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name LIKE CONCAT(CONCAT('%',
+ #{keyword}), '%')))
</if>
<if test="userid != null">
AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
</if>
</where>
+ ORDER BY ${orderBy}
</select>
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
index 998335c..c464144 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -29,11 +29,13 @@
@PostMapping("/C3ChargingList")
- public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+ public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam
+ , @RequestParam(value = "order", required = false) Integer order
+ ,@RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam, order, seq));
}
@AnonymousAccess
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index 4a76367..b093af9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -77,11 +77,14 @@
*/
@GetMapping("/report/list")
public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
- , @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
+ , @RequestParam(value = "keyword", required = false) String keyword
+ , @RequestParam(value = "deviceCode", required = false) String deviceCode
+ , @RequestParam(value = "order", required = false) Integer order
+ ,@RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
+ CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode,order,seq);
List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
if (lightReportDataBos == null) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index e9548ed..6a56493 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -28,6 +28,7 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
@@ -172,7 +173,7 @@
*
* @return
*/
- public Map getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
+ public Map getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam, Integer order, Integer seq) {
if (c3ChargingParam == null) {
c3ChargingParam = new C3ChargingParam();
}
@@ -181,12 +182,38 @@
if (c3ChargingParam.getKeyword() != null) {
c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
}
+ //鎺掑簭瀛楁
+ String orderByResult = "t1.c3_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.CHARGE_POLE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
List<C3ChargingBo> c3ChargingBoList;
if (SecurityUtils.getClientId() == null) {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null, orderBy);
} else {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId(), orderBy);
}
//鍦ㄧ嚎鏁伴噺
int onlineNumber = 0;
@@ -264,9 +291,9 @@
List<C3ChargingBo> c3ChargingBoList;
if (SecurityUtils.getClientId() == null) {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, null);
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, null, "c3_id ASC");
} else {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId());
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId(), "c3_id ASC");
}
return c3ChargingBoList;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
index e784c19..ad16fce 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
@@ -68,7 +68,7 @@
});
}
- //澶ф皵鏁呴殰鏁版嵁
+ //澶ф皵鏁呴殰鏁版嵁 todo 鏆傛棤
//瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index 7aa4294..1fe87b3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -21,6 +21,7 @@
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightReportDataMapper;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
@@ -94,11 +95,36 @@
* @param keyword 鍏抽敭璇�
* @param deviceCode 璁惧鐮�
*/
- public CommonPage listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
+ public CommonPage listReportData(int pageNo, int pageSize, String keyword, String deviceCode,Integer order,Integer seq) {
List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);
-
- CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode);
+ //鎺掑簭瀛楁
+ String orderByResult = "t1.create_time";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.LIGHT_DATA_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+ CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode,orderBy);
List<String> macList = stringCommonPage.getList();
if (CollUtil.isEmpty(macList)) {
return new CommonPage();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index 699e515..2f08bb8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -1009,14 +1009,14 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode,String orderBy) {
List<String> list;
if (SecurityUtils.getClientId() != null) {
PageHelper.startPage(pageNo, pageSize);
list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
} else {
- PageHelper.startPage(pageNo, pageSize);
+ PageHelper.startPage(pageNo, pageSize,orderBy);
list = baseMapper.listCode(null, keyword, deviceCode);
}
--
Gitblit v1.9.3