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

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

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

@@ -0,0 +1,108 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-14
+ */
+public class MouldDownPacket extends Model<MouldDownPacket> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 下发数据表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    @TableField("equipment_no")
+    private String equipmentNo;
+
+    /**
+     * 下发的字符串
+     */
+    @TableField("packet_str")
+    private String packetStr;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 是否已下发
+     */
+    @TableField("is_use")
+    private Integer isUse;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getEquipmentNo() {
+        return equipmentNo;
+    }
+
+    public void setEquipmentNo(String equipmentNo) {
+        this.equipmentNo = equipmentNo;
+    }
+
+    public String getPacketStr() {
+        return packetStr;
+    }
+
+    public void setPacketStr(String packetStr) {
+        this.packetStr = packetStr;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public Integer getIsUse() {
+        return isUse;
+    }
+
+    public void setIsUse(Integer isUse) {
+        this.isUse = isUse;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MouldDownPacket{" +
+        "id=" + id +
+        ", equipmentNo=" + equipmentNo +
+        ", packetStr=" + packetStr +
+        ", indate=" + indate +
+        ", isUse=" + isUse +
+        "}";
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldDownPacketMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.MouldDownPacket;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-14
+ */
+public interface MouldDownPacketMapper extends BaseMapper<MouldDownPacket> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.MouldDownPacket;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-14
+ */
+public interface MouldDownPacketService extends IService<MouldDownPacket> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.MouldDownPacket;
+import com.hssx.cloudmodel.mapper.MouldDownPacketMapper;
+import com.hssx.cloudmodel.service.MouldDownPacketService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-14
+ */
+@Service
+public class MouldDownPacketServiceImpl extends ServiceImpl<MouldDownPacketMapper, MouldDownPacket> implements MouldDownPacketService {
+
+}

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

@@ -119,15 +119,13 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                     //已经存在更新下发数据包
                     MouldDownPacket mouldDownPacket = new MouldDownPacket();
                     mouldDownPacket.setId(packet.getId());
-                    setPacketMessage = downProcessMsg(mouldEquipment.getLowPowerLimit()+"",mouldEquipment.getHotAlarmLimit()+"",isUseStr);
-                    mouldDownPacket.setPacketStr(setPacketMessage);
+                    setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);                    mouldDownPacket.setPacketStr(setPacketMessage);
                     mouldDownPacket.setPacketStr(setPacketMessage);
                     mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
                     mouldDownPacketMapper.updateById(mouldDownPacket);
                 }else{
                     MouldDownPacket mouldDownPacket = new MouldDownPacket();
-                    setPacketMessage = downProcessMsg(mouldEquipment.getLowPowerLimit()+"",mouldEquipment.getHotAlarmLimit()+"",isUseStr);
-                    mouldDownPacket.setPacketStr(setPacketMessage);
+                    setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);                    mouldDownPacket.setPacketStr(setPacketMessage);
                     mouldDownPacket.setPacketStr(setPacketMessage);
                     mouldDownPacket.setIsUse(mouldEquipment.getIsUse());
                     mouldDownPacketMapper.insert(mouldDownPacket);

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.MouldDownPacketMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.MouldDownPacket">
+        <id column="id" property="id" />
+        <result column="equipment_no" property="equipmentNo" />
+        <result column="packet_str" property="packetStr" />
+        <result column="indate" property="indate" />
+        <result column="is_use" property="isUse" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_no, packet_str, indate, is_use
+    </sql>
+
+</mapper>

cloud-socket/src/com/js/kbt/controller/WeiXinUserInfoController.java

@@ -257,100 +257,84 @@ public class WeiXinUserInfoController {
 		return result;
 	}
 	
-	/**
-	 * 云平台下行配置数据包接口
-	 * lowPowerLimit 低电量报警限值：（1 字节,十六进制）如：1e=31
-	 * hotAlarmLimit 热报警限值：（1 字节,十六进制）如：50=80
-	 * isUse:0-停止，1-启动
-	 * equipmentNo 设备编号（可能是多个或者一个）多个以“，”隔开传  如："123456"(单个)，"123456,456878,123589"(多个)
-	 */
-	@RequestMapping(value = "/userInfo", method = {RequestMethod.POST,RequestMethod.GET})
-	public void bindAccount(HttpServletResponse response,Integer isUse,Integer lowPowerLimit,Integer hotAlarmLimit,String equipmentNo) {
-		HttpRespMsg msg = new HttpRespMsg();
-		//16进制的转化
-		String lowPowerLimitStr = Integer.toHexString(lowPowerLimit);
-		String hotAlarmLimitStr = Integer.toHexString(hotAlarmLimit);
-		String isUseStr = "0"+Integer.toHexString(isUse);
-		System.out.println("lowPowerLimit"+lowPowerLimit+"hotAlarmLimit"+hotAlarmLimit);
-		String setPacketMessage = "";
-		MouldDownPacket mouldDownPacket = new MouldDownPacket();
-		MouldDownPacketExample exp = new MouldDownPacketExample();
-		TbMouldEquipmentExample tExp = new TbMouldEquipmentExample();
-		String[] split = equipmentNo.split(",");
-		for (String string : split) {
-			System.out.println("进来了"+string);
-			exp.createCriteria().andEquipmentNoEqualTo(string);
-			tExp.createCriteria().andEquipmentNoEqualTo(string);
-			TbMouldEquipment equipment = tbMouldEquipmentMapper.selectByExample(tExp).get(0);
-			equipment.setIsUse(isUse);
-			equipment.setHillNumber(lowPowerLimit+"");
-			equipment.setTemperature(hotAlarmLimit);
-			//更新云模盒的报警温度和电量
-			tbMouldEquipmentMapper.updateByPrimaryKey(equipment);
-			List<MouldDownPacket> list = mouldDownPacketMapper.selectByExample(exp);
-			if(list.size()>0){
-				mouldDownPacket = list.get(0);
-				setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);
-				mouldDownPacket.setPacketStr(setPacketMessage);
-				mouldDownPacket.setIsUse(isUse);
-				mouldDownPacketMapper.updateByPrimaryKey(mouldDownPacket);
-			}else{
-				setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);
-				mouldDownPacket.setEquipmentNo(equipmentNo);
-				mouldDownPacket.setPacketStr(setPacketMessage);
-				mouldDownPacket.setIsUse(isUse);
-				mouldDownPacketMapper.insertSelective(mouldDownPacket);
-			}
-			exp.clear();
-			tExp.clear();
-		}
-		msg.data = setPacketMessage;
-		response.setContentType("application/json");
-		response.setCharacterEncoding("UTF-8");
-		try {
-			response.getWriter().println(msg.toJSONStr());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
+//	/**
+//	 * 云平台下行配置数据包接口
+//	 * lowPowerLimit 低电量报警限值：（1 字节,十六进制）如：1e=31
+//	 * hotAlarmLimit 热报警限值：（1 字节,十六进制）如：50=80
+//	 * isUse:0-停止，1-启动
+//	 * equipmentNo 设备编号（可能是多个或者一个）多个以“，”隔开传  如："123456"(单个)，"123456,456878,123589"(多个)
+//	 */
+//	@RequestMapping(value = "/userInfo", method = {RequestMethod.POST,RequestMethod.GET})
+//	public void bindAccount(HttpServletResponse response,Integer isUse,Integer lowPowerLimit,Integer hotAlarmLimit,String equipmentNo) {
+//		HttpRespMsg msg = new HttpRespMsg();
+//		//16进制的转化
+//		String lowPowerLimitStr = Integer.toHexString(lowPowerLimit);
+//		String hotAlarmLimitStr = Integer.toHexString(hotAlarmLimit);
+//		String isUseStr = "0"+Integer.toHexString(isUse);
+//		System.out.println("lowPowerLimit"+lowPowerLimit+"hotAlarmLimit"+hotAlarmLimit);
+//		String setPacketMessage = "";
+//		MouldDownPacket mouldDownPacket = new MouldDownPacket();
+//		MouldDownPacketExample exp = new MouldDownPacketExample();
+//		TbMouldEquipmentExample tExp = new TbMouldEquipmentExample();
+//		String[] split = equipmentNo.split(",");
+//		for (String string : split) {
+//			System.out.println("进来了"+string);
+//			exp.createCriteria().andEquipmentNoEqualTo(string);
+//			tExp.createCriteria().andEquipmentNoEqualTo(string);
+//			TbMouldEquipment equipment = tbMouldEquipmentMapper.selectByExample(tExp).get(0);
+//			equipment.setIsUse(isUse);
+//			equipment.setHillNumber(lowPowerLimit+"");
+//			equipment.setTemperature(hotAlarmLimit);
+//			//更新云模盒的报警温度和电量
+//			tbMouldEquipmentMapper.updateByPrimaryKey(equipment);
+//			List<MouldDownPacket> list = mouldDownPacketMapper.selectByExample(exp);
+//			if(list.size()>0){
+//				mouldDownPacket = list.get(0);
+//				setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);
+//				mouldDownPacket.setPacketStr(setPacketMessage);
+//				mouldDownPacket.setIsUse(isUse);
+//				mouldDownPacketMapper.updateByPrimaryKey(mouldDownPacket);
+//			}else{
+//				setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr,isUseStr);
+//				mouldDownPacket.setEquipmentNo(equipmentNo);
+//				mouldDownPacket.setPacketStr(setPacketMessage);
+//				mouldDownPacket.setIsUse(isUse);
+//				mouldDownPacketMapper.insertSelective(mouldDownPacket);
+//			}
+//			exp.clear();
+//			tExp.clear();
+//		}
+//		msg.data = setPacketMessage;
+//		response.setContentType("application/json");
+//		response.setCharacterEncoding("UTF-8");
+//		try {
+//			response.getWriter().println(msg.toJSONStr());
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
+//	}
 	
-	// 下行配置数据包
-		private String downProcessMsg(String lowPowerLimit,String hotAlarmLimit,String isUse) {
-			//"23"不解析
-			if("23".equals(lowPowerLimit)){
-				lowPowerLimit="24";
-			}
-			if("23".equals(hotAlarmLimit)){
-				hotAlarmLimit="24";
-			}
-			if("23".equals(isUse)){
-				isUse="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);
-			return lastPart;
-		}
-		
-		/**
-		 * 低位在前的16进制解析
-		 * 
-		 * @param rHex
-		 * @return
-		 */
-		public static int reverseParseHex(String rHex) {
-			int size = rHex.length() / 2;
-			StringBuilder sb = new StringBuilder();
-			for (int i = 0; i < size; i++) {
-				sb.append(rHex.substring((size - i - 1) * 2, (size - i) * 2));
-			}
-			String str = sb.toString();
-			System.out.println("str"+str);
-			return Integer.parseInt(str, 16);
-		}
+//	// 下行配置数据包
+//		private String downProcessMsg(String lowPowerLimit,String hotAlarmLimit,String isUse) {
+//			//"23"不解析
+//			if("23".equals(lowPowerLimit)){
+//				lowPowerLimit="24";
+//			}
+//			if("23".equals(hotAlarmLimit)){
+//				hotAlarmLimit="24";
+//			}
+//			if("23".equals(isUse)){
+//				isUse="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);
+//			return lastPart;
+//		}
+//		
 		
 //		public static byte[] strToByte(String data) {
 //	        data = data.replace(" ", "");