基础主数据bug

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(description = "设备变量属性")
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentVariableCfg")
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentVariable")
 public class MesEquipmentVariableController extends BaseMesController<MesEquipmentVariable> {
 
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquitmentChannelController.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.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentChannel;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentChannel")
+
+public class MesEquitmentChannelController extends BaseMesController<MesEquipmentChannel> {
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquitmentVariableCfgController.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.MesEquipmentChannel;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentVariableCfg")
+
+public class MesEquitmentVariableCfgController extends BaseMesController<MesEquipmentVariableCfg> {
+}

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

@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentChannelService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentChannel;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesEquipmentChannelService extends BaseMesService<MesEquipmentChannel> implements IMesEquitmentChannelService {
+
+
+    @Override
+    protected void setPackQueryBean(MesEquipmentChannel bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
+    }
+
+
+    @Override
+    public MesEquipmentChannel insert(MesEquipmentChannel bean) {
+        //插入前构造并校验数据
+        onInsertBean(bean);
+
+        bean = baseRDao.insert(bean);
+        return bean;
+    }
+
+    @Override
+    public MesEquipmentChannel update(MesEquipmentChannel bean) {
+        //插入前构造并校验数据
+        onUpdateBean(bean);
+
+        baseRDao.update(bean);
+        return bean;
+    }
+
+
+    protected void onInsertBean(MesEquipmentChannel item) {
+    /*    // 数据校验
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .build();
+        }*/
+
+    }
+
+    protected void onUpdateBean(MesEquipmentChannel item) {
+     /*   // 数据校验
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
+
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .build();
+        }*/
+    }
+}

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

@@ -1,12 +1,82 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
 public class MesEquipmentService extends BaseMesService<MesEquipment> implements IMesEquitmentService {
+    
+    @Override
+    protected void setPackQueryBean(MesEquipment bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(),"equipmentName",packBean);
+    }
+
+
+    @Override
+    public MesEquipment insert(MesEquipment bean) {
+        //插入前构造并校验数据
+        onInsertBean(bean);
+
+        bean = baseRDao.insert(bean);
+        return bean;
+    }
+
+    @Override
+    public MesEquipment update(MesEquipment bean) {
+        //插入前构造并校验数据
+        onUpdateBean(bean);
+
+        baseRDao.update(bean);
+        return bean;
+    }
+
+
+    protected void onInsertBean(MesEquipment item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesEquipment item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
 
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .build();
+        }
+    }
 }

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

@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentChannelService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquitmentVariableCfgService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentChannel;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesEquipmentVariableCfgService extends BaseMesService<MesEquipmentVariableCfg> implements IMesEquitmentVariableCfgService {
+
+
+    @Override
+    protected void setPackQueryBean(MesEquipmentVariableCfg bean, DdlPackBean packBean) {
+        //DdlPreparedPack.getStringEqualPack(bean.get(),"equipmentCode",packBean);
+    }
+
+
+    @Override
+    public MesEquipmentVariableCfg insert(MesEquipmentVariableCfg bean) {
+        //插入前构造并校验数据
+        onInsertBean(bean);
+
+        bean = baseRDao.insert(bean);
+        return bean;
+    }
+
+    @Override
+    public MesEquipmentVariableCfg update(MesEquipmentVariableCfg bean) {
+        //插入前构造并校验数据
+        onUpdateBean(bean);
+
+        baseRDao.update(bean);
+        return bean;
+    }
+
+
+    protected void onInsertBean(MesEquipmentVariableCfg item) {
+    /*    // 数据校验
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .build();
+        }*/
+
+    }
+
+    protected void onUpdateBean(MesEquipmentVariableCfg item) {
+     /*   // 数据校验
+        ValidatorBean.checkNotNull(item.getEquipmentCode(), "设备代码不能为空");
+
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getEquipmentCode(), "equipmentCode", seriesPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
+
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getEquipmentCode())
+                    .build();
+        }*/
+    }
+}