From 17f53c44aaf7772211056ef672de151a2f281cb3 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Mon, 5 Aug 2024 16:54:33 +0800
Subject: [PATCH] device

---
 .../java/jnpf/service/impl/YysClassesServiceImpl.java  |  9 ++++++++-
 .../java/jnpf/service/impl/YysDeviceServiceImpl.java   | 10 +++++++++-
 .../java/jnpf/service/impl/YysPostServiceImpl.java     |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysClassesServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysClassesServiceImpl.java
index 06d811a..5418fe6 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysClassesServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysClassesServiceImpl.java
@@ -225,6 +225,7 @@ public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClas
             }
         }
 
+        yysClassesQueryWrapper.lambda().isNull(YysClassesEntity::getDeleteMark);
         if("0".equals(dataType)){
             if((total>0 && AllIdList.size()>0) || total==0){
                 Page<YysClassesEntity> page=new Page<>(yysClassesPagination.getCurrentPage(), yysClassesPagination.getPageSize());
@@ -255,7 +256,9 @@ public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClas
     @Override
     public void delete(YysClassesEntity entity){
         if(entity!=null){
-            this.removeById(entity.getId());
+            entity.setDeleteMark(1);
+            entity.setDeleteTime(DateUtil.getNowDate());
+            this.updateById(entity);
         }
     }
     /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@@ -290,8 +293,12 @@ public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClas
 
         if(isSave){
             String mainId =  RandomUtil.uuId() ;
+            entity.setCreatorTime(DateUtil.getNowDate());
+            entity.setCreatorUserId(userInfo.getUserId());
             entity.setId(mainId);
         }else{
+            entity.setLastModifyTime(DateUtil.getNowDate());
+            entity.setLastModifyUserId(userInfo.getUserId());
         }
         this.saveOrUpdate(entity);
 
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceServiceImpl.java
index 0f46a07..42cc6ab 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceServiceImpl.java
@@ -64,6 +64,8 @@ public class YysDeviceServiceImpl extends ServiceImpl<YysDeviceMapper, YysDevice
         int total=0;
         int yysDeviceNum =0;
         QueryWrapper<YysDeviceEntity> yysDeviceQueryWrapper=new QueryWrapper<>();
+
+        yysDeviceQueryWrapper.lambda().isNull(YysDeviceEntity::getDeleteMark);
         List<String> allSuperIDlist = new ArrayList<>();
         String superOp ="";
         if (ObjectUtil.isNotEmpty(yysDevicePagination.getSuperQueryJson())){
@@ -255,7 +257,9 @@ public class YysDeviceServiceImpl extends ServiceImpl<YysDeviceMapper, YysDevice
     @Override
     public void delete(YysDeviceEntity entity){
         if(entity!=null){
-            this.removeById(entity.getId());
+            entity.setDeleteMark(1);
+            entity.setDeleteTime(DateUtil.getNowDate());
+            this.updateById(entity);
         }
     }
     /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@@ -293,8 +297,12 @@ public class YysDeviceServiceImpl extends ServiceImpl<YysDeviceMapper, YysDevice
 
         if(isSave){
             String mainId =  RandomUtil.uuId() ;
+            entity.setCreatorTime(DateUtil.getNowDate());
+            entity.setCreatorUserId(userInfo.getUserId());
             entity.setId(mainId);
         }else{
+            entity.setLastModifyTime(DateUtil.getNowDate());
+            entity.setLastModifyUserId(userInfo.getUserId());
         }
         this.saveOrUpdate(entity);
 
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysPostServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysPostServiceImpl.java
index 98b970b..d14dec7 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysPostServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysPostServiceImpl.java
@@ -340,8 +340,8 @@ public class YysPostServiceImpl extends ServiceImpl<YysPostMapper, YysPostEntity
             entity.setCreatorUserId(userInfo.getUserId());
             entity.setId(mainId);
         } else {
-            entity.setLastModifyTime(DateUtil.getNowDate());
-            entity.setLastModifyUserId(userInfo.getUserId());
+                entity.setLastModifyTime(DateUtil.getNowDate());
+                entity.setLastModifyUserId(userInfo.getUserId());
         }
         this.saveOrUpdate(entity);