基础主数据开

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesConfigService.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @Description:
+ * @CreateDate: 2021/9/9 下午3:24
+ * @Author: simon.song
+ */
+public interface IMesConfigService {
+    @ApiOperation(value = "获取配置表模板代码")
+    String getCfgValue(String org, String key);
+
+    @ApiOperation(value = "获取配置表模板代码")
+    MesConfig getCfgValueByCode(String key);
+
+
+}

modules/i3plus-ext-mes-apiservice/pom.xml

@@ -18,6 +18,12 @@
         <dependency>
             <groupId>impp.framework</groupId>
             <artifactId>impp-framework-boot</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -52,6 +58,11 @@
 
         <dependency>
             <groupId>i3plus.icloud</groupId>
+            <artifactId>i3plus-icloud-wms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>i3plus.icloud</groupId>
             <artifactId>i3plus-icloud-andon</artifactId>
         </dependency>
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAreaController.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesArea")
+public class MesAreaController extends BaseMesController<MesArea>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesBom")
+public class MesBomController extends BaseMesController<MesBom>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelController.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerCarModel")
+public class MesCustomerCarModelController extends BaseMesController<MesCustomerCarModel>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerCarModelDetailController.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerCarModelDetail")
+public class MesCustomerCarModelDetailController extends BaseMesController<MesCustomerCarModelDetail>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerController.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomer")
+public class MesCustomerController extends BaseMesController<MesCustomer>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerOriganizeController.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerOriganze")
+
+public class MesCustomerOriganizeController extends BaseMesController<MesCustomerOriganze>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCustomerPartController.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerPart")
+
+public class MesCustomerPartController extends BaseMesController<MesCustomerPart>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesModelMultiCavityController.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesModelMultiCavity")
+public class MesModelMultiCavityController extends BaseMesController<MesModelMultiCavity>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartController.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPart")
+
+public class MesPartController extends BaseMesController<MesPart>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartPtrController.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartPtr")
+public class MesPartPtrController extends BaseMesController<MesPartPtr> {
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellController.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCell")
+
+public class MesWorkCellController extends BaseMesController<MesWorkCell>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCenterController.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCenter")
+
+public class MesWorkCenterController extends BaseMesController<MesWorkCenter>{
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/TestBaseController.java

@@ -1,8 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesArea;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class TestBaseController extends BaseMesController<MesArea>{
-}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java

@@ -0,0 +1,169 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.platform.common.util.MesConstWords;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate: 2022/12/1 12:15
+ * @Author: simon.song
+ */
+public abstract class BaseMesService<T extends BaseBean> implements IBaseMesService<T> {
+    @Autowired
+    protected BaseRepository<T, Long> baseRDao;
+
+    /**
+     * 泛型class
+     */
+    protected Class<T> mesClass;
+
+    /**
+     * 初始化
+     */
+    public BaseMesService() {
+        // 通过反射获取T的真实类型
+        ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
+        this.mesClass = (Class<T>) pt.getActualTypeArguments()[0];
+    }
+
+    @Override
+    public Class<T> getMesClass() {
+        return mesClass;
+    }
+
+    @Override
+    public ListPager<T> queryPager(T bean, Pager pager) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode(), bean.getIsValid());
+        setPackQueryBean(bean, packBean);
+        pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
+        List<T> list = baseRDao.findByHqlWherePage(packBean, pager);
+        setBeanModel(list);
+        return new ListPager<>(list, pager);
+    }
+
+    @Override
+    public ListPager<T> queryPagerWhere(Pager pager, DdlPackBean packBean) {
+        pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
+        List<T> list = baseRDao.findByHqlWherePage(packBean, pager);
+        setBeanModel(list);
+        return new ListPager<>(list, pager);
+    }
+
+
+    @Override
+    public List<T> findAll(DdlPackBean packBean) {
+        return baseRDao.findByHqlWhere(packBean);
+    }
+
+    @Override
+    public T get(Long id) {
+        return baseRDao.getById(id);
+    }
+
+    @Override
+    public T insert(T bean) {
+        onInsertBean(bean);
+        bean = baseRDao.insert(bean);
+        return bean;
+    }
+
+    @Override
+    public List<T> insertBatch(List<T> beanList) {
+        for (T bean : beanList) {
+            onInsertBean(bean);
+            insert(bean);
+        }
+        return beanList;
+    }
+
+    @Override
+    public T update(T bean) {
+        onUpdateBean(bean);
+        T originBean = baseRDao.getById(bean.getId());
+        onModifyBean();
+        baseRDao.update(bean);
+        return originBean;
+    }
+
+    @Override
+    public void updates(Iterable<T> beans) {
+        for (T bean : beans) {
+            onUpdateBean(bean);
+            baseRDao.update(bean);
+        }
+    }
+
+    @Override
+    public void deleteWeaklyById(Long id, String userName) {
+        onDeleteId(id);
+        baseRDao.deleteWeaklyById(id, userName);
+    }
+
+    @Override
+    public void deleteWeaklyByIds(Long[] ids, String userName) {
+        for (Long id : ids) {
+            onDeleteId(id);
+            baseRDao.deleteWeaklyById(id, userName);
+        }
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        onDeleteId(id);
+        baseRDao.deleteById(id);
+    }
+
+    @Override
+    public void deleteByIds(Long[] ids) {
+        for (Long id : ids) {
+            onDeleteId(id);
+            baseRDao.deleteById(id);
+        }
+    }
+
+    @Override
+    public int updateValid(Long id, int status, String userName) {
+        if (status != CommonEnumUtil.IS_VAILD.INVAILD.getValue() && status != CommonEnumUtil.IS_VAILD.VAILD.getValue()) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("启用，禁用枚举状态值【%s】未被定义", status)
+                    .build();
+        }
+        return baseRDao.updateByProperties(new String[]{"id"}, new Object[]{id},
+                new String[]{MesConstWords.IS_VALID, "modifyUser", "modifyDatetime"},
+                new Object[]{status, userName, TimeTool.getNowTime(true)});
+    }
+
+    protected void onInsertBean(T item) {
+    }
+
+    protected void onUpdateBean(T item) {
+    }
+
+    protected void onModifyBean() {
+    }
+
+    protected void setBeanModel(List<T> list) {
+    }
+
+    protected void setPackQueryBean(T bean, DdlPackBean packBean) {
+    }
+
+    protected void onDeleteId(Long id) {
+    }
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAreaService.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesAreaService extends BaseMesService<MesArea> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesBomService extends BaseMesService<MesBom> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesConfigService.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
+import cn.estsh.i3plus.pojo.mes.repository.MesConfigRepository;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:
+ * @CreateDate: 2021/9/9 下午3:25
+ * @Author: simon.song
+ */
+@Service
+@Slf4j
+public class MesConfigService implements IMesConfigService {
+    @Autowired
+    private MesConfigRepository configRepository;
+
+    @Override
+    public String getCfgValue(String org, String key) {
+        MesConfig config = configRepository.getByProperty(
+                new String[]{"cfgKey", "organizeCode", "isValid", "isDeleted"},
+                new Object[]{key, org, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()});
+
+        if (config == null) {
+            throw ImppExceptionBuilder.newInstance().setErrorCode(cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
+                    .setErrorDetail(String.format("配置表数据不存在，请维护key【%s】", key))
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .build();
+        }
+        return config.getCfgValue();
+    }
+
+    @Override
+    public MesConfig getCfgValueByCode(String cfgCode) {
+        return this.configRepository.getByProperty(new String[]{"isDeleted", "isValid", "cfgCode"},
+                new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), cfgCode});
+    }
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesCustomerCarModelDetailService extends BaseMesService<MesCustomerCarModelDetail>{
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarModel>{
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganizeService.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author yinxiao
+ * @date 2023-2023/6/2 10:54
+ * @Description
+ */
+@Service
+@Slf4j
+public class MesCustomerOriganizeService extends BaseMesService<MesCustomerOriganze> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:
+ * @CreateDate: 2023/10/11 15:38
+ * @Author: simon.song
+ */
+@Slf4j
+@Service
+public class MesCustomerPartService extends BaseMesService<MesCustomerPart> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author yinxiao
+ * @date 2023-2023/6/2 10:54
+ * @Description
+ */
+@Service
+@Slf4j
+public class MesCustomerService extends BaseMesService<MesCustomer> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesModelMultiCavityService.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesModelMultiCavityService extends BaseMesService<MesModelMultiCavity> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrService.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesPartPtrService extends BaseMesService<MesPartPtr> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesPartService extends BaseMesService<MesPart> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellService.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesWorkCellService extends BaseMesService<MesWorkCell>  {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterService.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesWorkCenterService extends BaseMesService<MesWorkCenter> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/TestBaseService.java

@@ -1,4 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
-
-public class TestBaseService {
-}

modules/i3plus-ext-mes-apiservice/src/main/resources/application-cus-uat.properties

@@ -5,12 +5,18 @@ impp.mes.datasource.isopen=true
 #\u6570\u636E\u6E90\u7684\u522B\u540D
 impp.mes.datasource.alias=mesDataSource
 impp.mes.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.mes.datasource.jdbc-url=jdbc:mysql://10.197.184.74:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.mes.datasource.jdbc-url=jdbc:mysql://192.168.1.241:3306/impp_i3_mes_yf?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+#impp.mes.datasource.jdbc-url=jdbc:sqlserver://139.224.200.147:20037;DatabaseName=impp_i3_mes;
 impp.mes.datasource.username=root
+#impp.mes.datasource.password=Test123!
 impp.mes.datasource.password=estsh123
+#Admin123!
+
+
 #\u6570\u636E\u6E90\u7684\u522B\u540D
 impp.yfas.datasource.alias=yfasDataSource
 impp.yfas.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.yfas.datasource.jdbc-url=jdbc:mysql://10.197.184.74:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.yfas.datasource.jdbc-url=jdbc:mysql://192.168.1.241:3306/impp_i3_mes_yf?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+#impp.yfas.datasource.jdbc-url=jdbc:sqlserver://139.224.200.147:20037;DatabaseName=impp_i3_mes;
 impp.yfas.datasource.username=root
-impp.yfas.datasource.password=estsh123
+impp.yfas.datasource.password=estsh123

modules/i3plus-ext-mes-apiservice/src/main/resources/application-uat.properties

@@ -1,9 +1,9 @@
 #\u9879\u76EE\u7AEF\u53E3
 server.port=8300
 #\u672C\u673Aip
-impp.server.ip=10.197.176.68
+impp.server.ip=192.168.4.109
 #\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740
-impp.console.ip=http://10.197.184.74:8010
+impp.console.ip=http://192.168.1.241:8010
 ################ \u529F\u80FD\u914D\u7F6E1 ################
 #mes webservice\u5F00\u5173
 mes.webservice.open=true
@@ -14,12 +14,14 @@ impp.snowflake.database.id=11
 #\u82E5\u65E0\u6CD5\u8FDE\u63A5\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u662F\u5426\u9700\u8981\u4E00\u76F4\u68C0\u6D4B\u52A0\u5165
 impp.cluster.fetch=false
 #\u670D\u52A1\u6CE8\u518C\u4E2D\u5FC3
-impp.cluster.regist.center=http://10.197.184.74:8000/eureka/
+impp.cluster.regist.center=http://192.168.1.241:8000/eureka/
 #\u65E5\u5FD7\u9ED8\u8BA4\u4F7F\u7528log4j2
 logging.config=classpath:log4j2-spring.xml
 ########\u5E73\u53F0\u76F8\u5173\u53C2\u6570##########
 #\u662F\u5426\u5F00\u542Fredis\u7F13\u5B58
 impp.config.redis=true
+#\u662F\u5426\u5F00\u542Fmongo
+impp.config.mongo=true
 #\u662F\u5426\u5F00\u542FrabbitMQ
 impp.config.rabbitmq=false
 #\u662F\u5426\u5F00\u542Fswagger
@@ -43,10 +45,10 @@ impp.mq.queue.schedule=true
 impp.mq.queue.sweb.notice=true
 ################################ \u5176\u4ED6\u529F\u80FD\u8BBE\u7F6E ################################
 #elasticsearch ip \u591A\u4E2A\u7528\u9017\u53F7\u9694\u5F00
-elasticsearch.ip=10.197.184.74:9200
+elasticsearch.ip=192.168.1.241:9200
 ################  FastDfs \u914D\u7F6E ################
 #tracker\u670D\u52A1\u5668ip
-fastdfs.tracker_servers=10.197.184.74:22122
+fastdfs.tracker_servers=192.168.1.241:22122
 # tracker\u7684http\u7AEF\u53E3
 fastdfs.http_tracker_http_port=22122
 # \u4F7F\u7528\u81EA\u5B9A\u4E49\u5DE5\u5177\u83B7\u53D6\u6587\u4EF6\u5C55\u793A\u5730\u5740
@@ -61,7 +63,7 @@ fastdfs.charset=UTF-8
 # token \u9632\u76D7\u94FE\u529F\u80FD
 fastdfs.http_anti_steal_token=no
 #redisIP
-redis.hostName=10.197.184.74
+redis.hostName=192.168.1.241
 #\u7AEF\u53E3\u53F7
 redis.port=6379
 #\u5982\u679C\u6709\u5BC6\u7801
@@ -69,7 +71,7 @@ redis.password=
 ##\u5176\u4ED6redis\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904
 ################## rabbitMQ\u914D\u7F6E ####################
 spring.rabbitmq.vhost=/
-spring.rabbitmq.host=10.197.184.74
+spring.rabbitmq.host=192.168.1.241
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=estsh
 spring.rabbitmq.password=estsh123
@@ -139,20 +141,18 @@ spring.zipkin.sender.type=web
 spring.zipkin.base-url=${impp.console.ip}
 #\u8FFD\u8E2A\u6DF1\u5EA6\uFF0C\u767E\u5206\u6BD4\uFF0C1\u662F\u5168\u90E8
 spring.sleuth.sampler.probability=1.0
-# mysql
-impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.write.datasource.jdbc-url=jdbc:mysql://10.197.184.74:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-impp.write.datasource.username=root
-impp.write.datasource.password=estsh123
-impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
-impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.read.datasource.jdbc-url=jdbc:mysql://10.197.184.74:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8
-impp.read.datasource.username=root
-impp.read.datasource.password=estsh123
+################ \u65E5\u5FD7\u636E\u6E90 ################
+spring.data.mongodb.database=mongoDBSource
+spring.data.mongodb.uri=192.168.1.241:27017
+spring.data.mongodb.username=sa
+spring.data.mongodb.password=i3plus
+spring.data.mongodb.port=27017
+################ \u4E3B\u6570\u636E\u6E90 ################
+
 ##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316##############
 impp.schedule.open=false
 impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
-impp.schedule.datasource.jdbc-url=jdbc:mysql://10.197.184.74:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.241:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.schedule.datasource.username=root
 impp.schedule.datasource.password=estsh123
 impp.schedule.datasource.max-connections=20
@@ -203,4 +203,61 @@ spring.jpa.show-sql=true
 slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2
 slm.app.id=20190513
 ###################\uFFFD\uFFFD\u013F\uFFFD\uFFFD\uFFFD\u077F\uFFFD\u02B5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD##################################################
-project.entity.path=cn.estsh.i3plus.pojo
+project.entity.path=cn.estsh.i3plus.pojo
+
+
+############################????#######################################
+###spring.shardingsphere.datasource.names=master,slave
+spring.shardingsphere.datasource.names=master,slave
+##??
+spring.shardingsphere.datasource.master.type=com.zaxxer.hikari.HikariDataSource
+spring.shardingsphere.datasource.master.driver-class-name= com.mysql.jdbc.Driver
+spring.shardingsphere.datasource.master.JdbcUrl=jdbc:mysql://192.168.1.241:3306/impp_i3_mes_yf?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+spring.shardingsphere.datasource.master.username=root
+spring.shardingsphere.datasource.master.password=estsh123
+
+spring.shardingsphere.datasource.master.maximum-pool-size=200
+spring.shardingsphere.datasource.master.minimum-idle=200
+spring.shardingsphere.datasource.master.idle-timeout=500000
+spring.shardingsphere.datasource.master.connection-timeout=600000
+spring.shardingsphere.datasource.master.max-lifetime=7000000
+spring.shardingsphere.datasource.master.connection-test-query=select 1
+spring.shardingsphere.datasource.master.keep-alive-time=3500000
+
+
+##??
+spring.shardingsphere.datasource.slave.type=com.zaxxer.hikari.HikariDataSource
+spring.shardingsphere.datasource.slave.driver-class-name= com.mysql.jdbc.Driver
+spring.shardingsphere.datasource.slave.JdbcUrl=jdbc:mysql://192.168.1.241:3306/impp_i3_mes_yf?autoReconnect=true&useSSL=false&characterEncoding=utf-8
+spring.shardingsphere.datasource.slave.username=root
+spring.shardingsphere.datasource.slave.password=estsh123
+
+spring.shardingsphere.datasource.slave.maximum-pool-size=200
+spring.shardingsphere.datasource.slave.minimum-idle=200
+spring.shardingsphere.datasource.slave.idle-timeout=500000
+spring.shardingsphere.datasource.slave.connection-timeout=600000
+spring.shardingsphere.datasource.slave.max-lifetime=7000000
+spring.shardingsphere.datasource.slave.connection-test-query=select 1
+spring.shardingsphere.datasource.slave.keep-alive-time=3500000
+
+impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
+impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.241:3306/impp_i3_mes_yf?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+impp.write.datasource.username=root
+impp.write.datasource.password=estsh123
+impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
+impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
+impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.241:3306/impp_i3_mes_yf?autoReconnect=true&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+impp.read.datasource.username=root
+impp.read.datasource.password=estsh123
+
+
+##??????
+spring.shardingsphere.sharding.master-slave-rules.ds0.master-data-source-name=master
+spring.shardingsphere.sharding.master-slave-rules.ds0.slave-data-source-names=slave
+#??datasource ????????????????
+#??? gg
+#spring.shardingsphere.sharding.default-data-source-name=ds0
+#??????????sql??
+spring.shardingsphere.props.sql.show = false
+
+spring.shardingsphere.props.max.connections.size.per.query = 10

modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 #\u9879\u76EE\u540D\u79F0
 spring.application.name=mes-zxw
 #\u4F7F\u7528\u914D\u7F6E
-spring.profiles.active=test
+spring.profiles.active=uat,cus-uat
 ######### \u81EA\u5B9A\u4E49\u53C2\u6570 #########
 #\u9879\u76EE\u63CF\u8FF0\u4FE1\u606F\uFF08swagger\u4E2D\u663E\u5F0F\uFF09\uFF0C\u4E2D\u6587\u4F7F\u7528uncode\u8F6C
 desc.application.name=\u751F\u4EA7\u6267\u884C\u7CFB\u7EDF

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.ext.mes.pojo.constant;
+
+
+public class MesCommonConstant {
+
+    //yanfeng
+    public static final String MES_YANFEN = "/mes/yanfen";
+
+
+}

pom.xml

@@ -62,6 +62,12 @@
                 <type>pom</type>
             </dependency>
             <dependency>
+                <groupId>i3plus.icloud</groupId>
+                <artifactId>i3plus-icloud-wms</artifactId>
+                <version>${i3plus.icloud.version}</version>
+
+            </dependency>
+            <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo</artifactId>
                 <version>${i3plus.pojo.version}</version>