From 8e6b9423ec8ee2a750bbfba0ac9c6560967d6e0a Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 9 Aug 2023 09:40:29 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=89=8B=E6=8C=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DasDeviceCheckRecordController.java | 6 +- .../service/IDasDeviceCheckRecordService.java | 4 +- .../service/dao/DasDeviceCheckRecord.java | 2 +- .../mapper/DasDeviceCheckRecordMapper.java | 4 +- .../dao/mapper/DasDeviceCheckRecordMapper.xml | 2 +- .../service/dto/DasDeviceCheckRecordDto.java | 2 +- .../dto/DasDeviceCheckRecordQuery.java | 4 +- .../impl/DasDeviceCheckRecordServiceImpl.java | 11 +- .../DasDeviceOperationRecordController.java | 66 ++++++++++ .../IDasDeviceOperationRecordService.java | 44 +++++++ .../service/dao/DasDeviceOperationRecord.java | 43 +++++++ .../DasDeviceOperationRecordMapper.java | 12 ++ .../mapper/DasDeviceOperationRecordMapper.xml | 5 + .../dto/DasDeviceOperationRecordDto.java | 31 +++++ .../dto/DasDeviceOperationRecordQuery.java | 12 ++ .../DasDeviceOperationRecordServiceImpl.java | 74 ++++++++++++ .../nl/wms/pda/controller/PdaController.java | 23 +++- .../org/nl/wms/pda/service/PdaService.java | 2 + .../wms/pda/service/impl/PdaServiceImpl.java | 5 + .../check}/dasDeviceCheckRecord.js | 0 .../{devicecheck => device/check}/index.vue | 38 ++++-- .../operation/dasDeviceOperationRecord.js | 27 +++++ .../views/wms/das/device/operation/index.vue | 113 ++++++++++++++++++ 23 files changed, 494 insertions(+), 36 deletions(-) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/controller/DasDeviceCheckRecordController.java (92%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/IDasDeviceCheckRecordService.java (89%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/dao/DasDeviceCheckRecord.java (95%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/dao/mapper/DasDeviceCheckRecordMapper.java (60%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/dao/mapper/DasDeviceCheckRecordMapper.xml (62%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/dto/DasDeviceCheckRecordDto.java (91%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/dto/DasDeviceCheckRecordQuery.java (59%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/{devicecheck => device/check}/service/impl/DasDeviceCheckRecordServiceImpl.java (87%) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java rename lms/nladmin-ui/src/views/wms/das/{devicecheck => device/check}/dasDeviceCheckRecord.js (100%) rename lms/nladmin-ui/src/views/wms/das/{devicecheck => device/check}/index.vue (79%) create mode 100644 lms/nladmin-ui/src/views/wms/das/device/operation/dasDeviceOperationRecord.js create mode 100644 lms/nladmin-ui/src/views/wms/das/device/operation/index.vue diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java similarity index 92% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java index 92e018c..f7530a8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java @@ -1,4 +1,4 @@ -package org.nl.wms.das.devicecheck.controller; +package org.nl.wms.das.device.check.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.das.devicecheck.service.IDasDeviceCheckRecordService; -import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.IDasDeviceCheckRecordService; +import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java similarity index 89% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java index 96e2372..93951d9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java @@ -1,9 +1,9 @@ -package org.nl.wms.das.devicecheck.service; +package org.nl.wms.das.device.check.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import java.util.Map; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java similarity index 95% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java index c64cce2..ec302ca 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java @@ -1,4 +1,4 @@ -package org.nl.wms.das.devicecheck.service.dao; +package org.nl.wms.das.device.check.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java similarity index 60% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java index f635bf3..0e6bb98 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java @@ -1,7 +1,7 @@ -package org.nl.wms.das.devicecheck.service.dao.mapper; +package org.nl.wms.das.device.check.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.xml similarity index 62% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.xml index a36057d..6dcb82f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java similarity index 91% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java index 6352d27..1f1fe18 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.das.devicecheck.service.dto; +package org.nl.wms.das.device.check.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java similarity index 59% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java index 10a5b03..38d6b1f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java @@ -1,7 +1,7 @@ -package org.nl.wms.das.devicecheck.service.dto; +package org.nl.wms.das.device.check.service.dto; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java similarity index 87% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java index db52f74..ced56a9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java @@ -1,22 +1,19 @@ -package org.nl.wms.das.devicecheck.service.impl; +package org.nl.wms.das.device.check.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; -import org.nl.wms.das.devicecheck.service.IDasDeviceCheckRecordService; -import org.nl.wms.das.devicecheck.service.dao.mapper.DasDeviceCheckRecordMapper; -import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.IDasDeviceCheckRecordService; +import org.nl.wms.das.device.check.service.dao.mapper.DasDeviceCheckRecordMapper; +import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java new file mode 100644 index 0000000..3a9e918 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java @@ -0,0 +1,66 @@ +package org.nl.wms.das.device.operation.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.das.device.operation.service.IDasDeviceOperationRecordService; +import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; +/** +* @author lyd +* @date 2023-08-09 +**/ +@Slf4j +@RestController +@Api(tags = "设备动作操作记录管理") +@RequestMapping("/api/dasDeviceOperationRecord") +public class DasDeviceOperationRecordController { + + @Autowired + private IDasDeviceOperationRecordService dasDeviceOperationRecordService; + + @GetMapping + @Log("查询设备动作操作记录") + @ApiOperation("查询设备动作操作记录") + //@SaCheckPermission("@el.check('dasDeviceOperationRecord:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(dasDeviceOperationRecordService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增设备动作操作记录") + @ApiOperation("新增设备动作操作记录") + //@SaCheckPermission("@el.check('dasDeviceOperationRecord:add')") + public ResponseEntity create(@Validated @RequestBody DasDeviceOperationRecord entity){ + dasDeviceOperationRecordService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改设备动作操作记录") + @ApiOperation("修改设备动作操作记录") + //@SaCheckPermission("@el.check('dasDeviceOperationRecord:edit')") + public ResponseEntity update(@Validated @RequestBody DasDeviceOperationRecord entity){ + dasDeviceOperationRecordService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除设备动作操作记录") + @ApiOperation("删除设备动作操作记录") + //@SaCheckPermission("@el.check('dasDeviceOperationRecord:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + dasDeviceOperationRecordService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java new file mode 100644 index 0000000..b0fec49 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java @@ -0,0 +1,44 @@ +package org.nl.wms.das.device.operation.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; +import org.nl.wms.pda.service.dao.vo.PdaResponseVo; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-08-09 +**/ +public interface IDasDeviceOperationRecordService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + PdaResponseVo create(DasDeviceOperationRecord entity); + + /** + * 编辑 + * @param entity / + */ + void update(DasDeviceOperationRecord entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java new file mode 100644 index 0000000..8d0e1cf --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java @@ -0,0 +1,43 @@ +package org.nl.wms.das.device.operation.service.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-08-09 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("das_device_operation_record") +public class DasDeviceOperationRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "record_id", type = IdType.NONE) + @ApiModelProperty(value = "记录标识") + private String record_id; + + @ApiModelProperty(value = "账号") + private String username; + + @ApiModelProperty(value = "用户名") + private String person_name; + + @ApiModelProperty(value = "记录时间") + private String record_time; + + @ApiModelProperty(value = "设备号") + private String device_code; + + @ApiModelProperty(value = "动作") + private String device_action; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java new file mode 100644 index 0000000..43a0ecb --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.das.device.operation.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; + +/** +* @author lyd +* @date 2023-08-09 +**/ +public interface DasDeviceOperationRecordMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.xml new file mode 100644 index 0000000..efdecbc --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java new file mode 100644 index 0000000..406f330 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java @@ -0,0 +1,31 @@ +package org.nl.wms.das.device.operation.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-08-09 +**/ +@Data +public class DasDeviceOperationRecordDto implements Serializable { + + /** 记录标识 */ + private String record_id; + + /** 账号 */ + private String username; + + /** 用户名 */ + private String person_name; + + /** 记录时间 */ + private String record_time; + + /** 设备号 */ + private String device_code; + + /** 动作 */ + private String device_action; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java new file mode 100644 index 0000000..aa4ef93 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.das.device.operation.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; + +/** +* @author lyd +* @date 2023-08-09 +**/ +public class DasDeviceOperationRecordQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java new file mode 100644 index 0000000..1fecb41 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java @@ -0,0 +1,74 @@ +package org.nl.wms.das.device.operation.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.system.service.user.ISysUserService; +import org.nl.system.service.user.dao.SysUser; +import org.nl.wms.das.device.operation.service.IDasDeviceOperationRecordService; +import org.nl.wms.das.device.operation.service.dao.mapper.DasDeviceOperationRecordMapper; +import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; +import org.nl.wms.pda.service.dao.vo.PdaResponseVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author lyd +* @date 2023-08-09 +**/ +@Slf4j +@Service +public class DasDeviceOperationRecordServiceImpl extends ServiceImpl implements IDasDeviceOperationRecordService { + + @Autowired + private DasDeviceOperationRecordMapper dasDeviceOperationRecordMapper; + @Autowired + private ISysUserService userService; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + dasDeviceOperationRecordMapper.selectPage(pages, lam); + return pages; + } + + @Override + public PdaResponseVo create(DasDeviceOperationRecord entity) { + SysUser sysUser = userService.getOne(new LambdaQueryWrapper() + .eq(SysUser::getUsername, entity.getUsername())); + entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setRecord_time(DateUtil.now()); + entity.setPerson_name(sysUser.getPerson_name()); + dasDeviceOperationRecordMapper.insert(entity); + return PdaResponseVo.pdaResultOk("设备[" + entity.getDevice_code() + "]动作切换成功,操作人: " + sysUser.getPerson_name()); + } + + @Override + public void update(DasDeviceOperationRecord entity) { + DasDeviceOperationRecord dto = dasDeviceOperationRecordMapper.selectById(entity.getRecord_id()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + entity.setRecord_time(DateUtil.now()); + + dasDeviceOperationRecordMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + dasDeviceOperationRecordMapper.deleteBatchIds(ids); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java index efcbe14..ac16711 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java @@ -1,14 +1,14 @@ package org.nl.wms.pda.controller; -import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; -import org.nl.wms.das.devicecheck.service.IDasDeviceCheckRecordService; -import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.IDasDeviceCheckRecordService; +import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.operation.service.IDasDeviceOperationRecordService; +import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; import org.nl.wms.pda.service.PdaService; -import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -31,6 +31,8 @@ public class PdaController { @Autowired private IDasDeviceCheckRecordService deviceCheckRecordService; @Autowired + private IDasDeviceOperationRecordService deviceOperationRecordService; + @Autowired private PdaService pdaService; @PostMapping("/deviceCheck/verify") @Log("设备点检") @@ -53,4 +55,17 @@ public class PdaController { return new ResponseEntity<>(pdaService.getDeviceStatus(), HttpStatus.OK); } + @PostMapping("/deviceSwitchover/deviceAction") + @Log("设备动作下拉框数据") + @ApiOperation("设备动作下拉框数据") + public ResponseEntity deviceAction(){ + return new ResponseEntity<>(pdaService.deviceAction(), HttpStatus.OK); + } + + @PostMapping("/deviceSwitchover/verify") + @Log("设备动作切换") + @ApiOperation("设备动作切换") + public ResponseEntity deviceSwitchover(@Validated @RequestBody DasDeviceOperationRecord entity){ + return new ResponseEntity<>(deviceOperationRecordService.create(entity), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java index 5647591..a1f4441 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java @@ -13,4 +13,6 @@ public interface PdaService { List getDeviceInfo(); List getDeviceStatus(); + + List deviceAction(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index f43d020..3fb133b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -29,4 +29,9 @@ public class PdaServiceImpl implements PdaService { public List getDeviceStatus() { return pdaMapper.getDictByCode("device_status"); } + + @Override + public List deviceAction() { + return pdaMapper.getDictByCode("device_action"); + } } diff --git a/lms/nladmin-ui/src/views/wms/das/devicecheck/dasDeviceCheckRecord.js b/lms/nladmin-ui/src/views/wms/das/device/check/dasDeviceCheckRecord.js similarity index 100% rename from lms/nladmin-ui/src/views/wms/das/devicecheck/dasDeviceCheckRecord.js rename to lms/nladmin-ui/src/views/wms/das/device/check/dasDeviceCheckRecord.js diff --git a/lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue b/lms/nladmin-ui/src/views/wms/das/device/check/index.vue similarity index 79% rename from lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue rename to lms/nladmin-ui/src/views/wms/das/device/check/index.vue index 1a35d85..9f89c7e 100644 --- a/lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue +++ b/lms/nladmin-ui/src/views/wms/das/device/check/index.vue @@ -39,15 +39,19 @@ - - + + + + + + + + + @@ -57,11 +61,11 @@ + +