feat(PMS)：回滚

.gitlab-ci.yml

@@ -1,28 +0,0 @@
-
-## GitLab CI/CD Config File
-
-## https://ewiki.semi-tech.com/STC/CICD/index.md
-## https://docs.gitlab.com/ee/ci/index.html
-## https://docs.gitlab.com/ee/ci/yaml/index.html
-
----
-
-variables:
-  ## `BOT_ALIAS` and `TEMPLATE_ALIAS` can be set here, or defined in your Group/Project > Settings > CI/CD > Variables
-  ## !!!: Project variables > Group variables > Instance(GitLab) variables > .yml job variables > .yml global variables
-  ## CI/CD variable precedence: https://docs.gitlab.com/ee/ci/variables/index.html#cicd-variable-precedence
-  BOT_ALIAS:        "iep_cicd_notify_robot"
-  TEMPLATE_ALIAS:   "sonar"
-  VERBOSE:          "false"
-  JAVA_VERSION: "8"
-
-default:
-  tags:
-    ## public runners
-    - public
-
-include:
-  ## https://gitlab.semi-tech.com/stc/cicd/cicd-config
-  - project:    stc/cicd/cicd-config
-    ref:        master
-    file:       java.yml

mom-pms-app/src/main/java/com/foreverwin/mom/pms/Application.java

@@ -15,11 +15,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableMomResourceServer
 @SpringBootApplication(scanBasePackages = {"com.foreverwin.mom", "com.foreverwin.iep"})
 // 需配置不然扫不到mes-db的mapper
-@MapperScan({
-        "com.foreverwin.**.mapper",
-        "com.foreverwin.**.mapper.first",
-        "com.foreverwin.**.mapper.second"
-})
+@MapperScan({"com.foreverwin.**.mapper"})
 @EnableAsync
 public class Application {
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/config/DataSourceConfig.java

@@ -1,66 +0,0 @@
-package com.foreverwin.mom.pms.config;
-import com.alibaba.druid.pool.DruidDataSource;
-import io.seata.rm.datasource.DataSourceProxy;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-
-import javax.sql.DataSource;
-
-/**
- * @author zhaofeng_cheng
- * @date 2024/12/12 14:27
- * @description
- */
-@Configuration
-public class DataSourceConfig {
-    
-    @Primary
-    @Bean(name = "firstDataSource")
-    @ConfigurationProperties(prefix = "spring.datasource.druid.first")
-    public DataSource firstDataSource() {
-        return DataSourceBuilder.create().type(DruidDataSource.class).build();
-    }
-    
-    /**
-     * 需要将 DataSourceProxy 设置为mysql数据源，postgresql数据源不需要
-     * @param firstDataSource
-     * @return
-     */
-    @Bean(name = "firstDataSourceProxy")
-    public DataSource firstDataSourceProxy(@Qualifier("firstDataSource") DataSource firstDataSource) {
-        return new DataSourceProxy(firstDataSource);
-    }
-    
-    @Bean(name = "firstSqlSessionFactory")
-    @Primary
-    public SqlSessionFactory firstSqlSessionFactory(@Qualifier("firstDataSource") DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver()
-                                        .getResources("classpath*:mapper/first/*.xml"));
-        return bean.getObject();
-    }
-    
-    @Bean(name = "secondDataSource")
-    @ConfigurationProperties(prefix = "spring.datasource.druid.second")
-    public DataSource secondDataSource() {
-        return DataSourceBuilder.create().type(DruidDataSource.class).build();
-    }
-    
-    @Bean(name = "secondSqlSessionFactory")
-    public SqlSessionFactory secondSqlSessionFactory(@Qualifier("secondDataSource") DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver()
-                                        .getResources("classpath*:mapper/second/*.xml"));
-        return bean.getObject();
-    }
-}

mom-pms-core/src/main/java/com/foreverwin/mom/pms/controller/InspectTaskController.java

@@ -11,7 +11,7 @@ import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.EquipTypeEquip;
 import com.foreverwin.mom.pms.entity.MaintainInspectTask;
 import com.foreverwin.mom.pms.helper.InspectTaskHelper;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectTaskMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectTaskMapper;
 import com.foreverwin.mom.pms.service.EquipTypeEquipService;
 import com.foreverwin.mom.pms.service.MaintainInspectTaskService;
 import com.foreverwin.mom.pms.vo.MaintainInspectTaskVo;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/controller/PmsEquipDataController.java

@@ -25,7 +25,7 @@ import com.foreverwin.mom.pms.dto.PowerDataReportDto;
 import com.foreverwin.mom.pms.dto.SteamEnergyReportDto;
 import com.foreverwin.mom.pms.entity.PmsEquipData;
 import com.foreverwin.mom.pms.entity.PmsEquipDataDetail;
-import com.foreverwin.mom.pms.mapper.first.PmsEquipDataMapper;
+import com.foreverwin.mom.pms.mapper.PmsEquipDataMapper;
 import com.foreverwin.mom.pms.service.PmsEquipDataDetailService;
 import com.foreverwin.mom.pms.service.PmsEquipDataService;
 import org.springframework.beans.factory.annotation.Autowired;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/controller/PmsOeeReportController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mom.common.core.util.R;
 import com.foreverwin.mom.common.log.annotation.SysLog;
 import com.foreverwin.mom.pms.entity.PmsOeeReport;
-import com.foreverwin.mom.pms.mapper.first.PmsOeeReportMapper;
+import com.foreverwin.mom.pms.mapper.PmsOeeReportMapper;
 import com.foreverwin.mom.pms.service.PmsOeeReportService;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/helper/RepairOrderReportHelper.java

@@ -12,7 +12,7 @@ import com.foreverwin.mom.pms.dto.GenerateNextNumberResponse;
 import com.foreverwin.mom.pms.entity.Equip;
 import com.foreverwin.mom.pms.entity.RepairOrder;
 import com.foreverwin.mom.pms.idGen.RepairReportIdGen;
-import com.foreverwin.mom.pms.mapper.first.UserGroupByCustomMapper;
+import com.foreverwin.mom.pms.mapper.UserGroupByCustomMapper;
 import com.foreverwin.mom.pms.service.EquipService;
 import com.foreverwin.mom.pms.service.NextNumberService;
 import com.foreverwin.mom.pms.service.RepairOrderService;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/job/MaintainTaskHandler.java

@@ -16,7 +16,7 @@ import com.foreverwin.mom.pms.dto.EnergyPoolDto;
 import com.foreverwin.mom.pms.dto.MaintainInspectTaskDto;
 import com.foreverwin.mom.pms.entity.*;
 import com.foreverwin.mom.pms.idGen.MaOrderIdGen;
-import com.foreverwin.mom.pms.mapper.first.FastCodeDetailByCustomMapper;
+import com.foreverwin.mom.pms.mapper.FastCodeDetailByCustomMapper;
 import com.foreverwin.mom.pms.service.*;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/BrokenHandler.java

@@ -3,11 +3,12 @@ package com.foreverwin.mom.pms.mdm.handler;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.common.StringUtils;
 import com.foreverwin.mom.pms.entity.Broken;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/EquipHandler.java

@@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mom.common.core.util.I18nUtil;
 import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
 import com.foreverwin.mom.common.security.util.SecurityUtils;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.Equip;
 import com.foreverwin.mom.pms.service.EquipService;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/EquipTypeHandler.java

@@ -3,10 +3,10 @@ package com.foreverwin.mom.pms.mdm.handler;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.EquipType;
 import com.foreverwin.mom.pms.service.EquipTypeService;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/MaintainInspectListHandler.java

@@ -3,10 +3,10 @@ package com.foreverwin.mom.pms.mdm.handler;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.EquipType;
 import com.foreverwin.mom.pms.entity.MaintainInspectList;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/MaintainInspectListItemHandler.java

@@ -5,13 +5,13 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.FileReader;
+import com.foreverwin.iep.mdm.reader.ReaderBuilder;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.FileReader;
-import com.foreverwin.mom.mes.mdm.reader.ReaderBuilder;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.MaintainInspectList;
 import com.foreverwin.mom.pms.entity.MaintainInspectListItem;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/MaintainPlanEquipHandler.java

@@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.foreverwin.mom.common.core.util.I18nUtil;
 import com.foreverwin.mom.common.security.util.SecurityUtils;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.Equip;
 import com.foreverwin.mom.pms.entity.MaintainPlan;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/MaintainPlanItemHandler.java

@@ -5,10 +5,10 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.entity.MaintainPlan;
 import com.foreverwin.mom.pms.entity.MaintainPlanItem;
 import com.foreverwin.mom.pms.service.*;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/MaintainPlanMainHandler.java

@@ -4,10 +4,10 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.ConstantUtil;
 import com.foreverwin.mom.pms.common.StringUtil;
 import com.foreverwin.mom.pms.entity.MaintainPlan;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/SpareGroupHandler.java

@@ -3,10 +3,10 @@ package com.foreverwin.mom.pms.mdm.handler;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.SpareGroup;
 import com.foreverwin.mom.pms.service.SpareGroupService;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/mdm/handler/SpareHandler.java

@@ -4,10 +4,10 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.foreverwin.mom.common.core.util.I18nUtil;
-import com.foreverwin.mom.mes.mdm.dto.HeaderColumn;
-import com.foreverwin.mom.mes.mdm.handler.BaseHandler;
-import com.foreverwin.mom.mes.mdm.reader.RowVisitor;
-import com.foreverwin.mom.mes.mdm.util.MasterDataUtil;
+import com.foreverwin.iep.mdm.dto.HeaderColumn;
+import com.foreverwin.iep.mdm.handler.BaseHandler;
+import com.foreverwin.iep.mdm.reader.RowVisitor;
+import com.foreverwin.iep.mdm.util.MasterDataUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.Spare;
 import com.foreverwin.mom.pms.entity.SpareGroupSpare;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/ActivityOptionServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.ActivityOption;
-import com.foreverwin.mom.pms.mapper.first.ActivityOptionMapper;
+import com.foreverwin.mom.pms.mapper.ActivityOptionMapper;
 import com.foreverwin.mom.pms.service.ActivityOptionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/BrokenAttachedServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.BrokenAttached;
-import com.foreverwin.mom.pms.mapper.first.BrokenAttachedMapper;
+import com.foreverwin.mom.pms.mapper.BrokenAttachedMapper;
 import com.foreverwin.mom.pms.service.BrokenAttachedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/BrokenServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.Broken;
-import com.foreverwin.mom.pms.mapper.first.BrokenMapper;
+import com.foreverwin.mom.pms.mapper.BrokenMapper;
 import com.foreverwin.mom.pms.service.BrokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/ConfigFieldsServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.ConfigFields;
-import com.foreverwin.mom.pms.mapper.first.ConfigFieldsMapper;
+import com.foreverwin.mom.pms.mapper.ConfigFieldsMapper;
 import com.foreverwin.mom.pms.service.ConfigFieldsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/CustomFieldsServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.CustomFields;
-import com.foreverwin.mom.pms.mapper.first.CustomFieldsByCustomMapper;
+import com.foreverwin.mom.pms.mapper.CustomFieldsByCustomMapper;
 import com.foreverwin.mom.pms.service.CustomFieldsService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/DemoServiceImpl.java

@@ -2,7 +2,7 @@ package com.foreverwin.mom.pms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.Demo;
-import com.foreverwin.mom.pms.mapper.first.DemoMapper;
+import com.foreverwin.mom.pms.mapper.DemoMapper;
 import com.foreverwin.mom.pms.service.DemoService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/EmailGroupServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.EmailGroup;
-import com.foreverwin.mom.pms.mapper.first.EmailGroupMapper;
+import com.foreverwin.mom.pms.mapper.EmailGroupMapper;
 import com.foreverwin.mom.pms.service.EmailGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/EquipServiceImpl.java

@@ -15,7 +15,7 @@ import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.Equip;
 import com.foreverwin.mom.pms.entity.EquipType;
 import com.foreverwin.mom.pms.entity.EquipTypeEquip;
-import com.foreverwin.mom.pms.mapper.first.EquipMapper;
+import com.foreverwin.mom.pms.mapper.EquipMapper;
 import com.foreverwin.mom.pms.service.EquipService;
 import com.foreverwin.mom.pms.service.EquipTypeEquipService;
 import com.foreverwin.mom.pms.service.EquipTypeService;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/EquipTypeEquipServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.common.ConstantUtil;
 import com.foreverwin.mom.pms.entity.EquipTypeEquip;
-import com.foreverwin.mom.pms.mapper.first.EquipTypeEquipMapper;
+import com.foreverwin.mom.pms.mapper.EquipTypeEquipMapper;
 import com.foreverwin.mom.pms.service.EquipTypeEquipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/EquipTypeServiceImpl.java

@@ -2,7 +2,7 @@ package com.foreverwin.mom.pms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.EquipType;
-import com.foreverwin.mom.pms.mapper.first.EquipTypeMapper;
+import com.foreverwin.mom.pms.mapper.EquipTypeMapper;
 import com.foreverwin.mom.pms.service.EquipTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/FastCodeDetailServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.FastCodeDetail;
-import com.foreverwin.mom.pms.mapper.first.FastCodeDetailByCustomMapper;
+import com.foreverwin.mom.pms.mapper.FastCodeDetailByCustomMapper;
 import com.foreverwin.mom.pms.service.FastCodeDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/FastCodeServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.FastCode;
-import com.foreverwin.mom.pms.mapper.first.FastCodeByCustomMapper;
+import com.foreverwin.mom.pms.mapper.FastCodeByCustomMapper;
 import com.foreverwin.mom.pms.service.FastCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/LocationAreaServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.LocationArea;
-import com.foreverwin.mom.pms.mapper.first.LocationAreaMapper;
+import com.foreverwin.mom.pms.mapper.LocationAreaMapper;
 import com.foreverwin.mom.pms.service.LocationAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MachineStatusServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MachineStatus;
-import com.foreverwin.mom.pms.mapper.first.MachineStatusMapper;
+import com.foreverwin.mom.pms.mapper.MachineStatusMapper;
 import com.foreverwin.mom.pms.service.MachineStatusService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainInspectListItemServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MaintainInspectListItem;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectListItemMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectListItemMapper;
 import com.foreverwin.mom.pms.service.MaintainInspectListItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainInspectListServiceImpl.java

@@ -10,7 +10,7 @@ import com.foreverwin.mom.pms.common.DateUtil;
 import com.foreverwin.mom.pms.common.HandleUtil;
 import com.foreverwin.mom.pms.entity.MaintainInspectList;
 import com.foreverwin.mom.pms.entity.MaintainInspectListItem;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectListMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectListMapper;
 import com.foreverwin.mom.pms.service.MaintainInspectListItemService;
 import com.foreverwin.mom.pms.service.MaintainInspectListService;
 import com.foreverwin.mom.pms.vo.MaintainInspectListVo;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainInspectTaskItemServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MaintainInspectTaskItem;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectTaskItemMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectTaskItemMapper;
 import com.foreverwin.mom.pms.service.MaintainInspectTaskItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainInspectTaskServiceImpl.java

@@ -7,7 +7,7 @@ import com.foreverwin.mom.pms.common.DateUtil;
 import com.foreverwin.mom.pms.common.StringUtil;
 import com.foreverwin.mom.pms.dto.MaintainInspectTaskDto;
 import com.foreverwin.mom.pms.entity.*;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectTaskMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectTaskMapper;
 import com.foreverwin.mom.pms.service.MaintainInspectTaskService;
 import com.foreverwin.mom.pms.service.MaintainPlanEquipService;
 import com.foreverwin.mom.pms.service.MaintainPlanItemService;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainInspectTaskSpareServiceImpl.java

@@ -3,8 +3,8 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MaintainInspectTaskSpare;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectTaskItemMapper;
-import com.foreverwin.mom.pms.mapper.first.MaintainInspectTaskSpareMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectTaskItemMapper;
+import com.foreverwin.mom.pms.mapper.MaintainInspectTaskSpareMapper;
 import com.foreverwin.mom.pms.service.MaintainInspectTaskSpareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainPlanEquipServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MaintainPlanEquip;
-import com.foreverwin.mom.pms.mapper.first.MaintainPlanEquipMapper;
+import com.foreverwin.mom.pms.mapper.MaintainPlanEquipMapper;
 import com.foreverwin.mom.pms.service.MaintainPlanEquipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainPlanItemServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MaintainPlanItem;
-import com.foreverwin.mom.pms.mapper.first.MaintainPlanItemMapper;
+import com.foreverwin.mom.pms.mapper.MaintainPlanItemMapper;
 import com.foreverwin.mom.pms.service.MaintainPlanItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainPlanServiceImpl.java

@@ -14,7 +14,7 @@ import com.foreverwin.mom.pms.entity.MaintainInspectTask;
 import com.foreverwin.mom.pms.entity.MaintainPlan;
 import com.foreverwin.mom.pms.entity.MaintainPlanEquip;
 import com.foreverwin.mom.pms.idGen.MaOrderIdGen;
-import com.foreverwin.mom.pms.mapper.first.MaintainPlanMapper;
+import com.foreverwin.mom.pms.mapper.MaintainPlanMapper;
 import com.foreverwin.mom.pms.service.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/MaintainPlanTriggerLogServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.MaintainPlan;
 import com.foreverwin.mom.pms.entity.MaintainPlanTriggerLog;
-import com.foreverwin.mom.pms.mapper.first.MaintainPlanTriggerLogMapper;
+import com.foreverwin.mom.pms.mapper.MaintainPlanTriggerLogMapper;
 import com.foreverwin.mom.pms.service.MaintainPlanTriggerLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/NextNumberServiceImpl.java

@@ -19,7 +19,7 @@ import com.foreverwin.mom.pms.common.StringUtils;
 import com.foreverwin.mom.pms.dto.GenerateNextNumberResponse;
 import com.foreverwin.mom.pms.entity.NextNumber;
 import com.foreverwin.mom.pms.entity.NextNumberBOHandle;
-import com.foreverwin.mom.pms.mapper.first.NextNumberByCustomMapper;
+import com.foreverwin.mom.pms.mapper.NextNumberByCustomMapper;
 import com.foreverwin.mom.pms.service.NextNumberService;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.slf4j.Logger;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsEquipDataDetailServiceImpl.java

@@ -2,7 +2,7 @@ package com.foreverwin.mom.pms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.PmsEquipDataDetail;
-import com.foreverwin.mom.pms.mapper.first.PmsEquipDataDetailMapper;
+import com.foreverwin.mom.pms.mapper.PmsEquipDataDetailMapper;
 import com.foreverwin.mom.pms.service.PmsEquipDataDetailService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsEquipDataServiceImpl.java

@@ -16,8 +16,8 @@ import com.foreverwin.mom.pms.dto.EnergyPoolDto;
 import com.foreverwin.mom.pms.dto.EnergyYieldDto;
 import com.foreverwin.mom.pms.entity.PmsEquipData;
 import com.foreverwin.mom.pms.entity.PmsEquipDataDetail;
-import com.foreverwin.mom.pms.mapper.first.PmsEquipDataDetailMapper;
-import com.foreverwin.mom.pms.mapper.first.PmsEquipDataMapper;
+import com.foreverwin.mom.pms.mapper.PmsEquipDataDetailMapper;
+import com.foreverwin.mom.pms.mapper.PmsEquipDataMapper;
 import com.foreverwin.mom.pms.service.PmsEquipDataDetailService;
 import com.foreverwin.mom.pms.service.PmsEquipDataService;
 import org.springframework.beans.factory.annotation.Autowired;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsEquipmentAlarmRecordServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.iep.common.constant.BaseConstants;
 import com.foreverwin.mom.common.core.exception.BusinessException;
 import com.foreverwin.mom.pms.entity.PmsEquipmentAlarmRecord;
-import com.foreverwin.mom.pms.mapper.first.PmsEquipmentAlarmRecordMapper;
+import com.foreverwin.mom.pms.mapper.PmsEquipmentAlarmRecordMapper;
 import com.foreverwin.mom.pms.service.PmsEquipmentAlarmRecordService;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.slf4j.Logger;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsFileUploadServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.PmsFileUpload;
-import com.foreverwin.mom.pms.mapper.first.FileUploadMapper;
+import com.foreverwin.mom.pms.mapper.FileUploadMapper;
 import com.foreverwin.mom.pms.service.PmsFileUploadService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsInspectControlServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
 import com.foreverwin.mom.common.security.util.SecurityUtils;
 import com.foreverwin.mom.pms.entity.PmsInspectControl;
-import com.foreverwin.mom.pms.mapper.first.PmsInspectControlMapper;
+import com.foreverwin.mom.pms.mapper.PmsInspectControlMapper;
 import com.foreverwin.mom.pms.service.PmsInspectControlService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsOeeReportServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.common.core.exception.BusinessException;
 import com.foreverwin.mom.common.security.util.SecurityUtils;
 import com.foreverwin.mom.pms.entity.PmsOeeReport;
-import com.foreverwin.mom.pms.mapper.first.PmsOeeReportMapper;
+import com.foreverwin.mom.pms.mapper.PmsOeeReportMapper;
 import com.foreverwin.mom.pms.service.PmsOeeReportService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsResrceQServiceImpl.java

@@ -11,7 +11,7 @@ import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
 import com.foreverwin.mom.common.security.util.SecurityUtils;
 import com.foreverwin.mom.pms.dto.PmsResrceQDTO;
 import com.foreverwin.mom.pms.entity.PmsResrceQ;
-import com.foreverwin.mom.pms.mapper.first.PmsResrceQMapper;
+import com.foreverwin.mom.pms.mapper.PmsResrceQMapper;
 import com.foreverwin.mom.pms.service.PmsResrceQService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsSpareInventoryServiceImpl.java

@@ -12,8 +12,8 @@ import com.foreverwin.mom.pms.dto.PmsSpareInventoryDto;
 import com.foreverwin.mom.pms.dto.SpareDto;
 import com.foreverwin.mom.pms.entity.PmsSpareInventory;
 import com.foreverwin.mom.pms.entity.Spare;
-import com.foreverwin.mom.pms.mapper.first.PmsSpareInventoryMapper;
-import com.foreverwin.mom.pms.mapper.first.SpareMapper;
+import com.foreverwin.mom.pms.mapper.PmsSpareInventoryMapper;
+import com.foreverwin.mom.pms.mapper.SpareMapper;
 import com.foreverwin.mom.pms.service.PmsSpareInventoryService;
 import com.foreverwin.mom.pms.service.SpareService;
 import io.seata.spring.annotation.GlobalTransactional;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/PmsStorageLocationServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
 import com.foreverwin.mom.pms.entity.PmsStorageLocation;
-import com.foreverwin.mom.pms.mapper.first.PmsStorageLocationMapper;
+import com.foreverwin.mom.pms.mapper.PmsStorageLocationMapper;
 import com.foreverwin.mom.pms.service.PmsStorageLocationService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/ProductionElectricityFlowMonitorServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mom.common.core.exception.BusinessException;
 import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
 import com.foreverwin.mom.pms.dto.*;
-import com.foreverwin.mom.pms.mapper.first.PmsEquipDataMapper;
+import com.foreverwin.mom.pms.mapper.PmsEquipDataMapper;
 import com.foreverwin.mom.pms.service.ProductionElectricityFlowMonitorService;
 import com.ibm.icu.math.BigDecimal;
 import org.springframework.beans.factory.annotation.Autowired;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/RepairOrderConfirmServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.RepairOrderConfirm;
-import com.foreverwin.mom.pms.mapper.first.RepairOrderConfirmMapper;
+import com.foreverwin.mom.pms.mapper.RepairOrderConfirmMapper;
 import com.foreverwin.mom.pms.service.RepairOrderConfirmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/RepairOrderItemServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.RepairOrderItem;
-import com.foreverwin.mom.pms.mapper.first.RepairOrderItemMapper;
+import com.foreverwin.mom.pms.mapper.RepairOrderItemMapper;
 import com.foreverwin.mom.pms.service.RepairOrderItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/RepairOrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
 import com.foreverwin.mom.pms.entity.RepairOrder;
-import com.foreverwin.mom.pms.mapper.first.RepairOrderMapper;
+import com.foreverwin.mom.pms.mapper.RepairOrderMapper;
 import com.foreverwin.mom.pms.service.NextNumberService;
 import com.foreverwin.mom.pms.service.RepairOrderService;
 import org.springframework.beans.factory.annotation.Autowired;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/SpareGroupServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.SpareGroup;
-import com.foreverwin.mom.pms.mapper.first.SpareGroupMapper;
+import com.foreverwin.mom.pms.mapper.SpareGroupMapper;
 import com.foreverwin.mom.pms.service.SpareGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/SpareGroupSpareServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.SpareGroupSpare;
-import com.foreverwin.mom.pms.mapper.first.SpareGroupSpareMapper;
+import com.foreverwin.mom.pms.mapper.SpareGroupSpareMapper;
 import com.foreverwin.mom.pms.service.SpareGroupSpareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/SpareServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.Spare;
-import com.foreverwin.mom.pms.mapper.first.SpareMapper;
+import com.foreverwin.mom.pms.mapper.SpareMapper;
 import com.foreverwin.mom.pms.service.SpareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/SysConfigServiceImpl.java

@@ -3,7 +3,7 @@ package com.foreverwin.mom.pms.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.foreverwin.mom.pms.entity.SysConfig;
-import com.foreverwin.mom.pms.mapper.first.SysConfigByCustomMapper;
+import com.foreverwin.mom.pms.mapper.SysConfigByCustomMapper;
 import com.foreverwin.mom.pms.service.SysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/ZEnergyServiceImpl.java

@@ -2,7 +2,7 @@ package com.foreverwin.mom.pms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.ZEnergy;
-import com.foreverwin.mom.pms.mapper.first.ZEnergyMapper;
+import com.foreverwin.mom.pms.mapper.ZEnergyMapper;
 import com.foreverwin.mom.pms.service.ZEnergyService;
 import org.springframework.stereotype.Service;
 

mom-pms-core/src/main/java/com/foreverwin/mom/pms/service/impl/ZResourcePointServiceImpl.java

@@ -2,7 +2,7 @@ package com.foreverwin.mom.pms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mom.pms.entity.ZResourcePoint;
-import com.foreverwin.mom.pms.mapper.first.ZResourcePointMapper;
+import com.foreverwin.mom.pms.mapper.ZResourcePointMapper;
 import com.foreverwin.mom.pms.service.ZResourcePointService;
 import org.springframework.stereotype.Service;
 

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/ActivityOptionMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.ActivityOption;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/BrokenAttachedMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.BrokenAttached;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/BrokenMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.Broken;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/ConfigFieldsMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.ConfigFields;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/CustomFieldsByCustomMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.CustomFields;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/DemoMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.Demo;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/EmailGroupMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.EmailGroup;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/EquipMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.Equip;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/EquipTypeEquipMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.EquipTypeEquip;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/EquipTypeMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.EquipType;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/FastCodeByCustomMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.FastCode;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/FastCodeDetailByCustomMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.FastCodeDetail;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/FileUploadMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.PmsFileUpload;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/LocationAreaMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.LocationArea;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MachineStatusMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MachineStatus;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainInspectListItemMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainInspectListItem;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainInspectListMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainInspectList;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainInspectTaskItemMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainInspectTaskItem;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainInspectTaskMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.dto.MaintainInspectTaskDto;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainInspectTaskSpareMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainInspectTaskSpare;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainPlanEquipMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainPlanEquip;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainPlanItemMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainPlanMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainPlan;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/MaintainPlanTriggerLogMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.MaintainPlanTriggerLog;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/NextNumberByCustomMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsEquipDataDetailMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsEquipDataDetail;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsEquipDataMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsEquipData;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsEquipmentAlarmRecordMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsEquipmentAlarmRecord;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsInspectControlMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsInspectControl;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsOeeReportMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsOeeReport;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsResrceQMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsResrceQ;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsSpareInventoryMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.dto.PmsSpareInventoryDto;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/PmsStorageLocationMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.mom.pms.entity.PmsStorageLocation;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/RepairOrderConfirmMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.RepairOrderConfirm;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/RepairOrderItemMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.RepairOrderItem;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/RepairOrderMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.RepairOrder;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/SpareGroupMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.SpareGroup;

mom-pms-db/src/main/java/com/foreverwin/mom/pms/mapper/SpareGroupSpareMapper.java

@@ -1,4 +1,4 @@
-package com.foreverwin.mom.pms.mapper.first;
+package com.foreverwin.mom.pms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mom.pms.entity.SpareGroupSpare;