From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java
index 7b188c0..746cf70 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingProcessingServices.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.LightPoleHeelingProcessingParam;
@@ -14,6 +16,8 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @author ZZQ
* @date 2022/3/25 11:41
@@ -22,10 +26,12 @@
@Service
@AllArgsConstructor
public class LightPoleHeelingProcessingServices extends BaseServiceImpl<LightPoleHeelingProcessingMapper, LightPoleHeelingProcessing> {
+ private final LightPoleHeelingProcessingMapper lightPoleHeelingProcessingMapper;
+
/**
* 鐏潌鍊炬枩璀﹀憡澶勭悊
*/
- public boolean ProcessingLightPoleHeeling(LightPoleHeelingProcessingParam param) {
+ public String ProcessingLightPoleHeeling(LightPoleHeelingProcessingParam param) {
LightPoleHeelingService lightPoleHeelingService = SpringContextHolder.getBean(LightPoleHeelingService.class);
LightPoleHeeling one = SpringContextHolder.getBean(LightPoleHeelingMapper.class).
@@ -45,6 +51,7 @@
lightPoleHeelingProcessing.setTheXAxisOld(one.getTheXAxis());
lightPoleHeelingProcessing.setTheYAxisOld(one.getTheYAxis());
lightPoleHeelingProcessing.setTheZAxisOld(one.getTheZAxis());
+ lightPoleHeelingProcessing.setMac(one.getMac());
lightPoleHeelingProcessing.setWarningLevelOld(one.getWarningLevel());
//璀﹀憡绛夌骇
@@ -59,12 +66,49 @@
//姝ｅ父
lightPoleHeelingProcessing.setWarningLevel(0);
}
- boolean save = save(lightPoleHeelingProcessing);
- if (save) {
- //璁剧疆涓哄凡澶勭悊
- one.setProcessingState(1);
- lightPoleHeelingService.updateById(one);
+ boolean save = false;
+
+ try {
+ save = save(lightPoleHeelingProcessing);
+ if (save) {
+ //璁剧疆涓哄凡澶勭悊
+ one.setProcessingState(1);
+ lightPoleHeelingService.updateById(one);
+ return "鐏潌鍊炬枩澶勭悊鎴愬姛锛�";
+ }
+ } catch (Exception e) {
+ System.out.println("寮傚父");
}
- return save;
+ throw new BusinessException("鐏潌鍊炬枩澶勭悊澶辫触锛�");
+ }
+
+ /**
+ * 鐏潌鍊炬枩澶勭悊璀﹀憡璇︽儏
+ *
+ * @param processingNumber
+ * @return
+ */
+ public LightPoleHeelingProcessing processingDetail(Long processingNumber) {
+ if (processingNumber == null) {
+ throw new BusinessException("鐏潌鍊炬枩璀﹀憡澶勭悊ID涓嶈兘涓虹┖锛�");
+ }
+ LightPoleHeelingProcessing bean = lightPoleHeelingProcessingMapper.processingDetail(SecurityUtils.getClientId(), processingNumber);
+ if (bean == null) {
+ throw new BusinessException("澶勭悊鍚庣殑鐏潌鍊炬枩鏁版嵁涓嶅瓨鍦紒");
+ }
+ return bean;
+ }
+
+ /**
+ * 鐏潌鍊炬枩澶勭悊璀﹀憡璇︽儏
+ *
+ * @param keyword keyword
+ * @return
+ */
+ public List<LightPoleHeelingProcessing> processingDetailList(BaseConditionVO baseConditionVO, String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<LightPoleHeelingProcessing> list = lightPoleHeelingProcessingMapper.processingDetailList(SecurityUtils.getClientId(), keyword);
+
+ return list;
}
}
--
Gitblit v1.9.3