Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -105,20 +105,20 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
             lowPowerLimitStr = "0" + lowPowerLimitStr;
         }
         String workInterval = Integer.toHexString(mouldEquipment.getWorkInterval());
-            if (workInterval.length() == 1) {
-                workInterval = "0" + workInterval;
-            }
-            String freeInterval = Integer.toHexString(mouldEquipment.getFreeInterval());
-            if (freeInterval.length() == 1) {
-                freeInterval = "0" + freeInterval;
-            }
+        if (workInterval.length() == 1) {
+            workInterval = "0" + workInterval;
+        }
+        String freeInterval = Integer.toHexString(mouldEquipment.getFreeInterval());
+        if (freeInterval.length() == 1) {
+            freeInterval = "0" + freeInterval;
+        }
         String hotAlarmLimitStr = Integer.toHexString(mouldEquipment.getHotAlarmLimit());
         if (hotAlarmLimitStr.length() == 1) {
             hotAlarmLimitStr = "0" + hotAlarmLimitStr;
         }
         String isUseStr = "0" + Integer.toHexString(mouldEquipment.getIsUse());
-        String threshold="";
-        if(null != mouldEquipment.getThreshold()) {
+        String threshold = "";
+        if (null != mouldEquipment.getThreshold()) {
             threshold = String.format("%04d", Integer.parseInt(mouldEquipment.getThreshold()));
         }
         //判断是不是超级管理员，是才可操作
@@ -142,22 +142,24 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                 equipment.setTemperature(mouldEquipment.getHotAlarmLimit());
                 mouldEquipmentMapper.update(equipment, new QueryWrapper<MouldEquipment>().eq("equipment_no", str));
                 MouldDownPacket mouldDownPacket = new MouldDownPacket();
-                if(!threshold.equals("")) {
+                if (!threshold.equals("")) {
                     mouldDownPacket.setThreshold(threshold);
                 }
+                mouldDownPacket.setId(packet.getId());
+                if (0 == mouldEquipment.getIsUse()) {
+                    setPacketMessage = "FAAF0007001e781e50003C";//停用
+                    String crcCode = CRC16Util.getCRC(setPacketMessage);
+                    setPacketMessage = setPacketMessage + crcCode;
+                } else {
+                    setPacketMessage = downProcessMsg(lowPowerLimitStr, hotAlarmLimitStr, isUseStr, freeInterval, workInterval);
+                }
+                mouldDownPacket.setPacketStr(setPacketMessage);
+                mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
+                mouldDownPacket.setEquipmentNo(str);
                 if (packet != null) {
                     //已经存在更新下发数据包
-                    mouldDownPacket.setId(packet.getId());
-                    setPacketMessage = downProcessMsg(lowPowerLimitStr, hotAlarmLimitStr, isUseStr, freeInterval, workInterval);
-                    mouldDownPacket.setPacketStr(setPacketMessage);
-                    mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
-                    mouldDownPacket.setEquipmentNo(str);
                     mouldDownPacketMapper.updateById(mouldDownPacket);
                 } else {
-                    setPacketMessage = downProcessMsg(lowPowerLimitStr, hotAlarmLimitStr, isUseStr, freeInterval, workInterval);
-                    mouldDownPacket.setPacketStr(setPacketMessage);
-                    mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
-                    mouldDownPacket.setEquipmentNo(str);
                     mouldDownPacketMapper.insert(mouldDownPacket);
                 }
             }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldHistoryServiceImpl.java

@@ -1,15 +1,10 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.MouldCycleRuntime;
-import com.hssx.cloudmodel.entity.MouldHistory;
-import com.hssx.cloudmodel.entity.MouldHistoryTime;
+import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.MouldHistoryTimeVO;
 import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
-import com.hssx.cloudmodel.mapper.MouldCycleRuntimeMapper;
-import com.hssx.cloudmodel.mapper.MouldHistoryMapper;
-import com.hssx.cloudmodel.mapper.MouldHistoryTimeMapper;
-import com.hssx.cloudmodel.mapper.MouldMapper;
+import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.MouldHistoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -38,6 +33,10 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
     private MouldCycleRuntimeMapper mouldCycleRuntimeMapper;
     @Resource
     private MouldMapper mouldMapper;
+    @Resource
+    private MouldEquipmentMapper mouldEquipmentMapper;
+    @Resource
+    private InjectionMoldingMapper injectionMoldingMapper;
     @Override
     public HttpRespMsg getOpeningAndClosingTimesChart(String equipmentNo, String time) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -136,6 +135,9 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
     @Override
     public HttpRespMsg openingAndClosingTimesChartCycle(String equipmentNo,String time) {
         HttpRespMsg msg = new HttpRespMsg();
+        MouldEquipment mouldEquipment = mouldEquipmentMapper.selectOne(new QueryWrapper<MouldEquipment>().eq("equipment_no", equipmentNo));
+        Mould mould = mouldMapper.selectOne(new QueryWrapper<Mould>().eq("equipment_id", mouldEquipment.getId()));
+        InjectionMolding molding = injectionMoldingMapper.selectOne(new QueryWrapper<InjectionMolding>().eq("mould_id", mould.getId()));
         Map<String,MouldHistoryTimeVO> map = TimeAndCountUtil.getMap();
         List<MouldHistoryVO> list = mouldHistoryTimeMapper.getOpeningAndClosingTimesChartCycle(time,equipmentNo);
         Integer count = 0;
@@ -146,7 +148,7 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
             vo.setMinCycle(entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
             vo.setMaxCycle(entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt());
             vo.setAvgCycle((int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
-            vo.setTheoryCycle(40000);
+            vo.setTheoryCycle(molding.getCycle()==null?4000:molding.getCycle());
             if("00".equals(entry.getKey())){
                 map.put("00:00-01:00",vo);
             }else if("01".equals(entry.getKey())){

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -294,7 +294,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			sendMsg(packet.getPacketStr());
 			if(null != packet.getThreshold()){
 				//下发阈值命令
-				sendMsg("#LIMIT VALUE="+packet.getThreshold());
+				sendMsg(strHexStr16("#LIMIT VALUE="+packet.getThreshold()));
 			}
 			if (count > 0) {
 				TbMouldEquipment me = tbMouldEquipmentMapper.selectByExample(meqExp).get(0);