From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限

---
 src/main/java/com/whyc/service/DeviceManageService.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/whyc/service/DeviceManageService.java b/src/main/java/com/whyc/service/DeviceManageService.java
index e3de92e..1034f7f 100644
--- a/src/main/java/com/whyc/service/DeviceManageService.java
+++ b/src/main/java/com/whyc/service/DeviceManageService.java
@@ -5,12 +5,17 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.whyc.dto.Response;
 import com.whyc.mapper.DeviceManageMapper;
+import com.whyc.pojo.DeviceMaintain;
 import com.whyc.pojo.DeviceManage;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 
 @Service("deviceManageService")
 public class DeviceManageService {
@@ -21,14 +26,15 @@
     public Response add(DeviceManage deviceManage) {
         //鏂板鍏ュ簱
         deviceManage.setStatus((byte) 1);
+        deviceManage.setCreateTime(new Date());
         mapper.insert(deviceManage);
         return new Response().setMsg(1,"娣诲姞鎴愬姛");
     }
 
     public Response delete(Integer deviceId) {
-        //閫昏緫鍒犻櫎,鏇存敼鐘舵�佷负0
+        //閫昏緫鍒犻櫎,鏇存敼鐘舵�佷负0,娣诲姞鎶ュ簾鏃ユ湡
         UpdateWrapper<DeviceManage> wrapper = Wrappers.update();
-        wrapper.set("status",0).eq("device_id",deviceId);
+        wrapper.set("status",0).set("scrap_time",new Date()).eq("device_id",deviceId);
         int update = mapper.update(null, wrapper);
         return new Response().setMsg(1,"鍑哄簱鎶ュ簾鎴愬姛");
     }
@@ -38,10 +44,32 @@
         return new Response().setMsg(1,"淇敼鎴愬姛");
     }
 
-    public Response<IPage<DeviceManage>> getAll(int pageNum,int pageSize) {
-        QueryWrapper<DeviceManage> wrapper = Wrappers.query();
+    /*public Response<PageInfo<DeviceManage>> getPage(int pageNum,int pageSize) {
+        *//*QueryWrapper<DeviceManage> wrapper = Wrappers.query();
         wrapper.eq("status",1);
-        IPage<DeviceManage> page1 = mapper.selectPage(new Page<>(pageNum,pageSize), wrapper);
-        return new Response<IPage<DeviceManage>>().set(1,page1);
+        IPage<DeviceManage> page1 = mapper.selectPage(new Page<>(pageNum,pageSize), wrapper);*//*
+        PageHelper.startPage(pageNum,pageSize,true);
+        List<DeviceManage> deviceManageList = mapper.getAll();
+        PageInfo<DeviceManage> deviceManagePageInfo = new PageInfo<>(deviceManageList);
+        return new Response<PageInfo<DeviceManage>>().set(1,deviceManagePageInfo);
+    }*/
+
+    public Response<List<DeviceManage>> getList() {
+        List<DeviceManage> deviceManageList= mapper.getList();
+        return new Response<List<DeviceManage>>().set(1,deviceManageList);
+    }
+
+    public Response<PageInfo<DeviceManage>> getPageByCondition(int pageNum, int pageSize, DeviceManage deviceManage) {
+        PageHelper.startPage(pageNum,pageSize);
+        List<DeviceManage> deviceManageList = mapper.getAllByCondition(deviceManage);
+        PageInfo<DeviceManage> deviceManagePageInfo = new PageInfo<>(deviceManageList);
+        return new Response<PageInfo<DeviceManage>>().set(1,deviceManagePageInfo);
+    }
+
+    public Response getSite() {
+        QueryWrapper<DeviceManage> wrapper = Wrappers.query();
+        wrapper.select("distinct site").orderByAsc("site");
+        List<DeviceManage> deviceManageList = mapper.selectList(wrapper);
+        return new Response().set(1,deviceManageList);
     }
 }

--
Gitblit v1.9.1