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/MouldEquipment.java

@@ -74,7 +74,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Integer isUse;
 
     /**
-     * 电量
+     * 告警电量（默认30%）
      */
     @TableField("hill_number")
     private String hillNumber;
@@ -92,7 +92,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Double lat;
 
     /**
-     * 模盒内温度
+     * 告警模盒温度（默认80度）
      */
     @TableField("temperature")
     private Integer temperature;

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

@@ -19,6 +19,8 @@ public class MouldEquipmentVO extends MouldEquipment {
     private String planType;//计划类型
     private String name;
     private Integer mouldId;//模具id
+    private String alarmBattery;//报警电量
+    private String alarmDegree;//报警温度
     /**
      * 模具编号
      */

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

@@ -42,6 +42,8 @@
         <result column="modelName" property="modelName" />
         <result column="stage" property="stage" />
         <result column="sim" property="sim" />
+        <result column="alarmBattery" property="alarmBattery" />
+        <result column="alarmDegree" property="alarmDegree" />
     </resultMap>
 
     <select id="getListByCompanyId" resultMap="BaseResultMapVO">
@@ -71,7 +73,7 @@
         tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,tbme.sim sim,
         tbme.is_use, (SELECT battery  FROM `mould_history` WHERE tbme.equipment_no = equipment_no ORDER BY indate DESC LIMIT 1) hill_number,
         (SELECT temperature  FROM `mould_history` WHERE equipment_no = tbme.equipment_no ORDER BY indate DESC LIMIT 1) temperature,tbc.company_name companyName,
-        tbm.model_no modelNo,
+        tbm.model_no modelNo,tbme.temperature alarmDegree,tbme.hill_number alarmBattery,
         tbm.model_name modelName,tbme.stage
         from
         tb_mould_equipment tbme

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

@@ -89,6 +89,8 @@
         tbp.manager mangerName,tbco.company_address area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times,
         tbmp.lng,tbmp.lat,tbmp.stage,(SELECT open_time FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY indate DESC LIMIT 1) lastopentime
+        ,(SELECT battery  FROM `mould_history` WHERE equipmentNo = equipment_no ORDER BY indate DESC LIMIT 1) hill_number,
+        (SELECT temperature  FROM `mould_history` WHERE equipment_no = equipmentNo ORDER BY indate DESC LIMIT 1) temperature
         from
         tb_mould tbm
         left join
@@ -132,9 +134,11 @@
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbp.manager_id managerId,tbm.equipment_id equipment_id,is_maintain,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.holes,tbm.pre_update_id,tbco.company_name produceCompany,
-        tbp.manager mangerName,tbco.company_address area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbm.creator_id creator_id,
+        tbp.manager mangerName,tbco.company_address area,tbm.oc_cycle oc_cycle,tbm.creator_id creator_id,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times,
-        tbmp.lng,tbmp.lat,tbmp.stage,(SELECT open_time FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY indate DESC LIMIT 1) lastopentime
+        tbmp.lng,tbmp.lat,tbmp.stage,(SELECT open_time FROM `mould_history_time` WHERE equipment_no=equipmentNo ORDER BY indate DESC LIMIT 1) lastopentime,
+        (SELECT battery  FROM `mould_history` WHERE equipmentNo = equipment_no ORDER BY indate DESC LIMIT 1) hill_number,
+        (SELECT temperature  FROM `mould_history` WHERE equipment_no = equipmentNo ORDER BY indate DESC LIMIT 1) temperature
         from
         tb_mould tbm
         left join
@@ -181,7 +185,8 @@
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,tbp.manager_id managerId,tbm.produce_company_id produce_company_id,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbco.company_name produceCompany,tbm.creator_id creator_id,tbm.holes,
         tbp.manager mangerName,tbco.company_address area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,tbc.company_name companyName,tbm.pre_update_id,
-        tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life,tbm.run_times run_times,tbmp.stage
+        tbmp.equipment_no equipmentNo,(SELECT battery  FROM `mould_history` WHERE tbmp.equipment_no = equipment_no ORDER BY indate DESC LIMIT 1) hill_number,
+        (SELECT temperature  FROM `mould_history` WHERE equipment_no = tbmp.equipment_no ORDER BY indate DESC LIMIT 1) temperature,tbm.setting_life setting_life,tbm.run_times run_times,tbmp.stage
         from
         tb_mould tbm
         left join
@@ -207,7 +212,7 @@
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbm.creator_id creator_id,tbm.equipment_id equipment_id,tbm.is_maintain,tbm.holes,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.pre_update_id,tbm.company_id,tbco.company_name produce_company_name,tbm.produce_company_id,
-        tbp.manager mangerName,tbco.company_address area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
+        tbp.manager mangerName,tbco.company_address area,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times,
         tbmp.lng,tbmp.lat,tbmp.stage
         from

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

@@ -21,9 +21,12 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.alibaba.fastjson.JSONObject;
 import com.js.kbt.mapper.MouldDownPacketMapper;
+import com.js.kbt.mapper.TbMouldEquipmentMapper;
 import com.js.kbt.mapper.TbUserMapper;
 import com.js.kbt.model.MouldDownPacket;
 import com.js.kbt.model.MouldDownPacketExample;
+import com.js.kbt.model.TbMouldEquipment;
+import com.js.kbt.model.TbMouldEquipmentExample;
 import com.js.kbt.model.TbUser;
 import com.js.kbt.model.TbUserExample;
 import com.js.kbt.util.CRC16Util;
@@ -46,6 +49,8 @@ public class WeiXinUserInfoController {
 	private TbUserMapper tbUserMapper;
 	@Resource(name = "mouldDownPacketMapper")
 	private MouldDownPacketMapper mouldDownPacketMapper;
+	@Resource
+	private TbMouldEquipmentMapper tbMouldEquipmentMapper;
 
 //	@Autowired
 //	private WeiXinPlatformService weiXinPlatformService;
@@ -253,34 +258,44 @@ public class WeiXinUserInfoController {
 	
 	/**
 	 * 云平台下行配置数据包接口
-	 * lowPowerLimit 低电量报警限值：（1 字节,十六进制）如：1e
-	 * hotAlarmLimit 热报警限值：（1 字节,十六进制）如：50
+	 * lowPowerLimit 低电量报警限值：（1 字节,十六进制）如：1e=31
+	 * hotAlarmLimit 热报警限值：（1 字节,十六进制）如：50=80
 	 * equipmentNo 设备编号（可能是多个或者一个）多个以“，”隔开传  如："123456"(单个)，"123456,456878,123589"(多个)
 	 */
 	@RequestMapping("/setPacket")
-	public void bindAccount(HttpServletResponse response,String lowPowerLimit,String hotAlarmLimit,String equipmentNo) {
+	public void bindAccount(HttpServletResponse response,Integer lowPowerLimit,Integer hotAlarmLimit,String equipmentNo) {
 		HttpRespMsg msg = new HttpRespMsg();
+		//16进制的转化
+		String lowPowerLimitStr = Integer.toHexString(lowPowerLimit);
+		String hotAlarmLimitStr = Integer.toHexString(hotAlarmLimit);
 		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) {
 			exp.createCriteria().andEquipmentNoEqualTo(string);
+			tExp.createCriteria().andEquipmentNoEqualTo(string);
+			TbMouldEquipment equipment = new TbMouldEquipment();
+			equipment.setHillNumber(lowPowerLimit+"%");
+			equipment.setTemperature(hotAlarmLimit);
+			//更新云模盒的报警温度和电量
+			tbMouldEquipmentMapper.updateByExampleSelective(equipment, tExp);
 			List<MouldDownPacket> list = mouldDownPacketMapper.selectByExample(exp);
 			if(list.size()>0){
 				mouldDownPacket = list.get(0);
-				setPacketMessage = downProcessMsg(lowPowerLimit,hotAlarmLimit);
+				setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr);
 				mouldDownPacket.setPacketStr(setPacketMessage);
 				mouldDownPacket.setIsUse(0);
 				mouldDownPacketMapper.updateByPrimaryKey(mouldDownPacket);
-				
 			}else{
-				setPacketMessage = downProcessMsg(lowPowerLimit,hotAlarmLimit);
+				setPacketMessage = downProcessMsg(lowPowerLimitStr,hotAlarmLimitStr);
 				mouldDownPacket.setEquipmentNo(equipmentNo);
 				mouldDownPacket.setPacketStr(setPacketMessage);
 				mouldDownPacketMapper.insertSelective(mouldDownPacket);
 			}
+			exp.clear();
 		}
 		msg.data = setPacketMessage;
 		response.setContentType("application/json");

target/classes/main/resources/mapper/MouldEquipmentMapper.xml

@@ -42,6 +42,8 @@
         <result column="modelName" property="modelName" />
         <result column="stage" property="stage" />
         <result column="sim" property="sim" />
+        <result column="alarmBattery" property="alarmBattery" />
+        <result column="alarmDegree" property="alarmDegree" />
     </resultMap>
 
     <select id="getListByCompanyId" resultMap="BaseResultMapVO">
@@ -71,7 +73,7 @@
         tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,tbme.sim sim,
         tbme.is_use, (SELECT battery  FROM `mould_history` WHERE tbme.equipment_no = equipment_no ORDER BY indate DESC LIMIT 1) hill_number,
         (SELECT temperature  FROM `mould_history` WHERE equipment_no = tbme.equipment_no ORDER BY indate DESC LIMIT 1) temperature,tbc.company_name companyName,
-        tbm.model_no modelNo,
+        tbm.model_no modelNo,tbme.temperature alarmDegree,tbme.hill_number alarmBattery,
         tbm.model_name modelName,tbme.stage
         from
         tb_mould_equipment tbme