From 3ef744a46f189f1985f3c3e837f825f80a58d6ed Mon Sep 17 00:00:00 2001 From: HMY <3124750372@qq.com> Date: Fri, 6 Sep 2024 10:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=BA=9B=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=9A=84=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PupuEquipmentController.java | 21 +++++--- .../hit/controller/PupuLogController.java | 32 ++++++++++++ .../project/hit/domain/PupuEquipment.java | 10 ++-- .../com/ruoyi/project/hit/domain/PupuLog.java | 32 ++++++++++++ .../hit/domain/PupuStoreEquipment.java | 23 --------- .../project/hit/domain/vo/AddEquipmentVO.java | 7 --- .../project/hit/domain/vo/SelectLogVO.java | 15 ++++++ .../project/hit/mapper/PupuLogMapper.java | 23 +++++++++ .../hit/mapper/PupuStoreEquipmentMapper.java | 18 ------- .../hit/service/PupuEquipmentService.java | 3 ++ .../project/hit/service/PupuLogService.java | 20 ++++++++ .../service/PupuStoreEquipmentService.java | 13 ----- .../impl/PupuEquipmentServiceImpl.java | 49 +++++++++++++++++-- .../hit/service/impl/PupuLogServiceImpl.java | 38 ++++++++++++++ .../impl/PupuStoreEquipmentServiceImpl.java | 22 --------- .../service/impl/PupuStoreServiceImpl.java | 8 +++ .../mybatis/hit/PupuEquipmentMapper.xml | 1 + .../resources/mybatis/hit/PupuLogMapper.xml | 42 ++++++++++++++++ .../mybatis/hit/PupuStoreEquipmentMapper.xml | 16 ------ .../resources/mybatis/hit/PupuStoreMapper.xml | 2 +- .../mybatis/hit/PupuUpsHistoryMapper.xml | 12 ++--- 21 files changed, 285 insertions(+), 122 deletions(-) create mode 100644 src/main/java/com/ruoyi/project/hit/controller/PupuLogController.java create mode 100644 src/main/java/com/ruoyi/project/hit/domain/PupuLog.java delete mode 100644 src/main/java/com/ruoyi/project/hit/domain/PupuStoreEquipment.java delete mode 100644 src/main/java/com/ruoyi/project/hit/domain/vo/AddEquipmentVO.java create mode 100644 src/main/java/com/ruoyi/project/hit/domain/vo/SelectLogVO.java create mode 100644 src/main/java/com/ruoyi/project/hit/mapper/PupuLogMapper.java delete mode 100644 src/main/java/com/ruoyi/project/hit/mapper/PupuStoreEquipmentMapper.java create mode 100644 src/main/java/com/ruoyi/project/hit/service/PupuLogService.java delete mode 100644 src/main/java/com/ruoyi/project/hit/service/PupuStoreEquipmentService.java create mode 100644 src/main/java/com/ruoyi/project/hit/service/impl/PupuLogServiceImpl.java delete mode 100644 src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreEquipmentServiceImpl.java create mode 100644 src/main/resources/mybatis/hit/PupuLogMapper.xml delete mode 100644 src/main/resources/mybatis/hit/PupuStoreEquipmentMapper.xml diff --git a/src/main/java/com/ruoyi/project/hit/controller/PupuEquipmentController.java b/src/main/java/com/ruoyi/project/hit/controller/PupuEquipmentController.java index f31feaf..bc451f1 100644 --- a/src/main/java/com/ruoyi/project/hit/controller/PupuEquipmentController.java +++ b/src/main/java/com/ruoyi/project/hit/controller/PupuEquipmentController.java @@ -1,19 +1,26 @@ package com.ruoyi.project.hit.controller; +import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.project.hit.domain.PupuEquipment; import com.ruoyi.project.hit.service.PupuEquipmentService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/hit/equipment") -public class PupuEquipmentController { +public class PupuEquipmentController extends BaseController { @Autowired private PupuEquipmentService pupuEquipmentService; -// @PutMapping("/add") -// public AjaxResult add(@RequestBody ) + @PutMapping("/add") + public AjaxResult add(@RequestBody PupuEquipment pupuEquipment){ + return toAjax(pupuEquipmentService.add(pupuEquipment)); + } + + @DeleteMapping("/del/{equipmentId}") + public AjaxResult del(@PathVariable(value = "equipmentId") Integer equipmentId){ + return toAjax(pupuEquipmentService.del(equipmentId)); + } + } diff --git a/src/main/java/com/ruoyi/project/hit/controller/PupuLogController.java b/src/main/java/com/ruoyi/project/hit/controller/PupuLogController.java new file mode 100644 index 0000000..aea0a90 --- /dev/null +++ b/src/main/java/com/ruoyi/project/hit/controller/PupuLogController.java @@ -0,0 +1,32 @@ +package com.ruoyi.project.hit.controller; + +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.project.hit.domain.vo.SelectLogVO; +import com.ruoyi.project.hit.service.PupuLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.List; + +@RestController +@RequestMapping("/hit/log") +public class PupuLogController extends BaseController { + @Autowired + private PupuLogService pupuLogService; + + /** + * 日志查询（分页） + * @param selectLogVO + * @return + */ + @GetMapping("/select") + public TableDataInfo select(@RequestBody SelectLogVO selectLogVO){ + List select = pupuLogService.select(selectLogVO); + return getDataTable(select); + } +} diff --git a/src/main/java/com/ruoyi/project/hit/domain/PupuEquipment.java b/src/main/java/com/ruoyi/project/hit/domain/PupuEquipment.java index e1c8bf0..26179c3 100644 --- a/src/main/java/com/ruoyi/project/hit/domain/PupuEquipment.java +++ b/src/main/java/com/ruoyi/project/hit/domain/PupuEquipment.java @@ -1,9 +1,7 @@ package com.ruoyi.project.hit.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.util.Date; import lombok.Data; @@ -14,12 +12,16 @@ import lombok.Data; @TableName(value ="pupu_equipment") @Data public class PupuEquipment implements Serializable { + @TableId(type = IdType.AUTO) private Integer equipmentId; private String serialNumber; + @TableField(fill = FieldFill.INSERT) private Date createTime; + private Integer storeId; + private Integer status; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/ruoyi/project/hit/domain/PupuLog.java b/src/main/java/com/ruoyi/project/hit/domain/PupuLog.java new file mode 100644 index 0000000..333fdf2 --- /dev/null +++ b/src/main/java/com/ruoyi/project/hit/domain/PupuLog.java @@ -0,0 +1,32 @@ +package com.ruoyi.project.hit.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * @TableName pupu_log + */ +@TableName(value ="pupu_log") +@Data +public class PupuLog implements Serializable { + @TableId(type = IdType.AUTO) + private Integer logId; + + private String logEvent; + + private Integer logSort; + + @TableField(fill = FieldFill.INSERT) + private Date time; + + private static final long serialVersionUID = 1L; + + public PupuLog(String logEvent, Integer logSort, Date time) { + this.logEvent = logEvent; + this.logSort = logSort; + this.time = time; + } +} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/project/hit/domain/PupuStoreEquipment.java b/src/main/java/com/ruoyi/project/hit/domain/PupuStoreEquipment.java deleted file mode 100644 index 49b0f37..0000000 --- a/src/main/java/com/ruoyi/project/hit/domain/PupuStoreEquipment.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ruoyi.project.hit.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import lombok.Data; - -/** - * @TableName pupu_store_equipment - */ -@TableName(value ="pupu_store_equipment") -@Data -public class PupuStoreEquipment implements Serializable { - private Integer id; - - private Integer storeId; - - private Integer equipmentId; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/project/hit/domain/vo/AddEquipmentVO.java b/src/main/java/com/ruoyi/project/hit/domain/vo/AddEquipmentVO.java deleted file mode 100644 index ad5c677..0000000 --- a/src/main/java/com/ruoyi/project/hit/domain/vo/AddEquipmentVO.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ruoyi.project.hit.domain.vo; - -import lombok.Data; - -@Data -public class AddEquipmentVO { -} diff --git a/src/main/java/com/ruoyi/project/hit/domain/vo/SelectLogVO.java b/src/main/java/com/ruoyi/project/hit/domain/vo/SelectLogVO.java new file mode 100644 index 0000000..82ab27e --- /dev/null +++ b/src/main/java/com/ruoyi/project/hit/domain/vo/SelectLogVO.java @@ -0,0 +1,15 @@ +package com.ruoyi.project.hit.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SelectLogVO { + + private Integer sortId; + + private Date startTime; + + private Date endTime; +} diff --git a/src/main/java/com/ruoyi/project/hit/mapper/PupuLogMapper.java b/src/main/java/com/ruoyi/project/hit/mapper/PupuLogMapper.java new file mode 100644 index 0000000..8d59cc3 --- /dev/null +++ b/src/main/java/com/ruoyi/project/hit/mapper/PupuLogMapper.java @@ -0,0 +1,23 @@ +package com.ruoyi.project.hit.mapper; + +import com.ruoyi.project.hit.domain.PupuLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.project.hit.domain.vo.SelectLogVO; + +import java.util.HashMap; +import java.util.List; + +/** +* @author HP +* @description 针对表【pupu_log】的数据库操作Mapper +* @createDate 2024-09-06 09:11:59 +* @Entity com.ruoyi.project.hit.domain.PupuLog +*/ +public interface PupuLogMapper extends BaseMapper { + + List select(SelectLogVO selectLogVO); +} + + + + diff --git a/src/main/java/com/ruoyi/project/hit/mapper/PupuStoreEquipmentMapper.java b/src/main/java/com/ruoyi/project/hit/mapper/PupuStoreEquipmentMapper.java deleted file mode 100644 index 7d5d428..0000000 --- a/src/main/java/com/ruoyi/project/hit/mapper/PupuStoreEquipmentMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.project.hit.mapper; - -import com.ruoyi.project.hit.domain.PupuStoreEquipment; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author HP -* @description 针对表【pupu_store_equipment】的数据库操作Mapper -* @createDate 2024-09-05 16:50:00 -* @Entity com.ruoyi.project.hit.domain.PupuStoreEquipment -*/ -public interface PupuStoreEquipmentMapper extends BaseMapper { - -} - - - - diff --git a/src/main/java/com/ruoyi/project/hit/service/PupuEquipmentService.java b/src/main/java/com/ruoyi/project/hit/service/PupuEquipmentService.java index aa6540f..2fe5db4 100644 --- a/src/main/java/com/ruoyi/project/hit/service/PupuEquipmentService.java +++ b/src/main/java/com/ruoyi/project/hit/service/PupuEquipmentService.java @@ -10,4 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PupuEquipmentService extends IService { + int add(PupuEquipment pupuEquipment); + + int del(Integer equipmentId); } diff --git a/src/main/java/com/ruoyi/project/hit/service/PupuLogService.java b/src/main/java/com/ruoyi/project/hit/service/PupuLogService.java new file mode 100644 index 0000000..48b2e44 --- /dev/null +++ b/src/main/java/com/ruoyi/project/hit/service/PupuLogService.java @@ -0,0 +1,20 @@ +package com.ruoyi.project.hit.service; + +import com.ruoyi.project.hit.domain.PupuLog; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.project.hit.domain.vo.SelectLogVO; + +import java.util.HashMap; +import java.util.List; + +/** +* @author HP +* @description 针对表【pupu_log】的数据库操作Service +* @createDate 2024-09-06 09:11:59 +*/ +public interface PupuLogService extends IService { + + int add(PupuLog pupuLog); + + List select(SelectLogVO selectLogVO); +} diff --git a/src/main/java/com/ruoyi/project/hit/service/PupuStoreEquipmentService.java b/src/main/java/com/ruoyi/project/hit/service/PupuStoreEquipmentService.java deleted file mode 100644 index 47fe5e4..0000000 --- a/src/main/java/com/ruoyi/project/hit/service/PupuStoreEquipmentService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.project.hit.service; - -import com.ruoyi.project.hit.domain.PupuStoreEquipment; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author HP -* @description 针对表【pupu_store_equipment】的数据库操作Service -* @createDate 2024-09-05 16:50:00 -*/ -public interface PupuStoreEquipmentService extends IService { - -} diff --git a/src/main/java/com/ruoyi/project/hit/service/impl/PupuEquipmentServiceImpl.java b/src/main/java/com/ruoyi/project/hit/service/impl/PupuEquipmentServiceImpl.java index 9bb1fb5..070bab8 100644 --- a/src/main/java/com/ruoyi/project/hit/service/impl/PupuEquipmentServiceImpl.java +++ b/src/main/java/com/ruoyi/project/hit/service/impl/PupuEquipmentServiceImpl.java @@ -1,20 +1,59 @@ package com.ruoyi.project.hit.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.exception.CustomException; import com.ruoyi.project.hit.domain.PupuEquipment; +import com.ruoyi.project.hit.domain.PupuLog; +import com.ruoyi.project.hit.domain.PupuStore; +import com.ruoyi.project.hit.mapper.PupuStoreMapper; import com.ruoyi.project.hit.service.PupuEquipmentService; import com.ruoyi.project.hit.mapper.PupuEquipmentMapper; +import com.ruoyi.project.hit.service.PupuLogService; +import com.ruoyi.project.hit.service.PupuStoreService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.Date; + /** -* @author HP -* @description 针对表【pupu_equipment】的数据库操作Service实现 -* @createDate 2024-09-05 16:50:18 -*/ + * @author HP + * @description 针对表【pupu_equipment】的数据库操作Service实现 + * @createDate 2024-09-05 16:50:18 + */ @Service public class PupuEquipmentServiceImpl extends ServiceImpl - implements PupuEquipmentService{ + implements PupuEquipmentService { + @Resource + private PupuEquipmentMapper pupuEquipmentMapper; + @Resource + private PupuLogService pupuLogService; + @Resource + private PupuStoreMapper pupuStoreMapper; + + @Override + public int add(PupuEquipment pupuEquipment) { + if(pupuStoreMapper.selectById(pupuEquipment.getStoreId())==null){ + throw new CustomException("该门店不存在"); + } + LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(PupuEquipment::getSerialNumber,pupuEquipment.getSerialNumber()); + if(pupuEquipmentMapper.selectOne(wrapper)!=null){ + throw new CustomException("标识码重复"); + }; + pupuLogService.add(new PupuLog("设备新增",1,new Date())); + return pupuEquipmentMapper.insert(pupuEquipment); + } + + @Override + public int del(Integer equipmentId) { + if(pupuEquipmentMapper.selectById(equipmentId)==null){ + throw new CustomException("该设备不存在"); + } + pupuLogService.add(new PupuLog("设备删除",2,new Date())); + return pupuEquipmentMapper.deleteById(equipmentId); + } } diff --git a/src/main/java/com/ruoyi/project/hit/service/impl/PupuLogServiceImpl.java b/src/main/java/com/ruoyi/project/hit/service/impl/PupuLogServiceImpl.java new file mode 100644 index 0000000..03f2582 --- /dev/null +++ b/src/main/java/com/ruoyi/project/hit/service/impl/PupuLogServiceImpl.java @@ -0,0 +1,38 @@ +package com.ruoyi.project.hit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.project.hit.domain.PupuLog; +import com.ruoyi.project.hit.domain.vo.SelectLogVO; +import com.ruoyi.project.hit.service.PupuLogService; +import com.ruoyi.project.hit.mapper.PupuLogMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; + +/** +* @author HP +* @description 针对表【pupu_log】的数据库操作Service实现 +* @createDate 2024-09-06 09:11:59 +*/ +@Service +public class PupuLogServiceImpl extends ServiceImpl + implements PupuLogService{ + @Resource + private PupuLogMapper pupuLogMapper; + + @Override + public int add(PupuLog pupuLog) { + return pupuLogMapper.insert(pupuLog); + } + + @Override + public List select(SelectLogVO selectLogVO) { + return pupuLogMapper.select(selectLogVO); + } +} + + + + diff --git a/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreEquipmentServiceImpl.java b/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreEquipmentServiceImpl.java deleted file mode 100644 index afa1224..0000000 --- a/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreEquipmentServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ruoyi.project.hit.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.project.hit.domain.PupuStoreEquipment; -import com.ruoyi.project.hit.service.PupuStoreEquipmentService; -import com.ruoyi.project.hit.mapper.PupuStoreEquipmentMapper; -import org.springframework.stereotype.Service; - -/** -* @author HP -* @description 针对表【pupu_store_equipment】的数据库操作Service实现 -* @createDate 2024-09-05 16:50:00 -*/ -@Service -public class PupuStoreEquipmentServiceImpl extends ServiceImpl - implements PupuStoreEquipmentService{ - -} - - - - diff --git a/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreServiceImpl.java b/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreServiceImpl.java index 78ba15d..b43bfc9 100644 --- a/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreServiceImpl.java +++ b/src/main/java/com/ruoyi/project/hit/service/impl/PupuStoreServiceImpl.java @@ -1,12 +1,15 @@ package com.ruoyi.project.hit.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.project.hit.domain.PupuLog; import com.ruoyi.project.hit.domain.PupuStore; +import com.ruoyi.project.hit.service.PupuLogService; import com.ruoyi.project.hit.service.PupuStoreService; import com.ruoyi.project.hit.mapper.PupuStoreMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; /** * @author HP @@ -19,13 +22,18 @@ public class PupuStoreServiceImpl extends ServiceImpl + diff --git a/src/main/resources/mybatis/hit/PupuLogMapper.xml b/src/main/resources/mybatis/hit/PupuLogMapper.xml new file mode 100644 index 0000000..56d45a4 --- /dev/null +++ b/src/main/resources/mybatis/hit/PupuLogMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + log_id,log_event,log_sort, + time + + + diff --git a/src/main/resources/mybatis/hit/PupuStoreEquipmentMapper.xml b/src/main/resources/mybatis/hit/PupuStoreEquipmentMapper.xml deleted file mode 100644 index 8fb9024..0000000 --- a/src/main/resources/mybatis/hit/PupuStoreEquipmentMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - id,store_id,equipment_id - - diff --git a/src/main/resources/mybatis/hit/PupuStoreMapper.xml b/src/main/resources/mybatis/hit/PupuStoreMapper.xml index 46e4576..af38f59 100644 --- a/src/main/resources/mybatis/hit/PupuStoreMapper.xml +++ b/src/main/resources/mybatis/hit/PupuStoreMapper.xml @@ -8,7 +8,7 @@ - + diff --git a/src/main/resources/mybatis/hit/PupuUpsHistoryMapper.xml b/src/main/resources/mybatis/hit/PupuUpsHistoryMapper.xml index 3fe06db..4b8fbe9 100644 --- a/src/main/resources/mybatis/hit/PupuUpsHistoryMapper.xml +++ b/src/main/resources/mybatis/hit/PupuUpsHistoryMapper.xml @@ -33,15 +33,15 @@ pupu_store.store_id AS storeId, pupu_store.store_name AS storeName FROM - pupu_store_equipment - INNER JOIN - pupu_ups_history - ON - pupu_store_equipment.equipment_id = pupu_ups_history.ups_id + pupu_equipment INNER JOIN pupu_store ON - pupu_store.store_id = pupu_store_equipment.store_id + pupu_equipment.store_id = pupu_store.store_id + INNER JOIN + pupu_ups_history + ON + pupu_ups_history.ups_id = pupu_equipment.equipment_id pupu_ups_history.ups_id = #{upsId}