Merge remote-tracking branch 'origin/master'

psdc-business/src/main/java/com/psdc/entity/PsdcStrategyLog.java

@@ -0,0 +1,43 @@
+package com.psdc.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+
+ /**
+ * @author : stone
+ * @date : 2023-6-11
+ */
+@Data
+@Component
+@AllArgsConstructor
+@NoArgsConstructor
+public class PsdcStrategyLog implements Serializable,Cloneable{
+
+    private Integer id ;
+     /** 策略名称 */
+    private String strategyName;
+    /** 策略码 */
+    private Long strategyCode ;
+    /** 开始执行时间 */
+    private String startTime ;
+    /** 完成执行时间 */
+    private String endTime ;
+    /** 1：执行完成;2：未完成 */
+    private Integer runtimeStatus ;
+     /** 执行前室内平均温度 */
+     private Double inFrontAvgtemp ;
+     /** 执行前室外平均温度 */
+     private Double outFrontAvgtemp ;
+     /** 执行后室内平均温度 */
+     private Double inAfterAvgtemp ;
+     /** 执行后室外平均温度 */
+     private Double outAfterAvgtemp ;
+
+     private String runHours; // 策略执行时长
+     private String oneUseEnergy; // 单位时长用电
+     private Double sceneUseEnergy; // 总用电量
+}

psdc-business/src/main/java/com/psdc/entity/res/PsdcSceneRes.java

@@ -34,10 +34,6 @@ public class PsdcSceneRes {
     private Long sceneCode;
     /** 用户id */
     private Long userId;
-    /**
-     * 该策略是否选中
-     */
-    private Boolean isCheck;
 
     /** 创建时间 */
     private String createTime ;
@@ -68,6 +64,10 @@ public class PsdcSceneRes {
      * 可控设备列表
      */
     private List sblb;
+    /** 类型 */
+    private String type;
+    /** 图标 */
+    private String icon;
 
 
     public PsdcSceneRes(Integer ID, Integer sceneId, String sceneName, Long sceneCode, Long userId, String createTime, String sceneRemark, Integer isJudge, Integer judgeDevice, String judgeElement, String judgeData) {

psdc-business/src/main/java/com/psdc/entity/vo/StrategyVo.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author：Stone
@@ -32,8 +33,27 @@ public class StrategyVo implements Serializable,Cloneable{
     private Integer strategyCode ;
     /** 所属步骤集合 */
     private List<PsdcSceneRes> scenesList ;
+    /** 控制指令集合 */
+    private List<Map> commandList ;
     /** 策略描述 */
     private String strategyInfo ;
     /** 创建时间 */
     private String createTime ;
+    /**
+     * 该策略是否选中
+     */
+    private Boolean isCheck;
+
+    public StrategyVo(Integer strategyId, Long userId, String strategyName, Integer strategyCode, List<PsdcSceneRes> scenesList, String strategyInfo, String createTime, Boolean isCheck) {
+        this.strategyId = strategyId;
+        this.userId = userId;
+        this.strategyName = strategyName;
+        this.strategyCode = strategyCode;
+        this.scenesList = scenesList;
+        this.strategyInfo = strategyInfo;
+        this.createTime = createTime;
+        this.isCheck = isCheck;
+    }
+
+
 }

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

@@ -0,0 +1,24 @@
+package com.psdc.mapper;
+
+import com.psdc.entity.PsdcStrategyLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author：Stone
+ * @Project：psdc
+ * @Filename：PsdcStrategyLogMapper
+ * @Slogan 致敬大师，致敬未来的你
+ * @Date：2023/6/21 9:30
+ * @Version 1.0
+ */
+@Mapper
+@Repository
+public interface PsdcStrategyLogMapper {
+
+    List<PsdcStrategyLog> selMyStrategyLog(@Param("userId") Long userId);
+
+}

psdc-business/src/main/java/com/psdc/service/IPsdcSceneService.java

@@ -45,4 +45,6 @@ public interface IPsdcSceneService {
     List getStrategyList();
 
     List<PsdcSceneRes> findSceneByUserAndSceneName(Long sceneCode);
+
+    List findSceneByUserAndSceneCode(String[] sceneCodes, Long userId);
 }

psdc-business/src/main/java/com/psdc/service/IPsdcStrategyLogService.java

@@ -0,0 +1,16 @@
+package com.psdc.service;
+
+import java.util.List;
+
+/**
+ * @Author：戴仕崑
+ * @Project：psdc
+ * @Filename：IPsdcStrategyLogService
+ * @Slogan 致敬大师，致敬未来的你
+ * @Date：2023/6/21 10:12
+ * @Version 1.0
+ */
+public interface IPsdcStrategyLogService {
+
+    List selMyStrategyLog();
+}

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

@@ -412,6 +412,9 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             if ("电表".equals(deviceModel)){
                 continue;
             }
+            if ("水箱".equals(deviceModel)){
+                continue;
+            }
             DeviceStatusVo deviceStatusVo = new DeviceStatusVo();
             BeanUtils.copyProperties(pd, deviceStatusVo);
             List<Map> ary = new ArrayList<>();

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

@@ -128,7 +128,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
                 }
             }
             i = 1;
-            StrategyVo strategyVo = new StrategyVo(srt.getStrategyId(), userId, srt.getStrategyName(), Math.toIntExact(srt.getStrategyCode()), list2, srt.getStrategyInfo(), srt.getCreateTime());
+            StrategyVo strategyVo = new StrategyVo(srt.getStrategyId(), userId, srt.getStrategyName(), Math.toIntExact(srt.getStrategyCode()), list2, srt.getStrategyInfo(), srt.getCreateTime(), null);
             ary.add(strategyVo);
         }
         return ary;
@@ -181,22 +181,18 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
         List<SceneVo> scenesList = new ArrayList<>();
         String s = null;
         Date date = new Date();
-        Long thisSceneCode = null;
         for (int i = scenes.getScenesList().size() - 1; i >= 0; i--) {
+            Date date2 = new Date();
             PsdcSceneRes sc = scenes.getScenesList().get(i);
-            if (null != sc.getSceneCode() && !"".equals(sc.getSceneCode())){
-                thisSceneCode = sc.getSceneCode();
-            } else {
-                thisSceneCode = getSecondTimestampTwo(date);
-            }
-            s = thisSceneCode + "," + s;
+            long timestamp = getSecondTimestampTwo(date2) - i;
+            s = timestamp + "," + s;
             psdcSceneMapper.deleteBySceneName(sc.getSceneCode());
             for (DeviceVo dev : sc.getDeviceVos()) {
                 for (Map m : dev.getTempList()) {
                     String desc = (String) m.get("label");
                     String tempValue = (String) m.get("value");
                     String sceneKey = sceneKey(desc);
-                    SceneVo sceneVo = new SceneVo(sc.getSceneName(), thisSceneCode, userId, sc.getIsJudge(),
+                    SceneVo sceneVo = new SceneVo(sc.getSceneName(), timestamp, userId, sc.getIsJudge(),
                             sc.getJudgeDevice(), sc.getJudgeElement(), sc.getJudgeData(), dev.getDeviceId(),
                             desc, sceneKey, tempValue, sc.getSceneRemark());
                     sceneVo.setCreateBy(userName);
@@ -269,60 +265,33 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
 
 
     @Override
-    public List<PsdcSceneRes> getStrategyList() {
+    public List getStrategyList() {
         Long userId = SecurityUtils.getUserId();
-        List<PsdcSceneRes> sceneRes = psdcSceneMapper.queryScenes(userId, null);
-        for (PsdcSceneRes psr : sceneRes) {
-            Long code = psr.getSceneCode();
-            List<SceneVo> listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, null);
-            psr.setIsCheck(false);
-            List<DeviceVo> ary = new ArrayList<>();
-            Integer deviceId = listByCode.get(0).getDeviceId();
-            DeviceVo deviceVo = new DeviceVo();
-            List<Map> list = new ArrayList<>();
-
-            for (int i = 0; i < listByCode.size(); i++) {
-                SceneVo sv = listByCode.get(i);
-                if (deviceId == sv.getDeviceId()) {
-                    deviceVo.setDeviceId(sv.getDeviceId());
-                    deviceVo.setDeviceName(sv.getDeviceName());
-                    deviceVo.setDeviceSn(sv.getDeviceSn());
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("label", sv.getSceneKey());
-                    map.put("value", sv.getSceneValue());
-                    list.add(map);
-                    deviceVo.setTempValue(list);
-                    if (1 == listByCode.size() || i == listByCode.size() - 1) {
-                        ary.add(deviceVo);
-                    }
-
-                } else {
-                    ary.add(deviceVo);
-                    deviceId = sv.getDeviceId();
-                    deviceVo = new DeviceVo();
-                    list = new ArrayList<>();
-                    deviceVo.setDeviceId(sv.getDeviceId());
-                    deviceVo.setDeviceName(sv.getDeviceName());
-                    deviceVo.setDeviceSn(sv.getDeviceSn());
-                    if (i == listByCode.size() - 1) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("label", sv.getSceneKey());
-                        map.put("value", sv.getSceneValue());
-                        list.add(map);
-                        deviceVo.setTempValue(list);
-                        ary.add(deviceVo);
-                    } else {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("label", sv.getSceneKey());
-                        map.put("value", sv.getSceneValue());
-                        list.add(map);
-                        deviceVo.setTempValue(list);
-                    }
+        List<StrategyVo> ary = new ArrayList<>();
+        List<PsdcStrategy> strategyList = psdcStrategyMapper.queryByUser(userId, null);
+        int i = 1;
+        for (PsdcStrategy srt : strategyList) {
+            String[] codes = srt.getScenes().split(",");
+            List<PsdcSceneRes> list2 = new ArrayList<>();
+            List<Map> list4 = findSceneByUserAndSceneCode(codes, userId);
+            for (String s : codes) {
+                List<PsdcSceneRes> list3 = findSceneByUserAndSceneName(Long.parseLong(s));
+                if (null != list3 && list3.size() > 0) {
+                    PsdcSceneRes res = list3.get(0);
+                    res.setTitle("第" + i + "步");
+                    res.setType("");
+                    res.setIcon("");
+                    i++;
+                    list2.add(res);
                 }
             }
-            psr.setDeviceVos(ary);
+            i = 1;
+            StrategyVo strategyVo = new StrategyVo(srt.getStrategyId(), userId, srt.getStrategyName(), Math.toIntExact(srt.getStrategyCode()), list2, list4, srt.getStrategyInfo(), srt.getCreateTime(), null);
+            ary.add(strategyVo);
         }
-        return sceneRes;
+
+
+        return ary;
     }
 
     @Override
@@ -384,6 +353,35 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
         return sceneRes;
     }
 
+    @Override
+    public List<Map> findSceneByUserAndSceneCode(String[] sceneCodes, Long userId) {
+        List<Map> list = new ArrayList<>();
+        for (String src : sceneCodes){
+            List<Map> list3 = new ArrayList<>();
+            HashMap<String, Object> map3 = new HashMap<>();
+            Long sceneCode = Long.parseLong(src);
+            List<PsdcSceneRes> sceneRes = psdcSceneMapper.queryScenes(userId, sceneCode);
+            for (PsdcSceneRes sc : sceneRes){
+                List<SceneVo> scenes = psdcSceneMapper.findSceneByUserAndSceneCode(userId, sceneCode, null);
+                HashMap<String, Object> map1 = new HashMap<>();
+                List<Map> list2 = new ArrayList<>();
+                map1.put("deviceId", sc.getSceneId());
+                for (SceneVo s : scenes){
+                    HashMap<String, Object> map2 = new HashMap<>();
+                    map2.put("controlKey", s.getSceneKey());
+                    map2.put("controlValue", s.getSceneValue());
+                    list2.add(map2);
+                }
+                map1.put("data", list2);
+                list3.add(map1);
+            }
+            map3.put("sceneCode", sceneCode);
+            map3.put("sceneControlCommand", list3);
+            list.add(map3);
+        }
+        return list;
+    }
+
     /**
      * 获取精确到秒的时间戳
      *

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

@@ -0,0 +1,84 @@
+package com.psdc.service.impl;
+
+import com.psdc.entity.PsdcStrategy;
+import com.psdc.entity.PsdcStrategyLog;
+import com.psdc.entity.vo.SceneVo;
+import com.psdc.mapper.PsdcElectricHtdataMapper;
+import com.psdc.mapper.PsdcSceneMapper;
+import com.psdc.mapper.PsdcStrategyLogMapper;
+import com.psdc.mapper.PsdcStrategyMapper;
+import com.psdc.service.IPsdcStrategyLogService;
+import com.psdc.utils.SecurityUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ * @Author：戴仕崑
+ * @Project：psdc
+ * @Filename：PsdcStrategyLogService
+ * @Slogan 致敬大师，致敬未来的你
+ * @Date：2023/6/21 10:12
+ * @Version 1.0
+ */
+@Service
+public class PsdcStrategyLogService implements IPsdcStrategyLogService {
+
+    @Resource
+    PsdcStrategyLogMapper strategyLogMapper;
+    @Resource
+    PsdcStrategyMapper strategyMapper;
+    @Resource
+    PsdcSceneMapper sceneMapper;
+    @Resource
+    PsdcElectricHtdataMapper electricHtDataMapper;
+
+    DecimalFormat df = new DecimalFormat("#.00");
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
+    @Override
+    public List<PsdcStrategyLog> selMyStrategyLog() {
+        Long userId = SecurityUtils.getUserId();
+        List<PsdcStrategyLog> logList = strategyLogMapper.selMyStrategyLog(userId);
+        for (PsdcStrategyLog psl : logList){  // 策略层
+            Long code = psl.getStrategyCode();
+            PsdcStrategy res ;
+            Double strategyUseEnergy = 0.0;
+            List<PsdcStrategy> strategyList = strategyMapper.queryByUser(userId, code);
+            if (null != strategyList && strategyList.size() > 0){
+                res = strategyList.get(0);
+                String[] split = res.getScenes().split(",");
+                for (String s : split){  // 步骤层
+                    List<SceneVo> sceneVos = sceneMapper.findSceneByUserAndSceneCode(userId, Long.parseLong(s), null);
+                    for (SceneVo sv : sceneVos){  // 设备层
+                        Integer deviceId = sv.getDeviceId();
+                        Double energy = electricHtDataMapper.selTodayUseEnergy(deviceId, psl.getStartTime(), psl.getEndTime());
+                        strategyUseEnergy = strategyUseEnergy + energy;
+                    }
+                }
+                String runHours = jssc(sdf, psl.getStartTime(), psl.getEndTime());
+                psl.setRunHours(runHours);
+                psl.setSceneUseEnergy(strategyUseEnergy);
+                psl.setOneUseEnergy(df.format(strategyUseEnergy / Double.parseDouble(runHours)));
+            }
+        }
+        return logList;
+    }
+
+    public String jssc(SimpleDateFormat dfs, String start, String end){
+        try {
+            Double d1 = Double.valueOf(dfs.parse(start).getTime());
+            Double d2 = Double.valueOf(dfs.parse(end).getTime());
+            Double between = (d2 - d1)/1000/3600;
+            return df.format(between);
+        } catch (ParseException pe) {
+            pe.printStackTrace();
+            return "0L";
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.psdc.mapper.PsdcStrategyLogMapper">
+    <resultMap type="com.psdc.entity.PsdcStrategyLog" id="PsdcStrategyLogMap">
+        <result property="id" column="id" />
+        <result property="strategyName" column="strategy_name" />
+        <result property="strategyCode" column="strategy_code" />
+        <result property="startTime" column="start_time" />
+        <result property="endTime" column="end_time" />
+        <result property="runtimeStatus" column="runtime_status" />
+        <result property="inFrontAvgtemp" column="in_front_avgtemp" />
+        <result property="outFrontAvgtemp" column="out_front_avgtemp" />
+        <result property="inAfterAvgtemp" column="in_after_avgtemp" />
+        <result property="outAfterAvgtemp" column="out_after_avgtemp" />
+    </resultMap>
+
+    <select id="selMyStrategyLog" resultMap="PsdcStrategyLogMap">
+        SELECT s.strategy_name, sl.* FROM psdc_strategy_log sl
+        Left Join psdc_strategy s On s.strategy_code = sl.strategy_code
+        WHERE runtime_status = 1 And s.user_id = ${userId}
+        GROUP BY sl.strategy_code
+        ORDER BY sl.end_time
+    </select>
+
+
+</mapper>

psdc-web/src/main/java/com/psdc/controller/evaluate/PsdcStrategyLogController.java

@@ -0,0 +1,33 @@
+package com.psdc.controller.evaluate;
+
+
+import com.psdc.core.domain.AjaxResult;
+import com.psdc.entity.PsdcStrategyLog;
+import com.psdc.service.impl.PsdcStrategyLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 模式策略执行日志表;(psdc_strategy_log)表控制层
+ * @author : http://www.chiner.pro
+ * @date : 2023-6-21
+ */
+@RestController
+@RequestMapping("/analyse/nhdb")
+public class PsdcStrategyLogController{
+    @Autowired
+    private PsdcStrategyLogService psdcStrategyLogService;
+
+    @PreAuthorize("@ss.hasPermi('analyse:nhdb')")
+    @GetMapping("/logs")
+    public AjaxResult getControlDeviceList() {
+        List<PsdcStrategyLog> deviceStatusVos = psdcStrategyLogService.selMyStrategyLog();
+        return AjaxResult.success("策略执行日志列表").put("data",deviceStatusVos);
+    }
+    
+
+}