From 87eaca174431be01d7cccc426266ac0f77ee1990 Mon Sep 17 00:00:00 2001 From: stone <827672943@qq.com> Date: Wed, 10 May 2023 09:06:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prop.yml | 2 +- .../com/psdc/service/IPsdcDeviceService.java | 2 +- .../service/impl/PsdcDeviceServiceImpl.java | 8 +++---- .../mapper/business/PsdcControlLogMapper.xml | 1 + .../psdc/core/controller/BaseController.java | 4 ++++ .../main/java/com/psdc/utils/PageUtils.java | 4 ++++ .../controller/control/ManualControl.java | 21 +++++++++++-------- 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/psdc-admin/src/main/resources/application-dev.yml b/psdc-admin/src/main/resources/application-dev.yml index d4ac1c3..e174ccd 100644 --- a/psdc-admin/src/main/resources/application-dev.yml +++ b/psdc-admin/src/main/resources/application-dev.yml @@ -103,7 +103,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 600 # MyBatis配置 mybatis: diff --git a/psdc-admin/src/main/resources/application-prop.yml b/psdc-admin/src/main/resources/application-prop.yml index b86541d..acf077d 100644 --- a/psdc-admin/src/main/resources/application-prop.yml +++ b/psdc-admin/src/main/resources/application-prop.yml @@ -103,7 +103,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 600 # MyBatis配置 mybatis: diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java index a12ed53..31d39ce 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java @@ -64,6 +64,6 @@ public interface IPsdcDeviceService { * @param runStatus * @return */ - int controlDeviceStartAndStop(Integer deviceId,Integer runStatus); + int controlDeviceStartAndStop(Integer deviceId,Integer runStatus,String controlBy); } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index e820ae7..7eecc1c 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java @@ -104,7 +104,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService{ * @return */ @Override - public int controlDeviceStartAndStop(Integer deviceId, Integer runStatus) { + public int controlDeviceStartAndStop(Integer deviceId, Integer runStatus,String controlBy) { String s = ""; if(runStatus == 1){ @@ -116,15 +116,15 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService{ PsdcDevice psdcDevice = psdcDeviceMapper.queryById(deviceId); if(psdcDevice == null){ - psdcControlLogMapper.insert(new PsdcControlLog(deviceId,null,null,"设备启停",s,2,"未找到该设备",SecurityUtils.getUsername())); + psdcControlLogMapper.insert(new PsdcControlLog(deviceId,null,null,"设备启停",s,2,"未找到该设备",controlBy)); throw new ControlException("控制失败，未找到该设备"); } //TODO 发送MQTT指令 - // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),"设备启停",s,2,"等待终端响应超时",SecurityUtils.getUsername())); + // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),"设备启停",s,2,"等待终端响应超时",controlBy)); //发送成功 - psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),"设备启停",s,2,"控制成功",SecurityUtils.getUsername())); + psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),"设备启停",s,2,"控制成功",controlBy)); return psdcDeviceMapper.updateDevRunStatusByDevId(deviceId,runStatus); } diff --git a/psdc-business/src/main/resources/mapper/business/PsdcControlLogMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcControlLogMapper.xml index 9798048..858efdc 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcControlLogMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcControlLogMapper.xml @@ -77,6 +77,7 @@ and update_time = #{updateTime} + order by create_time desc diff --git a/psdc-common/src/main/java/com/psdc/core/controller/BaseController.java b/psdc-common/src/main/java/com/psdc/core/controller/BaseController.java index 1c4b674..09e8784 100644 --- a/psdc-common/src/main/java/com/psdc/core/controller/BaseController.java +++ b/psdc-common/src/main/java/com/psdc/core/controller/BaseController.java @@ -4,12 +4,16 @@ import java.beans.PropertyEditorSupport; import java.util.Date; import java.util.List; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.github.pagehelper.page.PageMethod; import com.psdc.constant.HttpStatus; import com.psdc.utils.DateUtils; import com.psdc.utils.PageUtils; import com.psdc.utils.SecurityUtils; import com.psdc.utils.StringUtils; import com.psdc.utils.sql.SqlUtil; +import org.apache.poi.ss.formula.functions.T; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; diff --git a/psdc-common/src/main/java/com/psdc/utils/PageUtils.java b/psdc-common/src/main/java/com/psdc/utils/PageUtils.java index 53d7097..9051fa8 100644 --- a/psdc-common/src/main/java/com/psdc/utils/PageUtils.java +++ b/psdc-common/src/main/java/com/psdc/utils/PageUtils.java @@ -1,9 +1,13 @@ package com.psdc.utils; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.page.PageMethod; import com.psdc.core.page.PageDomain; import com.psdc.core.page.TableSupport; import com.psdc.utils.sql.SqlUtil; +import org.apache.poi.ss.formula.functions.T; /** * 分页工具类 diff --git a/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java b/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java index b5acbf5..0a3089e 100644 --- a/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java +++ b/psdc-web/src/main/java/com/psdc/controller/control/ManualControl.java @@ -1,22 +1,22 @@ package com.psdc.controller.control; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; +import com.github.pagehelper.page.PageMethod; import com.psdc.core.controller.BaseController; import com.psdc.core.domain.AjaxResult; -import com.psdc.core.domain.entity.SysUser; import com.psdc.core.page.TableDataInfo; -import com.psdc.domain.SysConfig; import com.psdc.entity.PsdcControlLog; import com.psdc.entity.vo.DeviceStatusVo; import com.psdc.service.IPsdcControlLogService; import com.psdc.service.IPsdcDeviceService; -import org.aspectj.weaver.loadtime.Aj; +import com.psdc.utils.SecurityUtils; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @@ -49,7 +49,7 @@ public class ManualControl extends BaseController { @PreAuthorize("@ss.hasPermi('control:manual:startstop')") @PostMapping("/startAndStop") public AjaxResult deviceStartAndStop(@RequestBody JSONObject jsonObject){ - int i = psdcDeviceService.controlDeviceStartAndStop(jsonObject.getInteger("deviceId"), jsonObject.getInteger("runStatus")); + int i = psdcDeviceService.controlDeviceStartAndStop(jsonObject.getInteger("deviceId"), jsonObject.getInteger("runStatus"), SecurityUtils.getUsername()); if ( i == 1){ return AjaxResult.success("控制成功"); } else { @@ -60,11 +60,14 @@ public class ManualControl extends BaseController { /** * 获取调控日志列表 */ - @PreAuthorize("@ss.hasPermi('control:timer:controlLogList')") - @GetMapping("/controlLogList") - public TableDataInfo controlLogList(PsdcControlLog psdcControlLog) { - startPage(); + @PreAuthorize("@ss.hasPermi('control:manual:controlLogList')") + @PostMapping("/controlLogList") + public TableDataInfo controlLogList(@RequestBody JSONObject jsonObject) { + PageMethod.startPage(jsonObject.getInteger("pageNum"),jsonObject.getInteger("pageSize")); + PsdcControlLog psdcControlLog = JSON.parseObject(String.valueOf(jsonObject), PsdcControlLog.class); List list = psdcControlLogService.query(psdcControlLog); return getDataTable(list); } + + }