提交MDC-COMMON模块

Lius

2025-03-21 87874019eefbe03dd429b5b7eed49d963ef03c88

提交MDC-COMMON模块

 lxzn-module-dnc/pom.xml

@@ -48,7 +48,7 @@
        </dependency>
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-module-mdc</artifactId>
            <artifactId>lxzn-module-mdc-common</artifactId>
            <version>3.4.3</version>
            <scope>compile</scope>
        </dependency>

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceInfoController.java

@@ -14,7 +14,6 @@
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.dnc.entity.DeviceInfo;
import org.jeecg.modules.dnc.service.IDeviceInfoService;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java

@@ -1,6 +1,5 @@
package org.jeecg.modules.dnc.controller;

import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -15,8 +14,6 @@
import org.jeecg.modules.dnc.response.QueryListResponseResult;
import org.jeecg.modules.dnc.response.ResponseResult;
import org.jeecg.modules.dnc.service.IProductInfoService;
import org.jeecg.modules.dnc.service.IProductMixService;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.system.entity.MdcProduction;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ComponentDepartmentMapper.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.dnc.entity.ComponentDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.MdcProduction;


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/PartsDepartmentMapper.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.MdcProduction;


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java

@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.dnc.entity.ProcessionDepartment;
import org.jeecg.modules.dnc.entity.WorkStep;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;

import java.util.List;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProductDepartmentMapper.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.dnc.entity.ProductDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.MdcProduction;


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/WorkStepDepartmentMapper.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.dnc.entity.WorkStepDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;

import java.util.List;

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

@@ -2,9 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.ComponentDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;
import org.springframework.stereotype.Service;

import java.util.List;
public interface IComponentDepartmentService extends IService<ComponentDepartment> {

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

@@ -4,10 +4,8 @@
import org.jeecg.modules.dnc.dto.ComponentExt;
import org.jeecg.modules.dnc.entity.ComponentInfo;
import org.jeecg.modules.dnc.entity.PermissionStream;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.springframework.stereotype.Service;

import java.util.Collection;
import java.util.List;

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

@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.DeviceInfo;
import org.jeecg.modules.dnc.response.CommonGenericTree;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;

import java.util.Collection;

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

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;

import java.util.List;

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

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.PartsInfo;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;


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

@@ -1,9 +1,6 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.ComponentDepartment;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.entity.ProcessSpecVersion;
import org.jeecg.modules.dnc.entity.ProcessSpecVersionDepartment;
import org.jeecg.modules.system.entity.MdcProduction;


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

@@ -1,11 +1,8 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.PartsInfo;
import org.jeecg.modules.dnc.entity.ProcessStream;
import org.jeecg.modules.dnc.entity.WorkStep;
import org.jeecg.modules.dnc.request.ProcessStreamRequest;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;


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

@@ -1,11 +1,7 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.entity.ProcessStream;
import org.jeecg.modules.dnc.entity.ProcessionDepartment;
import org.jeecg.modules.dnc.entity.ProductDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;

import java.util.List;

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

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.ProductDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;

import java.util.List;

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

@@ -1,11 +1,7 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.entity.ProcessStream;
import org.jeecg.modules.dnc.entity.ProcessionDepartment;
import org.jeecg.modules.dnc.entity.WorkStepDepartment;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;

import java.util.List;

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

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;


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

@@ -6,7 +6,6 @@
import org.jeecg.modules.dnc.entity.ComponentDepartment;
import org.jeecg.modules.dnc.mapper.ComponentDepartmentMapper;
import org.jeecg.modules.dnc.service.IComponentDepartmentService;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.apache.commons.collections4.ListUtils;
import org.jeecg.modules.system.entity.MdcProduction;

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

@@ -1,10 +1,8 @@
package org.jeecg.modules.dnc.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.dnc.entity.DeviceGroup;
import org.jeecg.modules.dnc.entity.DeviceGroupPermission;
import org.jeecg.modules.dnc.entity.DevicePermissionStream;
import org.jeecg.modules.dnc.exception.ExceptionCast;

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

@@ -1,6 +1,5 @@
package org.jeecg.modules.dnc.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
@@ -12,7 +11,6 @@

import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.dnc.service.support.DeviceTreeWrapper;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.mdc.entity.MdcEquipment;

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

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.mapper.PartsDepartmentMapper;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.service.IPartsDepartmentService;
import org.apache.commons.collections4.ListUtils;

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

@@ -6,8 +6,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections4.ListUtils;
import org.jeecg.modules.dnc.entity.ProcessSpecVersionDepartment;
import org.jeecg.modules.dnc.entity.PartsDepartment;
import org.jeecg.modules.dnc.entity.ProcessSpecVersionDepartment;
import org.jeecg.modules.dnc.mapper.ProcessSpecVersionDepartmentMapper;
import org.jeecg.modules.dnc.service.IProcessSpecVersionDepartmentService;
import org.jeecg.modules.dnc.utils.ValidateUtil;

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

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.dnc.entity.ProductDepartment;
import org.jeecg.modules.dnc.mapper.ProductDepartmentMapper;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.service.IProductDepartmentService;
import org.jeecg.modules.system.entity.MdcProduction;

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

@@ -4,16 +4,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections4.ListUtils;
import org.jeecg.modules.dnc.entity.ProcessionDepartment;
import org.jeecg.modules.dnc.entity.WorkStepDepartment;
import org.jeecg.modules.dnc.mapper.WorkStepDepartmentMapper;
import org.jeecg.modules.dnc.service.IWorkStepDepartmentService;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.MdcProduction;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Service
public class WorkStepDepartmentService extends ServiceImpl<WorkStepDepartmentMapper, WorkStepDepartment> implements IWorkStepDepartmentService {

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java

@@ -7,4 +7,13 @@
    String PROCESS_PARAMETERS_RULE = "ProcessParametersRule";
    //设备故障原因编码规则
    String EQUIPMENT_FAULT_REASON_RULE = "EquipmentFaultReasonRule";
    /**
     * å¤‡ä»¶è¯·è´­å•çŠ¶æ€ 1:已创建 2:已提交 3:已通过 4:已驳回 5:已完成
     */
    String SPARE_REQUISITION_STATUS_1 = "1";
    String SPARE_REQUISITION_STATUS_2 = "2";
    String SPARE_REQUISITION_STATUS_3 = "3";
    String SPARE_REQUISITION_STATUS_4 = "4";
    String SPARE_REQUISITION_STATUS_5 = "5";

}

 lxzn-module-mdc-common/pom.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>org.jeecgframework.boot</groupId>
        <artifactId>lxzn-boot-parent</artifactId>
        <version>3.4.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>lxzn-module-mdc-common</artifactId>

    <dependencies>
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-boot-base-core</artifactId>
        </dependency>
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-system-biz</artifactId>
        </dependency>
    </dependencies>

</project>

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDetailedDto.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcAlarmInfo.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentThreshold.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcOverrunAlarm.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentMapper.xml

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentLogService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcAlarmInfoService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentThresholdService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcProductionEquipmentService.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java

ÎļþÃû´Ó lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java ÐÞ¸Ä
@@ -1,7 +1,5 @@
package org.jeecg.modules.mdc.service.impl;

import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,11 +28,9 @@
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.mapper.DncDevicePermissionMapper;
import org.jeecg.modules.system.mapper.MdcEquipmentDepartMapper;
import org.jeecg.modules.system.mapper.MdcProductionEquipmentMapper;
import org.jeecg.modules.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
@@ -42,12 +38,8 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -74,23 +66,15 @@
    @Resource
    private IMdcProductionService mdcProductionService;
    @Resource
    private IControlSystemService controlSystemService;
    @Resource
    private IEquipmentWorkLineService equipmentWorkLineService;
    @Resource
    private IMdcDriveTypeParamConfigService mdcDriveTypeParamConfigService;
    @Resource
    private MdcTorqueConfigMapper mdcTorqueConfigMapper;

    @Resource
    private IEquipmentLogService equipmentLogService;

    @Resource
    private IEquipmentBaseInfoService equipmentBaseInfoService;

    @Resource
    private ISysBaseAPI sysBaseApi;

    @Resource
    private IMdcAlarmInfoService mdcAlarmInfoService;


 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java

ÎļþÃû´Ó lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java ÐÞ¸Ä
@@ -1,8 +1,6 @@
package org.jeecg.modules.mdc.util;


import io.swagger.models.auth.In;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DncCopyEquipment.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentDepartUtil.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentDepVo.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentProVo.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java

 lxzn-module-mdc/pom.xml

@@ -20,6 +20,11 @@
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-system-biz</artifactId>
        </dependency>
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-module-mdc-common</artifactId>
            <version>3.4.3</version>
        </dependency>
    </dependencies>

</project>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sun.org.apache.xpath.internal.operations.Bool;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcShiftSubMapper.java

@@ -1,7 +1,6 @@
package org.jeecg.modules.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sun.org.apache.xpath.internal.operations.Bool;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.mdc.entity.MdcShiftSub;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java

@@ -18,112 +18,124 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;

 /**
/**
 * @Description: ä¸šåŠ¡ç¼–码规则
 * @Author: jeecg-boot
 * @Date:   2025-03-17
 * @Date: 2025-03-17
 * @Version: V1.0
 */
@Slf4j
@Api(tags="业务编码规则")
@Api(tags = "业务编码规则")
@RestController
@RequestMapping("/sys/sysBusinessCodeRule")
public class SysBusinessCodeRuleController extends JeecgController<SysBusinessCodeRule, ISysBusinessCodeRuleService> {
    @Autowired
    private ISysBusinessCodeRuleService sysBusinessCodeRuleService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param sysBusinessCodeRule
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @Autowired
    private ISysBusinessCodeRuleService sysBusinessCodeRuleService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param sysBusinessCodeRule
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
//    @AutoLog(value = "业务编码规则-分页列表查询")
    @ApiOperation(value="业务编码规则-分页列表查询", notes="业务编码规则-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(SysBusinessCodeRule sysBusinessCodeRule,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<SysBusinessCodeRule> queryWrapper = QueryGenerator.initQueryWrapper(sysBusinessCodeRule, req.getParameterMap());
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        Page<SysBusinessCodeRule> page = new Page<SysBusinessCodeRule>(pageNo, pageSize);
        IPage<SysBusinessCodeRule> pageList = sysBusinessCodeRuleService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     * æ·»åŠ 
     *
     * @param sysBusinessCodeRule
     * @return
     */
    @ApiOperation(value = "业务编码规则-分页列表查询", notes = "业务编码规则-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(SysBusinessCodeRule sysBusinessCodeRule,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<SysBusinessCodeRule> queryWrapper = QueryGenerator.initQueryWrapper(sysBusinessCodeRule, req.getParameterMap());
        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
        Page<SysBusinessCodeRule> page = new Page<SysBusinessCodeRule>(pageNo, pageSize);
        IPage<SysBusinessCodeRule> pageList = sysBusinessCodeRuleService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param sysBusinessCodeRule
     * @return
     */
//    @AutoLog(value = "业务编码规则-添加")
    @ApiOperation(value="业务编码规则-添加", notes="业务编码规则-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody SysBusinessCodeRule sysBusinessCodeRule) {
        sysBusinessCodeRule.setDelFlag(CommonConstant.DEL_FLAG_0);
        sysBusinessCodeRuleService.save(sysBusinessCodeRule);
        return Result.OK("添加成功！");
    }
	
    /**
     * ç¼–辑
     *
     * @param sysBusinessCodeRule
     * @return
     */
    @ApiOperation(value = "业务编码规则-添加", notes = "业务编码规则-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody SysBusinessCodeRule sysBusinessCodeRule) {
        sysBusinessCodeRule.setDelFlag(CommonConstant.DEL_FLAG_0);
        sysBusinessCodeRuleService.save(sysBusinessCodeRule);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param sysBusinessCodeRule
     * @return
     */
//    @AutoLog(value = "业务编码规则-编辑")
    @ApiOperation(value="业务编码规则-编辑", notes="业务编码规则-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody SysBusinessCodeRule sysBusinessCodeRule) {
        sysBusinessCodeRuleService.updateById(sysBusinessCodeRule);
        return Result.OK("编辑成功!");
    }
	
    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "业务编码规则-编辑", notes = "业务编码规则-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody SysBusinessCodeRule sysBusinessCodeRule) {
        sysBusinessCodeRuleService.updateById(sysBusinessCodeRule);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
//    @AutoLog(value = "业务编码规则-通过id删除")
    @ApiOperation(value="业务编码规则-通过id删除", notes="业务编码规则-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name="id",required=true) String id) {
        sysBusinessCodeRuleService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @ApiOperation(value = "业务编码规则-通过id删除", notes = "业务编码规则-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        sysBusinessCodeRuleService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
//    @AutoLog(value = "业务编码规则-批量删除")
    @ApiOperation(value="业务编码规则-批量删除", notes="业务编码规则-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.sysBusinessCodeRuleService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "业务编码规则-批量删除", notes = "业务编码规则-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.sysBusinessCodeRuleService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
//    @AutoLog(value = "业务编码规则-通过id查询")
    @ApiOperation(value="业务编码规则-通过id查询", notes="业务编码规则-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        SysBusinessCodeRule sysBusinessCodeRule = sysBusinessCodeRuleService.getById(id);
        return Result.OK(sysBusinessCodeRule);
    }
    @ApiOperation(value = "业务编码规则-通过id查询", notes = "业务编码规则-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        SysBusinessCodeRule sysBusinessCodeRule = sysBusinessCodeRuleService.getById(id);
        return Result.OK(sysBusinessCodeRule);
    }

    /**
     * ç”Ÿæˆä¸šåŠ¡ç¼–码对应的流水号
     *
     * @return
     */
    @ApiOperation(value = "业务编码规则-生成业务编码对应的流水号", notes = "业务编码规则-生成业务编码对应的流水号")
    @GetMapping(value = "/generateBusinessCodeSeq")
    public Result<?> generateBusinessCodeSeq(@RequestParam(name = "businessCode", required = true) String businessCode) {
        String result = sysBusinessCodeRuleService.generateBusinessCodeSeq(businessCode);
        return Result.OK(result);
    }

}

 lxzn-module-system/lxzn-system-start/pom.xml

@@ -24,6 +24,12 @@
            <artifactId>lxzn-module-mdc</artifactId>
            <version>${jeecgboot.version}</version>
        </dependency>
        <!--mdc common æ¨¡å—-->
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-module-mdc-common</artifactId>
            <version>${jeecgboot.version}</version>
        </dependency>
        <!-- DNC æ•°æ®é‡‡é›†åˆ†æžæ¨¡å— -->
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
@@ -36,7 +42,7 @@
            <artifactId>lxzn-module-flowable</artifactId>
            <version>${jeecgboot.version}</version>
        </dependency>
        <!--msi æ¨¡å—-->
        <!-- msi æ¨¡å— -->
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>
            <artifactId>lxzn-module-msi</artifactId>

 pom.xml

@@ -69,6 +69,7 @@
        <module>lxzn-module-flowable</module>
        <module>lxzn-module-msi</module>
        <module>lxzn-module-eam</module>
        <module>lxzn-module-mdc-common</module>
        <module>lxzn-module-eam-common</module>
    </modules>