功能优化

YYC

2023-08-14 d3d12e212470904e54affe5ec8c06c672607cab9

 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();
@@ -122,7 +124,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());