功能优化

YYC

2023-08-14 d3d12e212470904e54affe5ec8c06c672607cab9

功能优化

 igds-core/src/main/java/com/ld/igds/util/DateUtil.java

@@ -141,10 +141,6 @@
    public static Date getNewByMinute(Date date, int num) {
        if (null == date) date = new Date();
        date = DateUtils.addMinutes(date, num);
        date = DateUtils.setHours(date, 0);
        date = DateUtils.setMinutes(date, 0);
        date = DateUtils.setSeconds(date, 0);
        date = DateUtils.setMilliseconds(date, 0);
        return date;
    }


 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -224,6 +224,19 @@
            fileData.setFileId(ContextUtil.getUUID());
            fileData.setCompanyId(data.getCompanyId());
            fileData.setBizId(data.getId());
            if ("HANDLE".equals(fileData.getBizTag())) {
                if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
                    fileData.setCreateTime(DateUtils.addMinutes(data.getFullWeightTime(), -20));
                } else {
                    fileData.setCreateTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -20));
                }
            }
            if ("WEIGHT_EMPTY".equals(fileData.getBizTag())) {
                fileData.setCreateTime(data.getEmptyWeightTime());
            }
            if ("WEIGHT_FULL".equals(fileData.getBizTag())) {
                fileData.setCreateTime(data.getFullWeightTime());
            }
            fileData.setCreateTime(new Date());
            coreFileService.addRecord(fileData);
        }
@@ -423,7 +436,7 @@
            data.setCompleteTime(new Date());
        }
        // 注册时间比完成时间早一个小时
        data.setRegisterTime(DateUtil.getNewByMinute(new Date(), -60));
        data.setRegisterTime(DateUtils.addMinutes(new Date(), -80));

        if (StringUtils.isEmpty(data.getUserId())) {
            data.setUserId(InoutConstant.DEFAULT_ID_CARD);
@@ -438,19 +451,38 @@

        if (InoutConstant.TYPE_IN.equals(data.getType())) {
            if (null == data.getFullWeightTime()) {
                data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
                data.setFullWeightTime(DateUtils.addMinutes(new Date(), -50));
            }
            if (null == data.getEmptyWeightTime()) {
                data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
                data.setEmptyWeightTime(DateUtils.addMinutes(new Date(), -10));
            }

            if (data.getCompleteTime().before(data.getEmptyWeightTime())) {
                data.setEmptyWeightTime(DateUtils.addMinutes(data.getCompleteTime(), -10));
            }
            if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
                data.setFullWeightTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -40));
            }
            if (data.getFullWeightTime().before(data.getRegisterTime())) {
                data.setRegisterTime(DateUtils.addMinutes(data.getFullWeightTime(), -30));
            }

            data = this.updateCheckItems(data, false);
        } else {
            if (null == data.getEmptyWeightTime()) {
                data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
                data.setEmptyWeightTime(DateUtils.addMinutes(new Date(), -50));
            }
            if (null == data.getFullWeightTime()) {
                data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
                data.setFullWeightTime(DateUtils.addMinutes(new Date(), -10));
            }
            if (data.getCompleteTime().before(data.getFullWeightTime())) {
                data.setFullWeightTime(DateUtils.addMinutes(data.getCompleteTime(), -10));
            }
            if (data.getFullWeightTime().before(data.getEmptyWeightTime())) {
                data.setEmptyWeightTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -40));
            }
            if (data.getEmptyWeightTime().before(data.getRegisterTime())) {
                data.setRegisterTime(DateUtils.addMinutes(data.getFullWeightTime(), -30));
            }
        }


 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -659,7 +659,7 @@
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (StringUtils.isEmpty(data.getDeptId())) {
            data.setCompanyId(ContextUtil.subDeptId(null));
            data.setDeptId(ContextUtil.subDeptId(null));
        }

        inoutCheckMapper.updateSampleData(data);

 igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java

@@ -87,10 +87,5 @@
    @PropertyDef(label = "更新时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;

    /**
     * 检修记录
     */
    @Transient
    private List<DeviceCheckup> checkupList;
    
}

 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());

 igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml

@@ -403,13 +403,21 @@
    return;&#xD;
}else{&#xD;
    //附件上传完成后添加业务数据&#xD;
var mainData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var fileId = arg.returnValue;&#xD;
var files = view.get(&quot;#dsMain.data:#&quot;).get(&quot;fileData&quot;);&#xD;
files.insert({fileId:fileId,fileName:arg.file.name,createTime:new Date()});&#xD;
    var mainData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
    var fileId = arg.returnValue;&#xD;
    if(fileId){&#xD;
        var files = view.get(&quot;#dsMain.data:#&quot;).get(&quot;fileData&quot;);files.insert({fileId:fileId,fileName:arg.file.name,createTime:new Date()});&#xD;
    }&#xD;
}&#xD;
</ClientEvent>
              <Property name="fileResolver">applyOrderUploadProcessor#uploadApplyOrderFile</Property>
              <ClientEvent name="beforeFileUploaded">var files = view.get(&quot;#dsMain.data:#&quot;).get(&quot;fileData&quot;);&#xD;
var mark = &quot;UPLOAD&quot;;&#xD;
if(files.entityCount > 0){&#xD;
    mark = &quot;NO_UPLOAD&quot;;&#xD;
}&#xD;
self.set(&quot;parameter&quot;,{mark: mark})&#xD;
</ClientEvent>
              <Property name="fileResolver">oaPR#uploadFile</Property>
              <Property name="maxFileSize">50MB</Property>
              <Property name="successMessage">附件上传成功！！</Property>
              <Filters/>

 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml

@@ -128,10 +128,11 @@
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="kqmc">
        <Property></Property>
        <Property name="label">库区名称</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="dwdm">
        <Property></Property>
@@ -153,9 +154,18 @@
        <Property></Property>
        <Property name="label">检定单位</Property>
      </PropertyDef>
      <PropertyDef name="jdjg">
        <Property></Property>
        <Property name="label">检定结果</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property name="dataType">Date</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">最后更新时间</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -173,6 +183,7 @@
    <DataSet id="dsCheck">
      <Property name="dataType">[dtCheck]</Property>
      <Property name="dataProvider">deptDevicePR#pageCheck</Property>
      <Property name="pageSize">15</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
@@ -212,12 +223,14 @@
      </Button>
      <Button layoutConstraint="right">
        <ClientEvent name="onClick">//显示记录&#xD;
view.get(&quot;#iFrame&quot;).reload();&#xD;
var entity = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var code = entity.get(&quot;sbbh&quot;);&#xD;
view.get(&quot;#dsCheck&quot;).set(&quot;parameter&quot;,{code:code}).flushAsync();&#xD;
view.get(&quot;#dialogCheck&quot;).show();</ClientEvent>
        <Property name="caption">查看检修记录</Property>
        <Property name="exClassName">btn-flush</Property>
        <Property name="iconClass">fa fa-bars</Property>
        <Property name="visible">false</Property>
        <Property name="visible">true</Property>
      </Button>
    </Container>
    <Container layout="regionPadding:10" layoutConstraint="center">
@@ -373,16 +386,6 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dwdm</Property>
            <Property name="property">dwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqmc</Property>
            <Property name="property">kqmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbbh</Property>
            <Property name="property">sbbh</Property>
            <Editor/>
@@ -441,25 +444,11 @@
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="uaSave">
      <Property name="dataResolver">deptDevicePR#saveDeptDevice</Property>
      <UpdateItem>
        <Property name="dataSet">dsMain</Property>
        <Property name="dataPath">[#current]</Property>
        <Property name="validateData">false</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">deptDevicePR#delDeptDevice</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDelCheck">
      <Property name="service">deptDevicePR#delCheck</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <Dialog id="dialogCheck">
    <Dialog id="dialogCheck" layout="regionPadding:10">
      <Property name="width">90%</Property>
      <Property name="height">90%</Property>
      <Property name="caption">设备检修记录</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button layoutConstraint="center">
          <ClientEvent name="onClick">self.get(&quot;parent&quot;).hide();</ClientEvent>
@@ -468,14 +457,30 @@
        </Button>
      </Buttons>
      <Children>
        <Container>
          <Button>
            <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();</ClientEvent>
        <Container layout="regionPadding:10" layoutConstraint="top">
          <Property name="exClassName">bg-color</Property>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
view.get(&quot;#dsCheck&quot;).insert({&#xD;
    sbbh:data.get(&quot;sbbh&quot;),&#xD;
    kqdm:data.get(&quot;kqdm&quot;),&#xD;
    kqmc:data.get(&quot;kqmc&quot;),&#xD;
    sbyqmc:data.get(&quot;sbyqmc&quot;),&#xD;
    sbyqdm:data.get(&quot;sbyqdm&quot;)&#xD;
});&#xD;
view.get(&quot;#addCheck&quot;).show();</ClientEvent>
            <Property name="caption">新增</Property>
            <Property name="exClassName">btn-normal</Property>
            <Property name="iconClass">fa fa-plus</Property>
          </Button>
          <Button>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">var dialog= view.get(&quot;#addCheck&quot;);&#xD;
dialog.show();</ClientEvent>
            <Property name="caption">编辑</Property>
            <Property name="exClassName">btn-warm</Property>
            <Property name="iconClass">fa fa-pencil</Property>
          </Button>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">var cur = view.get(&quot;#dsCheck.data:#&quot;);&#xD;
if(!cur) return;&#xD;
view.get(&quot;#ajaxDelCheck&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
@@ -491,41 +496,175 @@
            <Property name="iconClass">fa fa-trash-o</Property>
          </Button>
        </Container>
        <Container>
        <Container layout="regionPadding:10" layoutConstraint="center">
          <Property name="exClassName">bg-color</Property>
          <DataGrid id="dgCheck">
            <ClientEvent name="onDataRowDoubleClick">var dialog= view.get(&quot;#addCheck&quot;);&#xD;
dialog.show();</ClientEvent>
            <Property name="dataSet">dsCheck</Property>
            <Property name="readOnly">true</Property>
            <RowNumColumn/>
            <DataColumn name="sbbh">
              <Property name="property">sbbh</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="kqdm">
              <Property name="property">kqdm</Property>
            </DataColumn>
            <DataColumn name="kqmc">
              <Property name="property">kqmc</Property>
            </DataColumn>
            <DataColumn name="dwdm">
              <Property name="property">dwdm</Property>
              <Property name="align">center</Property>
              <Property name="width">260</Property>
            </DataColumn>
            <DataColumn name="sbyqmc">
              <Property name="property">sbyqmc</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="sbyqdm">
              <Property name="property">sbyqdm</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="jdsj">
              <Property name="property">jdsj</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="jddw">
              <Property name="property">jddw</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="jdjg">
              <Property name="property">jdjg</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="remark">
              <Property name="property">remark</Property>
              <Property name="align">center</Property>
            </DataColumn>
            <DataColumn name="zhgxsj">
              <Property name="property">zhgxsj</Property>
              <Property name="align">center</Property>
            </DataColumn>
          </DataGrid>
        </Container>
        <Container layout="regionPadding:10" layoutConstraint="bottom">
          <Property name="exClassName">bg-color</Property>
          <DataPilot layoutConstraint="right">
            <Property name="dataSet">dsCheck</Property>
            <Property name="itemCodes">pageSize,pages</Property>
          </DataPilot>
        </Container>
      </Children>
      <Tools/>
    </Dialog>
    <Dialog id="addCheck">
      <Property name="closeable">false</Property>
      <Property name="caption">检修记录信息</Property>
      <Property name="width">60%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#ajaxSave&quot;).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    }else{&#xD;
        $notify(&quot;保存成功！！&quot;);&#xD;
        view.get(&quot;#addCheck&quot;).hide();&#xD;
    }&#xD;
});</ClientEvent>
          <Property name="caption">确定</Property>
          <Property name="iconClass">fa fa-check</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsCheck.data:#&quot;).cancel();&#xD;
self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsCheck</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelWidth">150</Property>
          <AutoFormElement>
            <Property name="name">sbbh</Property>
            <Property name="property">sbbh</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbyqmc</Property>
            <Property name="property">sbyqmc</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbyqdm</Property>
            <Property name="property">sbyqdm</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jdsj</Property>
            <Property name="property">jdsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jddw</Property>
            <Property name="property">jddw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jdjg</Property>
            <Property name="property">jdjg</Property>
            <Property name="trigger">listDropYN</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="uaSave">
      <Property name="dataResolver">deptDevicePR#saveDeptDevice</Property>
      <UpdateItem>
        <Property name="dataSet">dsMain</Property>
        <Property name="dataPath">[#current]</Property>
        <Property name="validateData">false</Property>
      </UpdateItem>
    </UpdateAction>
    <UpdateAction id="ajaxSave">
      <Property name="dataResolver">deptDevicePR#saveCheck</Property>
      <UpdateItem>
        <Property name="dataSet">dsCheck</Property>
        <Property name="dataPath">[#current]</Property>
        <Property name="validateData">false</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">deptDevicePR#delDeptDevice</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDelCheck">
      <Property name="service">deptDevicePR#delCheck</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <ListDropDown id="listDropYN">
      <Property name="items">合格,不合格</Property>
    </ListDropDown>
  </View>
</ViewConfig>

 igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java

@@ -1,10 +1,14 @@
package com.ld.igds.oa.view;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.bstek.dorado.uploader.UploadFile;
import com.bstek.dorado.uploader.annotation.FileResolver;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.models.*;

@@ -209,6 +213,39 @@
        return service.delArchives(data);
    }

    /**
     * oaPR#uploadFile
     *
     * @param file
     * @param parameter
     * @return fileId 新文件ID包含文件后缀
     */
    @FileResolver
    public String uploadFile(UploadFile file, Map<String, Object> parameter) {
        String fileId = null;
        String mark = (String) parameter.get("mark");
        if ("NO_UPLOAD".equals(mark)) {
            return null;
        }
        try {

            String basePath = fileService.getCommonFilePath(null);

            fileId = ContextUtil.getTimeId(1000)
                    + file.getFileName().substring(
                    file.getFileName().lastIndexOf("."));

            file.transferTo(new File(basePath + fileId));

        } catch (IllegalStateException e) {
            e.printStackTrace();
        } catch (IOException e) {
            e.printStackTrace();
        }

        return fileId;
    }

    // =====================资产管理=====================//

    /**