Merge remote-tracking branch 'origin/dev' into dev

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

@@ -10,8 +10,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentChannel;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
 import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentChannelRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -42,6 +44,9 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     private MesEquipmentRepository equipmentRepository;
 
     @Autowired
+    private MesEquipmentChannelRepository equipmentChannelRepository;
+
+    @Autowired
     private ISyncFuncService syncFuncService;
 
     protected void setPackQueryBean(MesEquipmentVariable bean, DdlPackBean packBean) {
@@ -52,6 +57,8 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     @Override
     protected void onInsertBean(MesEquipmentVariable item) {
         item.setClientHandle(Integer.parseInt(getClientHandleId(1, item.getOrganizeCode(), item.getCreateUser()).get(0).replace(MesCommonConstant.CLIENT_HANDLE_ID,"")));
+        MesEquipment mesEquipment = getMesEquipment(item.getOrganizeCode(),item.getEquipmentCode());
+        item.setEquipId(mesEquipment.getEquipId());
     }
 
     @Override
@@ -76,18 +83,24 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     @Override
     public void addMesEquipmentVariable(List<Map<String, Object>> mapList,String equipmentCode, String userName, String organizeCode) {
         MesEquipment mesEquipment = getMesEquipment(organizeCode,equipmentCode);
+        MesEquipmentChannel mesEquipmentChannel = getMesEquipmentChannel(organizeCode,equipmentCode);
+
         List<MesEquipmentVariable> mesEquipmentVariables = new ArrayList<>();
         for (Map<String, Object> objectMap : mapList) {
             List<Object> objects = Arrays.asList(objectMap.values().toArray());
             try {
                 MesEquipmentVariable mesEquipmentVariable = new MesEquipmentVariable();
                 mesEquipmentVariable.setEquipId(mesEquipment.getEquipId());
+                mesEquipmentVariable.setChannel(mesEquipmentChannel.getChannel());
                 mesEquipmentVariable.setEquipmentCode(mesEquipment.getEquipmentCode());
                 mesEquipmentVariable.setTagName(String.valueOf(objects.get(0)));
                 mesEquipmentVariable.setTagAddress(String.valueOf(objects.get(1)));
                 mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objects.get(2))));
                 mesEquipmentVariable.setVariableType(Integer.parseInt(objects.get(3) + ""));
                 mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.descriptionOfValue(String.valueOf(objects.get(4))));
+                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5))));
+                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5))));
+                mesEquipmentVariable.setDescription(String.valueOf(objects.get(15)));
                 mesEquipmentVariable.setOrganizeCode(organizeCode);
                 ConvertBean.serviceModelInitialize(mesEquipmentVariable, userName);
                 mesEquipmentVariables.add(mesEquipmentVariable);
@@ -137,5 +150,13 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
         }
         return mesEquipment;
     }
-
+    private MesEquipmentChannel getMesEquipmentChannel(String organizeCode,String equipmentCode) {
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(equipmentCode, "equipmentCode", seriesPackBean);
+        MesEquipmentChannel mesEquipmentChannel = equipmentChannelRepository.getByProperty(seriesPackBean);
+        if(Objects.isNull(mesEquipmentChannel)){
+            MesException.throwMesBusiException("设备通道信息【%s】信息不存在",equipmentCode);
+        }
+        return mesEquipmentChannel;
+    }
 }