From 6b1c7e3fa773aa75ea34b346d4104ba70064f52c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 31 八月 2023 14:35:53 +0800
Subject: [PATCH] 调整设备状态解析2
---
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 25e52fa..37a7a54 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -1,13 +1,16 @@
package com.ld.igds.oa.service;
+import com.bstek.bdf2.core.model.DefaultDept;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DeptDevice;
import com.ld.igds.models.DeviceCheckup;
+import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -23,6 +26,10 @@
*/
@Component
public class HDeptDeviceService extends HibernateDao {
+
+ @Autowired
+ private SysDeptService sysDeptService;
+
//=====================================搴撳尯璁惧=======================================//
public void pageData(Page<DeptDevice> page, Map<String, Object> param)
@@ -47,24 +54,19 @@
Session session = this.getSessionFactory().openSession();
try {
- data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getKqdm())) {
+ data.setKqdm(ContextUtil.subDeptId(null));
+ }
+ DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
+ data.setKqmc(dept.getName());
data.setUpdateTime(new Date());
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
}
session.saveOrUpdate(data);
-// if (!CollectionUtils.isEmpty(data.getCheckupList())) {
-// for (DeviceCheckup item : data.getCheckupList()) {
-// if (null == item.getId()) {
-// item.setCompanyId(ContextUtil.getCompanyId());
-// item.setId(ContextUtil.getCompanyId());
-// item.setSbbh(data.getSbbh());
-// item.setSbyqdm(data.getSbyqdm());
-// item.setSbyqmc(data.getSbyqmc());
-// }
-// session.saveOrUpdate(item);
-// }
-// }
} finally {
session.flush();
session.close();
@@ -75,7 +77,15 @@
public String delData(DeptDevice data) {
Session session = this.getSessionFactory().openSession();
try {
+ Map<String, Object> param = new HashMap<>();
+ param.put("code", data.getSbbh());
+ List<DeviceCheckup> list = this.listCheck(param);
+ for (DeviceCheckup checkup : list) {
+ session.delete(checkup);
+ }
session.delete(data);
+ } catch (Exception e) {
+ e.printStackTrace();
} finally {
session.flush();
session.close();
@@ -122,7 +132,14 @@
Session session = this.getSessionFactory().openSession();
try {
- data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getKqdm())) {
+ data.setKqdm(ContextUtil.subDeptId(null));
+ }
+ DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
+ data.setKqmc(dept.getName());
data.setZhgxsj(new Date());
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
--
Gitblit v1.9.3