dnc与mdc部门进行整合 使用Mdc部门进行处理 修改所属部门为所属车间 修改yml文件数据库地址

lyh

2025-02-11 438b6be5ea9ed484b50a45a0f210b80180473491

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java

@@ -25,6 +25,7 @@

import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.response.*;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -351,16 +352,15 @@
        if(file == null || file.isEmpty() || !ValidateUtil.validateString(id))
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        if(!ValidateUtil.validateString(userId))
        if(!ValidateUtil.validateString(user.getUsername()))
            ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
        FileOperate operate = fileOperateService.getByDocId(id);
        if(operate == null || !userId.equals(operate.getCreateUser()))
        if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
            ExceptionCast.cast(DocumentCode.DOC_OPERATE_PUSH_FAIL);
        DocInfo en = super.getById(id);
        if(en == null)
            ExceptionCast.cast(DocumentCode.DOC_NOT_EXIST);
        List<DeviceInfo> deviceList = docRelativeService.findDeviceByDocId(en.getDocId());
        List<MdcEquipment> deviceList = docRelativeService.findDeviceByDocId(en.getDocId());
        if(deviceList != null && !deviceList.isEmpty())
            ExceptionCast.cast(DocumentCode.DOC_DEVICE_EXIST);
        String suffix = FileUtilS.getFileSuffix(file.getOriginalFilename());
@@ -527,11 +527,10 @@
        if(!ValidateUtil.validateString(id))
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        if(!ValidateUtil.validateString(userId))
        if(!ValidateUtil.validateString(user.getUsername()))
            ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
        FileOperate operate = fileOperateService.getByDocId(id);
        if(operate == null || !userId.equals(operate.getCreateUser()))
        if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
            ExceptionCast.cast(DocumentCode.DOC_CANCEL_PULL_ERROR);
        DocInfo en = super.getById(id);
        if(en == null)
@@ -582,14 +581,7 @@
        }
        queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
        queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
        if(ValidateUtil.validateString(docQuery.getAscStr())) {
            String[] ascArr = docQuery.getAscStr().split(",");
//            ((Page<DocInfo>) pageData).setAsc(ascArr);
        }
        if(ValidateUtil.validateString(docQuery.getDescStr())) {
            String[] descStr = docQuery.getDescStr().split(",");
//            ((Page<DocInfo>) pageData).setDesc(descStr);
        }
        queryWrapper.orderByDesc("u.create_time");
        IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(pageData, queryWrapper);
        return Result.ok(docInfoIPage);
    }
@@ -758,7 +750,7 @@
    }

    @Override
    public QueryPageResponseResult<DocInfo> findPageListByDevice(int page, int size, DocInfoQueryRequest docQuery) {
    public IPage<DocInfo> findPageListByDevice(int page, int size, DocInfoQueryRequest docQuery) {
        if(page < 1 || size < 1) {
            ExceptionCast.cast(CommonCode.INVALID_PAGE);
        }
@@ -788,26 +780,18 @@
        }
        queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
        queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());

        if(ValidateUtil.validateString(docQuery.getAscStr())) {
            String[] ascArr = docQuery.getAscStr().split(",");
//            ((Page<DocInfo>) pageData).setAsc(ascArr);
        }
        if(ValidateUtil.validateString(docQuery.getDescStr())) {
            String[] descStr = docQuery.getDescStr().split(",");
//            ((Page<DocInfo>) pageData).setDesc(descStr);
        }
        queryWrapper.orderByDesc("u.create_time");
        IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDeviceDocExtList(pageData, queryWrapper);
        if (docInfoIPage != null && docInfoIPage.getRecords() != null && !docInfoIPage.getRecords().isEmpty()) {
            for (DocInfo d : docInfoIPage.getRecords()) {
                d.setSyncStatus(2);
            }
        }
        return new QueryPageResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
        return docInfoIPage;
    }

    @Override
    public QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery) {
    public List<DocInfo> findList(DocInfoQueryRequest docQuery) {
        if(docQuery == null || !ValidateUtil.validateString(docQuery.getAttributionId())
                || !ValidateUtil.validateInteger(docQuery.getAttributionType()) ||
                !ValidateUtil.validateString(docQuery.getDocClassCode())) {
@@ -833,8 +817,8 @@
        }
        queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
        queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
        List<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(queryWrapper);
        return new QueryListResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
        queryWrapper.orderByDesc("u.create_time");
        return super.getBaseMapper().findDocExtList(queryWrapper);
    }

    @Override