From 46f06aa49b1fd284472ee13a1a8345d0046f33b8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 12:11:19 +0800
Subject: [PATCH] 完善功能
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java | 46 ++++++++++-
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TFaultMessageMapper.xml | 16 ++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TRepairMapper.java | 13 +++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java | 21 +++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TRepairService.java | 13 +++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java | 15 +++
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TRepairMapper.xml | 19 ++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java | 45 ++++++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TFaultMessageService.java | 12 +++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TFaultMessageMapper.java | 13 +++
10 files changed, 202 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
index 9acebda..fade8ba 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
@@ -6,16 +6,17 @@
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.chargingPile.service.TFaultMessageService;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -46,7 +47,40 @@
faultMessageService.add(dto);
return AjaxResult.success();
}
-
-
+
+
+ /**
+ * 获取故障信息列表
+ * @param siteId
+ * @param basePage
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/getFaultMessageList")
+ @ApiOperation(value = "获取故障信息列表数据", tags = {"管理后台-设备监控"})
+ public AjaxResult<PageInfo<TFaultMessage>> getFaultMessageList(Integer siteId, BasePage basePage){
+ PageInfo<TFaultMessage> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
+ List<TFaultMessage> faultMessageList = faultMessageService.getFaultMessageList(pageInfo, siteId);
+ pageInfo.setRecords(faultMessageList);
+ return AjaxResult.success(pageInfo);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/addFaultMessage")
+ @ApiOperation(value = "添加故障信息", tags = {"管理后台-设备监控"})
+ public AjaxResult addFaultMessage(@RequestBody TFaultMessage faultMessage){
+ faultMessageService.save(faultMessage);
+ return AjaxResult.success();
+ }
+
+
+ @ResponseBody
+ @DeleteMapping("/delFaultMessage/{id}")
+ @ApiOperation(value = "删除故障信息", tags = {"管理后台-设备监控"})
+ public AjaxResult delFaultMessage(@PathVariable Integer id){
+ faultMessageService.removeById(id);
+ return AjaxResult.success();
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
index e67572d..981cc4b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
@@ -1,8 +1,17 @@
package com.ruoyi.chargingPile.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.chargingPile.api.model.TFaultMessage;
+import com.ruoyi.chargingPile.api.model.TRepair;
+import com.ruoyi.chargingPile.service.TRepairService;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -16,5 +25,37 @@
@RequestMapping("/t-repair")
public class TRepairController {
+ @Resource
+ private TRepairService repairService;
+
+
+ @ResponseBody
+ @GetMapping("/getRepairList")
+ @ApiOperation(value = "获取报修记录列表数据", tags = {"管理后台-设备监控"})
+ public AjaxResult<PageInfo<TRepair>> getRepairList(String name, String siteId, BasePage basePage){
+ PageInfo<TRepair> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
+ List<TRepair> repairList = repairService.getRepairList(pageInfo, name, siteId);
+ return AjaxResult.success(repairList);
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/addRepair")
+ @ApiOperation(value = "添加报修记录", tags = {"管理后台-设备监控"})
+ public AjaxResult addRepair(@RequestBody TRepair repair){
+ repairService.save(repair);
+ return AjaxResult.success();
+ }
+
+
+ @ResponseBody
+ @DeleteMapping("/delRepair/{id}")
+ @ApiOperation(value = "删除报修记录", tags = {"管理后台-设备监控"})
+ public AjaxResult delRepair(@PathVariable Integer id){
+ repairService.removeById(id);
+ return AjaxResult.success();
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TFaultMessageMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TFaultMessageMapper.java
index 1b2b56e..70c0e9c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TFaultMessageMapper.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TFaultMessageMapper.java
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
+import com.ruoyi.common.core.web.page.PageInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +16,12 @@
* @since 2024-08-08
*/
public interface TFaultMessageMapper extends BaseMapper<TFaultMessage> {
-
+
+ /**
+ * 获取故障信息列表
+ * @param pageInfo
+ * @param siteId
+ * @return
+ */
+ List<TFaultMessage> getFaultMessageList(PageInfo<TFaultMessage> pageInfo, @Param("siteId") Integer siteId);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TRepairMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TRepairMapper.java
index e649544..afe8e9f 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TRepairMapper.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TRepairMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.chargingPile.api.model.TRepair;
+import com.ruoyi.common.core.web.page.PageInfo;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +15,15 @@
* @since 2024-08-08
*/
public interface TRepairMapper extends BaseMapper<TRepair> {
+
+
+ /**
+ * 获取列表数据
+ * @param pageInfo
+ * @param name
+ * @param siteId
+ * @return
+ */
+ List<TRepair> getRepairList(PageInfo<TRepair> pageInfo, String name, String siteId);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TFaultMessageService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TFaultMessageService.java
index 62fc81e..4c72b29 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TFaultMessageService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TFaultMessageService.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
+import com.ruoyi.common.core.web.page.PageInfo;
+
+import java.util.List;
/**
* <p>
@@ -19,4 +22,13 @@
* @return
*/
void add(TFaultMessage dto);
+
+
+ /**
+ * 获取故障信息列表
+ * @param pageInfo
+ * @param siteId
+ * @return
+ */
+ List<TFaultMessage> getFaultMessageList(PageInfo<TFaultMessage> pageInfo, Integer siteId);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TRepairService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TRepairService.java
index 8f2487a..4f85479 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TRepairService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TRepairService.java
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.chargingPile.api.model.TRepair;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +16,12 @@
* @since 2024-08-08
*/
public interface TRepairService extends IService<TRepair> {
-
+
+ /**
+ * 获取报修记录列表
+ * @param name
+ * @param siteId
+ * @return
+ */
+ List<TRepair> getRepairList(PageInfo<TRepair> pageInfo, String name, String siteId);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
index 01dff45..88a97d7 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
@@ -11,9 +11,12 @@
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.chargingPile.service.TFaultMessageService;
import com.ruoyi.common.core.utils.MsgUtil;
+import com.ruoyi.common.core.web.page.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -48,4 +51,16 @@
chargingPileNotificationService.saveData(4,dto.getSiteId(),dto.getChargingPileId(),site.getPhone(),"检测到"+siteName+"..."+chargingPile.getNumber()+"号桩设备离线，请及时查看处理！");
this.save(dto);
}
+
+
+ /**
+ * 获取故障信息列表
+ * @param pageInfo
+ * @param siteId
+ * @return
+ */
+ @Override
+ public List<TFaultMessage> getFaultMessageList(PageInfo<TFaultMessage> pageInfo, Integer siteId) {
+ return this.baseMapper.getFaultMessageList(pageInfo, siteId);
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
index c2a86c8..d348ebb 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TRepairServiceImpl.java
@@ -1,10 +1,18 @@
package com.ruoyi.chargingPile.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TRepair;
import com.ruoyi.chargingPile.mapper.TRepairMapper;
import com.ruoyi.chargingPile.service.TRepairService;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -16,5 +24,16 @@
*/
@Service
public class TRepairServiceImpl extends ServiceImpl<TRepairMapper, TRepair> implements TRepairService {
-
+
+
+ /**
+ * 获取报修记录列表
+ * @param name
+ * @param siteId
+ * @return
+ */
+ @Override
+ public List<TRepair> getRepairList(PageInfo<TRepair> pageInfo, String name, String siteId) {
+ return this.baseMapper.getRepairList(pageInfo, name, siteId);
+ }
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TFaultMessageMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TFaultMessageMapper.xml
index fc21cd6..b3acfec 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TFaultMessageMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TFaultMessageMapper.xml
@@ -19,4 +19,20 @@
id, app_user_id, site_id, charging_pile_id, status, down_time, create_time, del_flag
</sql>
+
+
+ <select id="getFaultMessageList" resultType="com.ruoyi.chargingPile.api.model.TFaultMessage">
+ select
+ a.*,
+ b.name as chargingPileName,
+ c.name as siteName
+ from t_fault_message a
+ left join t_charging_pile b on (a.charging_pile_id = b.id)
+ left join t_site c on (a.site_id = c.id)
+ where a.del_flag = 0
+ <if test="null != siteId">
+ and a.site_id = #{siteId}
+ </if>
+ order by a.create_time desc
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TRepairMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TRepairMapper.xml
index 526a1ba..6c7b52f 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TRepairMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TRepairMapper.xml
@@ -19,4 +19,23 @@
id, repairman, site_id, charging_pile_id, content, repair_time, create_time, del_flag
</sql>
+
+
+ <select id="getRepairList" resultType="com.ruoyi.chargingPile.api.model.TRepair">
+ select
+ a.*,
+ b.name as chargingPileName,
+ c.name as siteName
+ from t_repair a
+ left join t_charging_pile b on (a.charging_pile_id = b.id)
+ left join t_site c on (a.site_id = c.id)
+ where a.del_flag = 0
+ <if test="null != name and '' != name">
+ and a.repairman like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != siteId">
+ and a.site_id = #{siteId}
+ </if>
+ order by a.create_time desc
+ </select>
</mapper>
--
Gitblit v1.7.1