Merge branch 'master-6#'

# Conflicts:
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/entity/BilletBasicInfo.java

@@ -130,7 +130,7 @@ public class BilletBasicInfo implements Serializable {
     /**编辑条件*/
     @Excel(name = "编辑条件", width = 15)
     @ApiModelProperty(value = "编辑条件",required = true)
-    private Integer opType;
+    private Integer optype;
 
     public BilletBasicInfo() {
     }
@@ -338,11 +338,11 @@ public class BilletBasicInfo implements Serializable {
         this.ratingsResult = ratingsResult;
     }
 
-    public Integer getOpType() {
-        return opType;
+    public Integer getOptype() {
+        return optype;
     }
 
-    public void setOpType(Integer opType) {
-        this.opType = opType;
+    public void setOptype(Integer optype) {
+        this.optype = optype;
     }
 }

jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletBasicInfoServiceImpl.java

@@ -20,12 +20,14 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
     @Override
     public void addC(BilletBasicInfo billetBasicInfo) {
         // 满足  optype;  // 操作类型, 1 = 新增, 2 = 编辑
-        if(billetBasicInfo.getOpType() == 2) { // 编辑
+        if(billetBasicInfo.getOptype() == 2) { // 编辑
             LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<BilletBasicInfo>().eq(BilletBasicInfo::getBilletNo, billetBasicInfo.getBilletNo());
             BilletBasicInfo basicInfo = baseMapper.selectOne(queryWrapper);
             if(oConvertUtils.isNotEmpty(basicInfo) && oConvertUtils.isNotEmpty(basicInfo.getId())){
                 billetBasicInfo.setId(basicInfo.getId());
                 baseMapper.updateById(billetBasicInfo);
+            }else {
+                baseMapper.insert(billetBasicInfo);
             }
         }else {
             baseMapper.insert(billetBasicInfo);

jeecg-module-conn/src/main/java/org/jeecg/modules/heatsActuals/entity/HeatsActuals.java

@@ -164,7 +164,7 @@ public class HeatsActuals implements Serializable {
     /**编辑条件*/
     @Excel(name = "编辑条件", width = 15)
     @ApiModelProperty(value = "编辑条件",required = true)
-    private Integer opType;
+    private Integer optype;
 
     public HeatsActuals() {
     }
@@ -371,12 +371,12 @@ public class HeatsActuals implements Serializable {
         this.lengthSix = lengthSix;
     }
 
-    public Integer getOpType() {
-        return opType;
+    public Integer getOptype() {
+        return optype;
     }
 
-    public void setOpType(Integer opType) {
-        this.opType = opType;
+    public void setOptype(Integer optype) {
+        this.optype = optype;
     }
 
 }

jeecg-module-conn/src/main/java/org/jeecg/modules/heatsActuals/service/impl/HeatsActualsServiceImpl.java

@@ -20,7 +20,7 @@ public class HeatsActualsServiceImpl extends ServiceImpl<HeatsActualsMapper, Hea
     public void addC(HeatsActuals heatsActuals) {
         // 满足  optype;  // 操作类型, 1=新增, 2=编辑
         // 编辑条件 = 炉号+铸机号+开浇时间
-        if(heatsActuals.getOpType() == 2){ // 编辑信号
+        if(heatsActuals.getOptype() == 2){ // 编辑信号
             LambdaQueryWrapper<HeatsActuals> queryWrapper = new LambdaQueryWrapper<HeatsActuals>().eq(HeatsActuals::getHeatsCode, heatsActuals.getHeatsCode())
                     .eq(HeatsActuals::getCasterCode, heatsActuals.getCasterCode())
                     .eq(HeatsActuals::getStartPourTime, heatsActuals.getStartPourTime());
@@ -28,6 +28,8 @@ public class HeatsActualsServiceImpl extends ServiceImpl<HeatsActualsMapper, Hea
             if(oConvertUtils.isNotEmpty(actuals) && oConvertUtils.isNotEmpty(actuals.getId())){ // 编辑
                 heatsActuals.setId(actuals.getId());
                 baseMapper.updateById(heatsActuals);
+            } else {
+                baseMapper.insert(heatsActuals);
             }
         } else {
             baseMapper.insert(heatsActuals);

jeecg-module-conn/src/main/java/org/jeecg/modules/push/utils/MqttClientCallback.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.push.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.ezmorph.object.DateMorpher;
 import net.sf.json.JSONObject;
+import net.sf.json.util.JSONUtils;
 import org.eclipse.paho.client.mqttv3.*;
 import org.jeecg.common.util.SpringContextHolder;
 import org.jeecg.modules.billetActual.entity.BilletBasicInfo;
@@ -101,13 +104,13 @@ public class MqttClientCallback implements MqttCallback, MqttCallbackExtended{
         JSONObject jsonObject = JSONObject.fromObject(message.toString());
         // 炉次实绩
         if(topic.contains("trace/performance/converter/add")){
-            HeatsActuals heatsActuals = (HeatsActuals)JSONObject.toBean(jsonObject, HeatsActuals.class);
+            HeatsActuals heatsActuals =  JSON.parseObject(jsonObject.toString(), HeatsActuals.class);
             heatsActualsService.addC(heatsActuals);
             return;
         }
         // 铸坯实绩
         if(topic.contains("trace/performance/billet/add")){
-            BilletBasicInfo billetBasicInfo = (BilletBasicInfo) JSONObject.toBean(jsonObject, BilletBasicInfo.class);
+            BilletBasicInfo billetBasicInfo =  JSON.parseObject(jsonObject.toString(), BilletBasicInfo.class);
             billetBasicInfoService.addC(billetBasicInfo);
             return;
         }