Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/pm/access-control-device/PmAccessControlDeviceList.vue

@@ -121,22 +121,13 @@
         </template>
         </template>
 
 
         <span slot="action" slot-scope="text, record">
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a-space>
+            <a @click="handleDetail(record)">查看</a>
+            <a @click="handleEdit(record)">修改</a>
+            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+              <a>删除</a>
+            </a-popconfirm>
+          </a-space>
         </span>
         </span>
 
 
       </a-table>
       </a-table>
@@ -162,6 +153,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      queryParam: {deleted: false},
       description: 'pm_access_control_device管理页面',
       description: 'pm_access_control_device管理页面',
       // 表头
       // 表头
       columns: [
       columns: [

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/entity/PmAccessControlDevice.java

@@ -143,6 +143,12 @@ public class PmAccessControlDevice implements Serializable {
     @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     private String modifyUserId;
     private String modifyUserId;
     /**
     /**
+     * 删除状态
+     */
+    @Excel(name = "删除状态", width = 15)
+    @ApiModelProperty(value = "删除状态")
+    private Boolean deleted;
+    /**
      * 创建时间
      * 创建时间
      */
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/entity/PmMonitoringDevice.java

@@ -138,9 +138,15 @@ public class PmMonitoringDevice implements Serializable {
     @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     private String modifyUserId;
     private String modifyUserId;
     /**
     /**
+     * 删除状态
+     */
+    @Excel(name = "删除状态", width = 15)
+    @ApiModelProperty(value = "删除状态")
+    private Boolean deleted;
+    /**
      * 创建时间
      * 创建时间
      */
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     private Date createTime;

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/service/impl/PmAccessControlDeviceServiceImpl.java

 package org.jeecg.modules.demo.pm.service.impl;
 package org.jeecg.modules.demo.pm.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.jeecg.modules.demo.pm.entity.PmAccessControlDevice;
 import org.jeecg.modules.demo.pm.entity.PmAccessControlDevice;
 import org.jeecg.modules.demo.pm.mapper.PmAccessControlDeviceMapper;
 import org.jeecg.modules.demo.pm.mapper.PmAccessControlDeviceMapper;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 
 
 /**
 /**
@@ -31,4 +33,14 @@ public class PmAccessControlDeviceServiceImpl extends ServiceImpl<PmAccessContro
         entity.setModifyTime(new Date());
         entity.setModifyTime(new Date());
         return super.updateById(entity);
         return super.updateById(entity);
     }
     }
+
+    @Override
+    public boolean removeById(Serializable id) {
+        return update(
+                new UpdateWrapper<PmAccessControlDevice>()
+                        .lambda()
+                        .eq(PmAccessControlDevice::getId, id)
+                        .set(PmAccessControlDevice::getDeleted, true)
+                        .set(PmAccessControlDevice::getModifyTime, new Date()));
+    }
 }
 }

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/service/impl/PmMonitoringDeviceServiceImpl.java

 package org.jeecg.modules.demo.pm.service.impl;
 package org.jeecg.modules.demo.pm.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice;
 import org.jeecg.modules.demo.pm.entity.PmMonitoringDevice;
 import org.jeecg.modules.demo.pm.mapper.PmMonitoringDeviceMapper;
 import org.jeecg.modules.demo.pm.mapper.PmMonitoringDeviceMapper;
 import org.jeecg.modules.demo.pm.service.IPmMonitoringDeviceService;
 import org.jeecg.modules.demo.pm.service.IPmMonitoringDeviceService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.io.Serializable;
+import java.util.Date;
 
 
 /**
 /**
  * @Description: pm_monitoring_device
  * @Description: pm_monitoring_device
@@ -16,4 +20,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 @Service
 public class PmMonitoringDeviceServiceImpl extends ServiceImpl<PmMonitoringDeviceMapper, PmMonitoringDevice> implements IPmMonitoringDeviceService {
 public class PmMonitoringDeviceServiceImpl extends ServiceImpl<PmMonitoringDeviceMapper, PmMonitoringDevice> implements IPmMonitoringDeviceService {
 
 
+    @Override
+    public boolean save(PmMonitoringDevice entity) {
+        entity.setId(IdWorker.getId())
+                .setCreateTime(new Date())
+                .setModifyTime(new Date());
+        return super.save(entity);
+    }
+
+    @Override
+    public boolean updateById(PmMonitoringDevice entity) {
+        entity.setModifyTime(new Date());
+        return super.updateById(entity);
+    }
+
+    @Override
+    public boolean removeById(Serializable id) {
+        return update(
+                new UpdateWrapper<PmMonitoringDevice>()
+                        .lambda()
+                        .eq(PmMonitoringDevice::getId, id)
+                        .set(PmMonitoringDevice::getDeleted, true)
+                        .set(PmMonitoringDevice::getModifyTime, new Date()));
+    }
 }
 }