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/controller/MouldEquipmentController.java

@@ -37,7 +37,7 @@ public class MouldEquipmentController {
     private UserService userService;
     /**
      * 添加/修改模具设备
-     * 添加参数：equipmentName 设备名称，useLife 使用年限， equipmentNo 设备编号 ，agent 代理商
+     * 添加参数：equipmentName 设备名称（产品编号），useLife 使用年限， equipmentNo 设备编号 ，agent 代理商
      * 修改时需多传的参数 id 设备id， belongCompanyId 所属公司id ，equipmentName 设备名称，agent 代理商
      * @return
      */

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

@@ -30,7 +30,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Integer id;
 
     /**
-     * 设备名称
+     * 设备名称（产品编号）
      */
     @TableField("equipment_name")
     private String equipmentName;

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

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hssx.cloudmodel.entity.Mould;
 import lombok.Data;
@@ -31,4 +32,5 @@ public class MouldVO extends Mould {
     private Double lng;
     private Double lat;
     private Integer stage;
+    private String equipmentName;
 }

cloud-model/src/main/java/com/hssx/cloudmodel/test/A.java

@@ -0,0 +1,14 @@
+package com.hssx.cloudmodel.test;
+
+interface A { //定义一个接口
+    //全局常量
+    String MESSAGE = "HelloWorld";
+
+    void print(); //定义抽象方法
+
+    default void otherprint() { //定义可以带方法体的默认方法
+
+        System.out.println("默认方法");
+
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/test/AsClass.java

@@ -0,0 +1,13 @@
+package com.hssx.cloudmodel.test;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 15 11:36
+ * Description:<描述>
+ * Version: 1.0
+ */
+public abstract class AsClass {
+    private String name;
+    private String password;
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/test/B.java

@@ -0,0 +1,19 @@
+package com.hssx.cloudmodel.test;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 15 11:35
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class B implements A {
+    @Override
+    public void print() {
+
+    }
+
+    @Override
+    public void otherprint() {
+
+    }
+}

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

@@ -75,6 +75,7 @@
         <result column="holes" property="holes" />
         <result column="lng" property="lng" />
         <result column="lat" property="lat" />
+        <result column="equipmentName" property="equipmentName" />
         <result column="pre_update_id" property="preUpdateId" />
     </resultMap>
 
@@ -86,7 +87,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,tbco.company_name produceCompany,tbm.pre_update_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,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,tbmp.equipment_name equipmentName,
         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,
@@ -134,7 +135,7 @@
         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,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_name equipmentName,
         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,
@@ -184,7 +185,7 @@
         tbm.project_id project_id, tbm.setting_life setting_life,tbm.equipment_id equipment_id,tbm.maintain_count maintain_count,is_maintain,
         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,
+        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_name equipmentName,
         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

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

@@ -245,16 +245,16 @@
         <result column="company_name" property="companyName" />
         <result column="powerString" property="powerString" />
         <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"
-                    select="queryPowerByUserIdAndProject" column="{userId = user_id,projectId = project_id}">
-        </collection>
-    </resultMap>
+                    select="queryPowerByUserIdAndProject" column="{userId = user_id,projectId =
     <resultMap id="BasePower" type="com.hssx.cloudmodel.entity.Power">
         <result column="power_type" property="powerType" />
         <result column="user_id" property="userId" />
         <result column="project_id" property="projectId" />
     </resultMap>
 
-    <select id="selectUserPowerList" resultMap="BaseResultMapPower">
+project_id}">
+        </collection>
+    </resultMap>    <select id="selectUserPowerList" resultMap="BaseResultMapPower">
         SELECT
         tbpu.user_id user_id,tbpu.project_id project_id,tbu.username username,tbc.company_name,
         tbp.project_name

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

@@ -100,7 +100,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			MouldDownPacket packet = packetList.get(0);
 			logger.info("开始下发数据包==>" + packet.getPacketStr());
 			sendMsg(packet.getPacketStr());
-			//下发完就将数据删除(防止后续数据过大造成性能的影响)
+			// 下发完就将数据删除(防止后续数据过大造成性能的影响)
 			mouldDownPacketMapper.deleteByPrimaryKey(packet.getId());
 			logger.info("判断是否开启或关闭已结束==>");
 		}
@@ -152,6 +152,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		item.setCrcCode("" + reverseParseHex(crcStr));
 		// 存入数据库
 		mouldHistoryMapper.insertSelective(item);
+		logger.info("添加数据完成了-----------》: " + item);
 		// 模具开合记录
 		int cnt = item.getRunCnt();
 		int start = 69;
@@ -176,7 +177,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 				int timeCost = (int) (openTime.getTime() - closeTime.getTime());
 				time.setTimeCost(timeCost);
 				mouldHistoryTimeMapper.insertSelective(time);
-				logger.info("mouldHistory数据添加完毕");
+				logger.info("mouldHistoryTime数据添加完毕");
 			}
 		} else {
 			logger.info("本次开合模次数==0");
@@ -227,7 +228,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 
 	public void timeCalibration() {
 		List<TimeCalibrationRecord> count = timeCalibrationRecordMapper.selectCountByToday();
-		if (count.size()==0) {
+		if (count.size() == 0) {
 			Date date = new Date();
 			SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd,HH:mm:ss");
 			String dateStr = sdf.format(date);
@@ -249,15 +250,31 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		meqExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
 		if (tbMouldEquipmentMapper.countByExample(meqExp) > 0) {
 			TbMouldEquipment me = tbMouldEquipmentMapper.selectByExample(meqExp).get(0);
-			me.setHillNumber(item.getBattery() + "%");
+			me.setHillNumber(item.getBattery() + "");
 			if (item.getLng() != null) {
 				me.setLng(Double.parseDouble(item.getLng()));
 				me.setLat(Double.parseDouble(item.getLat()));
 			}
 
 			me.setTemperature(item.getTemperature());
-			tbMouldEquipmentMapper.updateByPrimaryKeySelective(me);
+			if (item.getAlarm() == 8) {
+				me.setStage(3);//安装被拆
+			}else if(item.getAlarm() == 1){
+				me.setStage(2);// 低电量
+			}else if(item.getAlarm() == 2){
+				me.setStage(1);//高温
+			}else{
+				me.setStage(item.getAlarm());
+			}
+			// 处理报警
+			if (item.getAlarm() > 0) {
+				/**
+				 * 无报警 0； 低电量报警 1； 温度过热 2； 安装被拆 8。
+				 */
+				logger.info("设备报警啦:" + item.getAlarm());
 
+			}
+			tbMouldEquipmentMapper.updateByPrimaryKeySelective(me);
 			TbMouldExample tExp = new TbMouldExample();
 			tExp.setOrderByClause("id desc limit 1");
 			tExp.createCriteria().andEquipmentIdEqualTo(me.getId());
@@ -270,14 +287,6 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 				BigDecimal bd = new BigDecimal(avgTime * 1.00 / 1000);
 				tm.setOcCycle(bd);
 				tbMouldMapper.updateByPrimaryKeySelective(tm);
-
-				// 处理报警
-				if (item.getAlarm() > 0) {
-					/**
-					 * 无报警 0； 低电量报警 1； 温度过热 2； 安装被拆 8。
-					 */
-					logger.info("设备报警啦:" + item.getAlarm());
-				}
 			}
 		}
 	}

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

@@ -245,16 +245,16 @@
         <result column="company_name" property="companyName" />
         <result column="powerString" property="powerString" />
         <collection property="powers" javaType="java.util.List" ofType="com.hssx.cloudmodel.entity.Power"
-                    select="queryPowerByUserIdAndProject" column="{userId = user_id,projectId = project_id}">
-        </collection>
-    </resultMap>
+                    select="queryPowerByUserIdAndProject" column="{userId = user_id,projectId =
     <resultMap id="BasePower" type="com.hssx.cloudmodel.entity.Power">
         <result column="power_type" property="powerType" />
         <result column="user_id" property="userId" />
         <result column="project_id" property="projectId" />
     </resultMap>
 
-    <select id="selectUserPowerList" resultMap="BaseResultMapPower">
+project_id}">
+        </collection>
+    </resultMap>    <select id="selectUserPowerList" resultMap="BaseResultMapPower">
         SELECT
         tbpu.user_id user_id,tbpu.project_id project_id,tbu.username username,tbc.company_name,
         tbp.project_name