From 87874019eefbe03dd429b5b7eed49d963ef03c88 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 21 三月 2025 13:18:54 +0800
Subject: [PATCH] 提交MDC-COMMON模块
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionDepartmentServiceImpl.java | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcAlarmInfo.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepDepartmentService.java | 4
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DncCopyEquipment.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentDepartUtil.java | 0
lxzn-module-mdc-common/pom.xml | 25 ++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java | 3
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcProductionEquipmentService.java | 0
lxzn-module-dnc/pom.xml | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsDepartmentService.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentDepVo.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ComponentDepartmentMapper.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentService.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcAlarmInfoService.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessSpecVersionDepartmentService.java | 3
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductDepartmentService.java | 1
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java | 198 +++++++++++++++++---------------
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/PartsDepartmentMapper.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentThresholdService.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java | 3
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessionDepartmentService.java | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 0
pom.xml | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentLogService.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 0
lxzn-module-system/lxzn-system-start/pom.xml | 8 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 9 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceInfoService.java | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceGroupPermissionServiceImpl.java | 2
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 16 --
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceInfoController.java | 1
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentDepartmentService.java | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProductDepartmentMapper.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentMapper.xml | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsInfoService.java | 1
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepDepartmentService.java | 3
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsDepartmentServiceImpl.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDetailedDto.java | 0
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentProVo.java | 0
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcShiftSubMapper.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentThreshold.java | 0
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductDepartmentServiceImpl.java | 1
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/WorkStepDepartmentMapper.java | 1
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcOverrunAlarm.java | 0
lxzn-module-mdc/pom.xml | 5
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java | 0
79 files changed, 153 insertions(+), 161 deletions(-)
diff --git a/lxzn-module-dnc/pom.xml b/lxzn-module-dnc/pom.xml
index 4f22301..2c815f4 100644
--- a/lxzn-module-dnc/pom.xml
+++ b/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>
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceInfoController.java
index 0c5dda9..a65a386 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceInfoController.java
+++ b/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.*;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
index 3012aad..46c981d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ComponentDepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ComponentDepartmentMapper.java
index d51d0d3..7788a24 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ComponentDepartmentMapper.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/PartsDepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/PartsDepartmentMapper.java
index 0522c48..82623e2 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/PartsDepartmentMapper.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java
index 57322b4..d83f713 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProductDepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProductDepartmentMapper.java
index 5155420..bd65892 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProductDepartmentMapper.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/WorkStepDepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/WorkStepDepartmentMapper.java
index 41b430a..4a3d9e3 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/WorkStepDepartmentMapper.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentDepartmentService.java
index f3046ce..dd4b718 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentDepartmentService.java
+++ b/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> {
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java
index 9135228..3d43e73 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceInfoService.java
index fc096a8..1b04559 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceInfoService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsDepartmentService.java
index 8cd7b1d..ba1f6ac 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsDepartmentService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsInfoService.java
index 1e16569..aaffda1 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IPartsInfoService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessSpecVersionDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessSpecVersionDepartmentService.java
index aeb33fc..709da32 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessSpecVersionDepartmentService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java
index 0a0a182..6c4e4ad 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessStreamService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessionDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessionDepartmentService.java
index e6b548d..a2eb513 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProcessionDepartmentService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductDepartmentService.java
index 201b237..830f956 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IProductDepartmentService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepDepartmentService.java
index 3bc9fef..81a13ab 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepDepartmentService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java
index a65d5f6..b0edf35 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IWorkStepService.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java
index 04b7946..8d6d422 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceGroupPermissionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceGroupPermissionServiceImpl.java
index 274744e..7e9171e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceGroupPermissionServiceImpl.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java
index 4f6f295..83c0181 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsDepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsDepartmentServiceImpl.java
index 0c6a057..d6929ff 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsDepartmentServiceImpl.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionDepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionDepartmentServiceImpl.java
index 63f7056..041eafc 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionDepartmentServiceImpl.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductDepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductDepartmentServiceImpl.java
index ff7223d..6a773a0 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductDepartmentServiceImpl.java
+++ b/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;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepDepartmentService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepDepartmentService.java
index 717bf65..cbbef6a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepDepartmentService.java
+++ b/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 {
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index d19aa5e..2afebfd 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/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";
+
}
diff --git a/lxzn-module-mdc-common/pom.xml b/lxzn-module-mdc-common/pom.xml
new file mode 100644
index 0000000..6565f1a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/EquipmentMachingDto.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDetailedDto.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDetailedDto.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDetailedDto.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDetailedDto.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcAlarmInfo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcAlarmInfo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcAlarmInfo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcAlarmInfo.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentMonitor.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentThreshold.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentThreshold.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentThreshold.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentThreshold.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverrunAlarm.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcOverrunAlarm.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverrunAlarm.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcOverrunAlarm.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentMapper.xml
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentMapper.xml
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentMapper.xml
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/model/MdcEquipmentTree.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentLogService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentLogService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentLogService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentLogService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcAlarmInfoService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcAlarmInfoService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcAlarmInfoService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcAlarmInfoService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentThresholdService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentThresholdService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentThresholdService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentThresholdService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcOverrunAlarmService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProductionEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcProductionEquipmentService.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcProductionEquipmentService.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcProductionEquipmentService.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
similarity index 98%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index d785c97..5954d6f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/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;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
similarity index 99%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
index fafdbf7..2086fe5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
+++ b/lxzn-module-mdc-common/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;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DncCopyEquipment.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DncCopyEquipment.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DncCopyEquipment.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/DncCopyEquipment.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentDepartUtil.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentDepartUtil.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentDepartUtil.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentDepartUtil.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentDepVo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentDepVo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentDepVo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentDepVo.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentProVo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentProVo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentProVo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentProVo.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentVo.java
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java
similarity index 100%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java
rename to lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/vo/WorkshopEquipmentVo.java
diff --git a/lxzn-module-mdc/pom.xml b/lxzn-module-mdc/pom.xml
index c8431f9..bfb2188 100644
--- a/lxzn-module-mdc/pom.xml
+++ b/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>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
index 1de3bf9..6f7563f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
+++ b/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;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcShiftSubMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcShiftSubMapper.java
index a29e064..0804d96 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcShiftSubMapper.java
+++ b/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;
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java
index 32a4845..e83befe 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysBusinessCodeRuleController.java
+++ b/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);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-start/pom.xml b/lxzn-module-system/lxzn-system-start/pom.xml
index 24808e5..9392ade 100644
--- a/lxzn-module-system/lxzn-system-start/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 1c6289c..ccdda36 100644
--- a/pom.xml
+++ b/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>
--
Gitblit v1.9.3