配置文件修改

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldDownPacketController.java

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-29
+ */
+@RestController
+@RequestMapping("/mould-down-packet")
+public class MouldDownPacketController {
+
+}
+

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldEquipmentController.java

@@ -76,6 +76,7 @@ public class MouldEquipmentController {
      * hotAlarmLimit 热报警限值：（1 字节,十六进制）如：50=80
      * isUse:0-停止，1-启动
      * equipmentNo 设备编号（可能是多个或者一个）多个以“，”隔开传  如："123456"(单个)，"123456,456878,123589"(多个)
+     * workInterval 工作状态时间间隔，freeInterval 空闲状态的时间间隔,threshold 传感器阈值
      */
     @ApiOperation("启用设备")
     @RequestMapping("/use")

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldDownPacket.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-14
+ * @since 2019-10-29
  */
 public class MouldDownPacket extends Model<MouldDownPacket> {
 
@@ -49,6 +49,12 @@ public class MouldDownPacket extends Model<MouldDownPacket> {
     @TableField("is_use")
     private Integer isUse;
 
+    /**
+     * 传感器阈值
+     */
+    @TableField("threshold")
+    private String threshold;
+
 
     public Integer getId() {
         return id;
@@ -90,6 +96,14 @@ public class MouldDownPacket extends Model<MouldDownPacket> {
         this.isUse = isUse;
     }
 
+    public String getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(String threshold) {
+        this.threshold = threshold;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -103,6 +117,7 @@ public class MouldDownPacket extends Model<MouldDownPacket> {
         ", packetStr=" + packetStr +
         ", indate=" + indate +
         ", isUse=" + isUse +
+        ", threshold=" + threshold +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/MouldEquipmentVO.java

@@ -23,6 +23,9 @@ public class MouldEquipmentVO extends MouldEquipment {
     private String alarmDegree;//报警温度
     private Integer lowPowerLimit;//最低电量
     private Integer hotAlarmLimit;//最高温度
+    private Integer workInterval=30;//工作状态上报间隔 30 分钟
+    private Integer freeInterval=120;//空闲状态上报间隔 120分钟
+    private Integer threshold=30;//传感器阈值20~200
     /**
      * 模具编号
      */

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

@@ -82,9 +82,9 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                 //修改设备
                 MouldEquipment mouldEqu = mouldEquipmentMapper.selectById(mouldEquipment.getId());
                 MouldEquipment m = mouldEquipmentMapper.selectOne(new QueryWrapper<MouldEquipment>().eq("equipment_no", mouldEquipment.getEquipmentNo()));
-                if (mouldEqu.getEquipmentNo().equals(mouldEquipment.getEquipmentNo()) || m==null) {
+                if (mouldEqu.getEquipmentNo().equals(mouldEquipment.getEquipmentNo()) || m == null) {
                     mouldEquipmentMapper.updateById(mouldEquipment);
-                } else{
+                } else {
                     msg.setError("当前设备编号已存在，请重新输入其他模具编号");
                 }
             }
@@ -99,14 +99,23 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         HttpRespMsg msg = new HttpRespMsg();
         //16进制的转化
         String lowPowerLimitStr = Integer.toHexString(mouldEquipment.getLowPowerLimit());
-        if(lowPowerLimitStr.length()==1){
-            lowPowerLimitStr = "0"+lowPowerLimitStr;
+        if (lowPowerLimitStr.length() == 1) {
+            lowPowerLimitStr = "0" + lowPowerLimitStr;
+        }
+        String freeInterval = Integer.toHexString(mouldEquipment.getFreeInterval());
+        if (freeInterval.length() == 1) {
+            freeInterval = "0" + freeInterval;
         }
+        String workInterval = Integer.toHexString(mouldEquipment.getWorkInterval());
+        if (workInterval.length() == 1) {
+            workInterval = "0" + workInterval;
+        }
+        String.format("%04d", mouldEquipment.getThreshold());
         String hotAlarmLimitStr = Integer.toHexString(mouldEquipment.getHotAlarmLimit());
-        if(hotAlarmLimitStr.length()==1){
-            hotAlarmLimitStr = "0"+hotAlarmLimitStr;
+        if (hotAlarmLimitStr.length() == 1) {
+            hotAlarmLimitStr = "0" + hotAlarmLimitStr;
         }
-        String isUseStr = "0"+Integer.toHexString(mouldEquipment.getIsUse());
+        String isUseStr = "0" + Integer.toHexString(mouldEquipment.getIsUse());
         //判断是不是超级管理员，是才可操作
         if (user.getParentId() == 0) {
             //修改设备
@@ -116,32 +125,34 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
             for (String str : split) {
                 packet = mouldDownPacketMapper.selectOne(new QueryWrapper<MouldDownPacket>().eq("equipment_no", str));
                 MouldEquipment equipment = new MouldEquipment();
-                if(1 == mouldEquipment.getIsUse()){
+                if (1 == mouldEquipment.getIsUse()) {
                     //启用中
                     equipment.setIsUse(2);
-                }else if(0 == mouldEquipment.getIsUse()){
+                } else if (0 == mouldEquipment.getIsUse()) {
                     //停用中
                     equipment.setIsUse(3);
                 }
                 equipment.setEquipmentNo(mouldEquipment.getEquipmentNo());
-                equipment.setHillNumber(mouldEquipment.getLowPowerLimit()+"");
+                equipment.setHillNumber(mouldEquipment.getLowPowerLimit() + "");
                 equipment.setTemperature(mouldEquipment.getHotAlarmLimit());
-                mouldEquipmentMapper.update(equipment,new QueryWrapper<MouldEquipment>().eq("equipment_no",str));
-                if(packet != null){
+                mouldEquipmentMapper.update(equipment, new QueryWrapper<MouldEquipment>().eq("equipment_no", str));
+                if (packet != null) {
                     //已经存在更新下发数据包
                     MouldDownPacket mouldDownPacket = new MouldDownPacket();
                     mouldDownPacket.setId(packet.getId());
-                    setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);                    mouldDownPacket.setPacketStr(setPacketMessage);
+                    setPacketMessage = downProcessMsg(lowPowerLimitStr, hotAlarmLimitStr, isUseStr, freeInterval, workInterval);
                     mouldDownPacket.setPacketStr(setPacketMessage);
                     mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
                     mouldDownPacket.setEquipmentNo(str);
+                    mouldDownPacket.setThreshold(workInterval);
                     mouldDownPacketMapper.updateById(mouldDownPacket);
-                }else{
+                } else {
                     MouldDownPacket mouldDownPacket = new MouldDownPacket();
-                    setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);                    mouldDownPacket.setPacketStr(setPacketMessage);
+                    setPacketMessage = downProcessMsg(lowPowerLimitStr, hotAlarmLimitStr, isUseStr, freeInterval, workInterval);
                     mouldDownPacket.setPacketStr(setPacketMessage);
                     mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
                     mouldDownPacket.setEquipmentNo(str);
+                    mouldDownPacket.setThreshold(workInterval);
                     mouldDownPacketMapper.insert(mouldDownPacket);
                 }
             }
@@ -438,24 +449,36 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     }
 
     // 下行配置数据包
-    private String downProcessMsg(String lowPowerLimit,String hotAlarmLimit,String isUse) {
+    private String downProcessMsg(String lowPowerLimit, String hotAlarmLimit, String isUse, String freeInterval, String workInterval) {
         //"23"不解析
-        if("23".equals(lowPowerLimit)){
-            lowPowerLimit="24";
+        if ("23".equals(lowPowerLimit)) {
+            lowPowerLimit = "24";
         }
-        if("23".equals(hotAlarmLimit)){
-            hotAlarmLimit="24";
+        if ("23".equals(hotAlarmLimit)) {
+            hotAlarmLimit = "24";
         }
-        if("23".equals(isUse)){
-            isUse="24";
+        if ("23".equals(freeInterval)) {
+            freeInterval = "24";
         }
-        String ret = "FA AF 00 07 "+isUse+" 1e 78 "+lowPowerLimit+" "+hotAlarmLimit+" 00 3C";
-        ret = ret.replaceAll(" ", "");
-        String crcCode = CRC16Util.getCRC(ret);
-        System.out.println("ret===>"+ret);
-        String lastPart = (ret + crcCode).replaceAll("23", "24").replaceAll(" ", "");
-        System.out.println("lastPart===>"+lastPart);
+        if ("23".equals(workInterval)) {
+            workInterval = "24";
+        }
+        if ("23".equals(isUse)) {
+            isUse = "24";
+        }
+        StringBuilder sb = new StringBuilder();
+        //FAAF0007021e781e50003C
+        sb.append("FAAF0007");
+        sb.append(isUse);
+        sb.append(workInterval);
+        sb.append(freeInterval);
+        sb.append(lowPowerLimit);
+        sb.append(hotAlarmLimit);
+        sb.append("003C");
+        String crcCode = CRC16Util.getCRC(sb.toString());
+        System.out.println("ret===>" + sb.toString());
+        String lastPart = (sb.toString() + crcCode).replaceAll("23", "24").replaceAll(" ", "");
+        System.out.println("lastPart===>" + lastPart);
         return lastPart;
     }
-
 }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("injection_molding");
+        strategy.setInclude("mould_down_packet");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/MouldDownPacketMapper.xml

@@ -9,11 +9,12 @@
         <result column="packet_str" property="packetStr" />
         <result column="indate" property="indate" />
         <result column="is_use" property="isUse" />
+        <result column="threshold" property="threshold" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, equipment_no, packet_str, indate, is_use
+        id, equipment_no, packet_str, indate, is_use, threshold
     </sql>
 
 </mapper>