11

psdc-business/src/main/java/com/psdc/mapper/PsdcTimerMapper.java

@@ -21,7 +21,7 @@ public interface PsdcTimerMapper{
      * @param timerId 主键
      * @return 实例对象
      */
-    PsdcTimer queryById(Integer timerId);
+    PsdcTimer queryById(@Param("timerId") Integer timerId);
 
     /**
      * 通过ID查询单条数据
@@ -29,7 +29,7 @@ public interface PsdcTimerMapper{
      * @param timerId 主键
      * @return 实例对象
      */
-    PsdcTimerVo queryById2(Integer timerId);
+    PsdcTimerVo queryById2(@Param("timerId") Integer timerId);
     /** 
      * 分页查询指定行数据
      *
@@ -71,5 +71,5 @@ public interface PsdcTimerMapper{
      * @param timerId 主键
      * @return 影响行数
      */
-    int deleteById(Integer timerId);
+    int deleteById(@Param("timerId") Integer timerId);
 }

psdc-business/src/main/java/com/psdc/service/impl/PsdcControlLogServiceImpl.java

@@ -23,6 +23,7 @@ public class PsdcControlLogServiceImpl implements IPsdcControlLogService {
      * @param controlLogId 主键
      * @return 实例对象
      */
+    @Override
     public PsdcControlLog queryById(Integer controlLogId){
         return psdcControlLogMapper.queryById(controlLogId);
     }
@@ -35,6 +36,7 @@ public class PsdcControlLogServiceImpl implements IPsdcControlLogService {
      * @param psdcControlLog 实例对象
      * @return 实例对象
      */
+    @Override
     public PsdcControlLog insert(PsdcControlLog psdcControlLog){
         psdcControlLogMapper.insert(psdcControlLog);
         return psdcControlLog;
@@ -46,6 +48,7 @@ public class PsdcControlLogServiceImpl implements IPsdcControlLogService {
      * @param psdcControlLog 实例对象
      * @return 实例对象
      */
+    @Override
     public PsdcControlLog update(PsdcControlLog psdcControlLog){
         psdcControlLogMapper.update(psdcControlLog);
         return queryById(psdcControlLog.getControlLogId());
@@ -57,6 +60,7 @@ public class PsdcControlLogServiceImpl implements IPsdcControlLogService {
      * @param controlLogId 主键
      * @return 是否成功
      */
+    @Override
     public boolean deleteById(Integer controlLogId){
         int total = psdcControlLogMapper.deleteById(controlLogId);
         return total > 0;

psdc-business/src/main/java/com/psdc/service/impl/PsdcTimerServiceImpl.java

@@ -25,10 +25,13 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
 
 
 /**
  * 定时控制任务表;(psdc_timer)表服务实现类
+ *
  * @date : 2023-5-10
  */
 @Service
@@ -50,18 +53,19 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService {
      * @param timerId 主键
      * @return 实例对象
      */
+    @Override
     public PsdcTimerVo queryById(Integer timerId) {
         return psdcTimerMapper.queryById2(timerId);
     }
 
 
-    
     /**
      * 新增数据
      *
      * @param psdcTimer 实例对象
      * @return 实例对象
      */
+    @Override
     public PsdcTimer insert(PsdcTimer psdcTimer) {
         psdcTimerMapper.insert(psdcTimer);
         return psdcTimer;
@@ -73,6 +77,7 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService {
      * @param psdcTimer 实例对象
      * @return 实例对象
      */
+    @Override
     public PsdcTimerVo update(PsdcTimer psdcTimer) {
         psdcTimerMapper.update(psdcTimer);
         return queryById(psdcTimer.getTimerId());
@@ -84,6 +89,7 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService {
      * @param timerId 主键
      * @return 是否成功
      */
+    @Override
     public boolean deleteById(Integer timerId) {
         int total = psdcTimerMapper.deleteById(timerId);
         return total > 0;
@@ -92,11 +98,22 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService {
     @Override
     public List<PsdcTimerVo> query(PsdcTimerRequest psdcTimerRequest) {
         psdcTimerRequest.setUserId(SecurityUtils.getUserId());
-        return psdcTimerMapper.queryAllByLimit(psdcTimerRequest);
+        List<PsdcTimerVo> psdcTimerVos = psdcTimerMapper.queryAllByLimit(psdcTimerRequest);
+        for (PsdcTimerVo psdcTimerVo : psdcTimerVos) {
+            if ("startandstop".equals(psdcTimerVo.getControlKey())) {
+                if ("1".equals(psdcTimerVo.getControlValue())) {
+                    psdcTimerVo.setControlValue("开启");
+                } else {
+                    psdcTimerVo.setControlValue("关闭");
+                }
+            }
+        }
+        return psdcTimerVos;
     }
 
     /**
      * 创建定时任务
+     *
      * @param psdcTimerRunTimeRequest 请求类
      * @return int
      */
@@ -222,7 +239,6 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService {
         }
 
 
-
     }
 
     @Override

psdc-business/src/main/resources/mapper/business/PsdcTimerMapper.xml

@@ -54,7 +54,7 @@
     </select>
 
     <!--分页查询指定行数据-->
-    <select id="queryAllByLimit" resultMap="PsdcTimerMap">
+    <select id="queryAllByLimit" resultMap="PsdcTimerVoMap">
         select
         pt.timer_id,pt.device_id,pd.device_name,pt.user_id,pt.runday,pt.runtime,pt.control_key,pt.control_context,pt.control_value,pt.cron_text,pt.job_id,pt.timer_status,pt.create_by,pt.create_time,pt.update_by,pt.update_time
         from psdc_timer pt left join psdc_device pd on pt.device_id = pd.device_id