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

# Conflicts:
#	website/src/main/resources/templates/index.html

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-10
+ * @since 2019-10-28
  */
 @TableName("tb_mould_equipment")
 public class MouldEquipment extends Model<MouldEquipment> {
@@ -39,14 +37,12 @@ public class MouldEquipment extends Model<MouldEquipment> {
      * 启动时间
      */
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**
@@ -74,7 +70,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Integer isUse;
 
     /**
-     * 告警电量（默认30%）
+     * 告警电量
      */
     @TableField("hill_number")
     private String hillNumber;
@@ -92,7 +88,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Double lat;
 
     /**
-     * 告警模盒温度（默认80度）
+     * 告警模盒温度
      */
     @TableField("temperature")
     private Integer temperature;
@@ -104,7 +100,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private String agent;
 
     /**
-     * 状态,0-正常，1-温度过高，2-电量过低,3-温度过高且电量低
+     * 状态,0-正常，1-温度过高，2-电量过低,3-安装被拆
      */
     @TableField("stage")
     private Integer stage;
@@ -115,6 +111,18 @@ public class MouldEquipment extends Model<MouldEquipment> {
     @TableField("sim")
     private String sim;
 
+    /**
+     * 当前电量
+     */
+    @TableField("curhill_number")
+    private String curhillNumber;
+
+    /**
+     * 当前温度
+     */
+    @TableField("curtemperature")
+    private Integer curtemperature;
+
 
     public Integer getId() {
         return id;
@@ -236,6 +244,22 @@ public class MouldEquipment extends Model<MouldEquipment> {
         this.sim = sim;
     }
 
+    public String getCurhillNumber() {
+        return curhillNumber;
+    }
+
+    public void setCurhillNumber(String curhillNumber) {
+        this.curhillNumber = curhillNumber;
+    }
+
+    public Integer getCurtemperature() {
+        return curtemperature;
+    }
+
+    public void setCurtemperature(Integer curtemperature) {
+        this.curtemperature = curtemperature;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -259,6 +283,8 @@ public class MouldEquipment extends Model<MouldEquipment> {
         ", agent=" + agent +
         ", stage=" + stage +
         ", sim=" + sim +
+        ", curhillNumber=" + curhillNumber +
+        ", curtemperature=" + curtemperature +
         "}";
     }
 }

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

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
@@ -204,12 +204,12 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("mould_cycle_runtime");
+        strategy.setInclude("tb_mould_equipment");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);
         //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉
-//        strategy.setTablePrefix("tb_");
+        strategy.setTablePrefix("tb_");
         mpg.setStrategy(strategy);
 //        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
         mpg.execute();

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

@@ -19,12 +19,15 @@
         <result column="agent" property="agent" />
         <result column="stage" property="stage" />
         <result column="sim" property="sim" />
+        <result column="curhill_number" property="curhillNumber" />
+        <result column="curtemperature" property="curtemperature" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent, stage, sim
+        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent, stage, sim, curhill_number, curtemperature
     </sql>
+
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldEquipmentVO">
         <id column="id" property="id" />
         <result column="equipment_name" property="equipmentName" />
@@ -71,8 +74,8 @@
         select
         tbme.id id, tbme.equipment_no,tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,tbme.agent,
         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,
+        tbme.is_use, tbme.curhill_number hill_number,
+        tbme.curtemperature temperature,tbc.company_name companyName,
         tbm.model_no modelNo,tbme.temperature alarmDegree,tbme.hill_number alarmBattery,
         tbm.model_name modelName,tbme.stage
         from

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

@@ -305,7 +305,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 				me.setLng(Double.parseDouble(item.getLng()));
 				me.setLat(Double.parseDouble(item.getLat()));
 			}
-			me.setTemperature(item.getTemperature());
+//			me.setTemperature(item.getTemperature());
 			if (item.getAlarm() == 8) {
 				me.setStage(3);// 安装被拆
 			} else if (item.getAlarm() == 1) {