Merge remote-tracking branch 'origin/master'

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

@@ -58,6 +58,8 @@ public class PsdcDeviceInfoRes {
     /** 当前总有功电能 */
     @Excel(name = "总用电量")
     private Double totWh;
+    /** 1不可控，2可控 */
+    private Integer isControl;
 
     /** 设备状态：1-未激活，2-禁用，3-在线，4-离线 */
     private Integer deviceStatus ;

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

@@ -86,6 +86,9 @@ public interface PsdcDeviceMapper{
      List<PsdcDevice> queryByUserId(@Param(value = "userId") Long userId,
                                     @Param(value = "parentId") Integer parentId);
 
+     List<PsdcDevice> queryByModel(@Param(value = "userId") Long userId,
+                                   @Param(value = "devModel") String devModel);
+
      /**
       * 根据设备id修改设备状态
       * @param deviceId

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

@@ -27,7 +27,7 @@ public interface PsdcThermometerRtdataMapper{
                                      @Param("today") String today);
 
     List<PsdcThermometerDataRes> selWenDu(@Param("userId") Long userId,
-                                          @Param("parentId") Integer parentId,
+                                          @Param("modelTypeName") String parentId,
                                           @Param("today") String today);
 
     /** 

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/IPsdcDeviceService.java

@@ -24,6 +24,11 @@ public interface IPsdcDeviceService {
      */
     List<PsdcDevice> queryByUserId(Integer parent);
 
+    List<PsdcDevice> queryByModel(String model);
+
+    List<PsdcDevice> selalldevModel();
+
+
     /**
      * 查询所有设备状态
      * @return

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

@@ -20,11 +20,11 @@ public interface IPsdcThermometerHtdataService {
 
     AjaxResult selTodayThermometer();
 
-    AjaxResult sel8WnDu(Integer modelId);
+    AjaxResult sel8WnDu(String modelId);
 
     PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId);
 
-    List selTodayThermometerById(Integer modelId);
+    List selTodayThermometerById(String modelId);
 
     AjaxResult selDzglWenDu(Integer deviceId);
 

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/PsdcDeviceServiceImpl.java

@@ -64,6 +64,16 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
         return psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), parent);
     }
 
+    @Override
+    public List<PsdcDevice> queryByModel(String model) {
+        return psdcDeviceMapper.queryByModel(SecurityUtils.getUserId(), model);
+    }
+
+    @Override
+    public List<PsdcDevice> selalldevModel() {
+        return psdcDeviceMapper.queryByUserId(null, null);
+    }
+
     public List<DeviceStatusVo> queryDeviceStatus() {
         List<PsdcDevice> psdcDevices = psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), 0);
         return psdcDevices.stream().map(psdcDevice -> {

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

@@ -96,7 +96,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     }
 
     @Override
-    public AjaxResult sel8WnDu(Integer modelId) {
+    public AjaxResult sel8WnDu(String modelId) {
         List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date()));
         return AjaxResult.success(dataResList);
     }
@@ -116,7 +116,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     }
 
     @Override
-    public List<Map> selTodayThermometerById(Integer modelId) {
+    public List<Map> selTodayThermometerById(String modelId) {
         Date date = new Date();
         String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间
         String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间

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
@@ -253,10 +269,6 @@ public class PsdcTimerServiceImpl implements IPsdcTimerService {
         job.setJobId(psdcTimer.getJobId().longValue());
         job.setJobGroup("psdc");
         int i = jobService.deleteJob(job);
-        if (i > 0){
         return psdcTimerMapper.deleteById(timerId);
-        } else {
-            throw new ServiceException("删除定时任务失败");
-        }
     }
 }

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

@@ -46,6 +46,7 @@
         <result property="tempIn" column="thermometer_value_in" />
         <result property="tempOut" column="thermometer_value_out" />
         <result property="totWh" column="TotWh" />
+        <result property="isControl" column="is_control" />
         <result property="deviceAddress" column="device_address" />
         <result property="startTime" column="start_time" />
         <result property="deviceStatus" column="device_status" />
@@ -101,18 +102,31 @@
                 And parent_id = #{parentId}
             </if>
         </where>
+        GROUP BY device_model
+    </select>
+
+    <select id="queryByModel" resultMap="PsdcDeviceMap">
+        Select * From psdc_device
+        <where>
+            <if test="userId != null and userId != ''">
+                And user_id = #{userId}
+            </if>
+            <if test="devModel != null and devModel != ''">
+                and device_model = #{devModel}
+            </if>
+        </where>
     </select>
 
-    <!--分页查询指定行数据-->
+    <!--分页查询指定行数据 Where !(device_model = "温度传感器" And parent_id = 0) -->
     <select id="queryAllByLimit" resultMap="PsdcDeviceMap3">
         Select
-        pd.device_id, device_name, device_address, device_status, device_runstatus, parent_id, device_model, su.user_id, su.user_name,
+        pd.device_id, device_name, device_address, device_status, device_runstatus, parent_id, device_model, su.user_id, su.user_name, is_control,
         device_sn, per.TotP, per.TotWh, start_time, ptr.thermometer_value, ptr.thermometer_value_in, ptr.thermometer_value_out
         From psdc_device pd
         Left Join sys_user su On su.user_id = pd.user_id
         Left Join psdc_electric_rtdata per On per.device_id = pd.device_id
         Left Join psdc_thermometer_rtdata ptr On ptr.device_id = pd.device_id
-        Where !(device_model = "温度传感器" And parent_id = 0)
+        <where>
             <if test="deviceId != null and deviceId != ''">
                 and pd.device_id = #{deviceId}
             </if>
@@ -161,6 +175,7 @@
             <if test="updateTime != null and updateTime != ''">
                 and update_time = #{updateTime}
             </if>
+        </where>
         Order by pd.device_id
     </select>
 

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

@@ -40,7 +40,7 @@
         From psdc_device pd
         LEFT join psdc_thermometer_rtdata ptr on pd.device_id = ptr.device_id
         And DATE_FORMAT(ptr.update_time,'%Y-%m-%d %H') = #{today}
-        Where pd.user_id = ${userId} And pd.parent_id = ${parentId}
+        Where pd.user_id = ${userId} And pd.device_model = #{modelTypeName}
     </select>
 
     <!--分页查询指定行数据-->

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

psdc-web/src/main/java/com/psdc/controller/index/Index.java

@@ -3,10 +3,7 @@ package com.psdc.controller.index;
 import com.psdc.core.domain.AjaxResult;
 import com.psdc.service.IPsdcThermometerHtdataService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
@@ -21,9 +18,9 @@ public class Index {
         return psdcThermometerHtdataService.selTodayThermometer();
     }
 
-    @RequestMapping(value = "/8wd/{modelId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/8wd", method = RequestMethod.POST)
-    public AjaxResult sel8WenDu(@PathVariable(value = "modelId", required = false) Integer modelId)  {
+    public AjaxResult sel8WenDu(@RequestParam(value="modelTypeName", defaultValue="") String modelname)  {
-        return psdcThermometerHtdataService.sel8WnDu(modelId);
+        return psdcThermometerHtdataService.sel8WnDu(modelname);
     }
 
     @RequestMapping(value = "/zdb/{modelId}", method = RequestMethod.GET)

psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java

@@ -70,7 +70,7 @@ public class PsdcDeviceController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('system:device:list')")
     @Log(title = "设备管理", businessType = BusinessType.DELETE)
-    @DeleteMapping
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
     public AjaxResult remove(@Validated @RequestBody Long[] deviceIds) {
         return toAjax(psdcDeviceService.deleteById(deviceIds));
     }
@@ -90,6 +90,20 @@ public class PsdcDeviceController extends BaseController {
         return AjaxResult.success("用户下拉列表", maps);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:device:list')")
+    @RequestMapping(value = "/selmodels", method = RequestMethod.GET)
+    public AjaxResult selAllModels()  {
+        List<Map> maps = new ArrayList<>();
+        List<PsdcDevice> list = psdcDeviceService.selalldevModel();
+        for (PsdcDevice dd : list){
+            Map<String, Object> map = new HashMap<>();
+            map.put("label", dd.getDeviceModel());
+            map.put("value", dd.getDeviceModel());
+            maps.add(map);
+        }
+        return AjaxResult.success("模型下拉列表", maps);
+    }
+
     @PreAuthorize("@ss.hasPermi('system:device:list')")
     @RequestMapping(value = "/devicesList", method = RequestMethod.POST)
     public TableDataInfo controlLogList(@RequestBody JSONObject jsonObject) {

psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java

@@ -46,9 +46,8 @@ public class TotalElectricMeterController {
         for (PsdcDevice dd : list){
             Map<String, Object> map = new HashMap<>();
             map.put("modelName", dd.getDeviceModel());
-            map.put("modelId", dd.getDeviceId());
             List<Map> maps2 = new ArrayList<>();
-            List<PsdcDevice> list2 = psdcDeviceService.queryByUserId(dd.getDeviceId());
+            List<PsdcDevice> list2 = psdcDeviceService.queryByModel(dd.getDeviceModel());
             if (list2.size() > 0){
                 for (PsdcDevice dev : list2){
                     Map<String, Object> map2 = new HashMap<>();

psdc-web/src/main/java/com/psdc/controller/monitor/WenDuController.java

@@ -4,10 +4,7 @@ import com.psdc.core.domain.AjaxResult;
 import com.psdc.service.IPsdcThermometerHtdataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author：戴仕崑
@@ -24,9 +21,9 @@ public class WenDuController {
     IPsdcThermometerHtdataService psdcThermometerHtdataService;
 
     @PreAuthorize("@ss.hasPermi('emonitor:wdcgq')")
-    @RequestMapping(value = "/sel1/{modelId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/sel1", method = RequestMethod.POST)
-    public AjaxResult selwd(@PathVariable(value = "modelId", required = false) Integer modelId){
+    public AjaxResult selwd(@RequestParam(value="modelTypeName", defaultValue="") String modelname){
-        return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelId));
+        return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelname));
     }
 
 }