初始提交

@@ -123,6 +123,7 @@ public class IotThingsModelController extends BaseController
         {
         {
             return AjaxResult.error("请输入数模型");
             return AjaxResult.error("请输入数模型");
         }
         }
+        iotThingsModel.setSpecs(JSONObject.toJSONString(thingsModelItemBase));
         return toAjax(iotThingsModelService.insertIotThingsModel(iotThingsModel));
         return toAjax(iotThingsModelService.insertIotThingsModel(iotThingsModel));
     }
     }
 
 

@@ -6,6 +6,7 @@ spring:
         druid:
         druid:
             # 主库数据源
             # 主库数据源
             master:
             master:
+#                url: jdbc:mysql://114.215.126.2:3306/ju_he_liao_tiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 url: jdbc:mysql://rm-wz9740un21f09iokuao.mysql.rds.aliyuncs.com:3306/mqtt_broker?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 url: jdbc:mysql://rm-wz9740un21f09iokuao.mysql.rds.aliyuncs.com:3306/mqtt_broker?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: luhui
                 username: luhui
                 password: Luhui586
                 password: Luhui586

@@ -17,15 +17,20 @@ public class ArrayModelOutput extends ThingsModelItemBase<JSONArray>
 
 
     @Override
     @Override
     public String getView() {
     public String getView() {
+
         if(null != getValue())
         if(null != getValue())
         {
         {
             return JSONArray.toJSONString(getValue());
             return JSONArray.toJSONString(getValue());
         }
         }
-        return "";
+        return null;
     }
     }
 
 
     @Override
     @Override
     public String getSaveView() {
     public String getSaveView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         return JSONArray.toJSONString(getValue());
         return JSONArray.toJSONString(getValue());
     }
     }
 }
 }

@@ -16,6 +16,10 @@ public class BoolModelOutput extends ThingsModelItemBase<Boolean>
 
 
     @Override
     @Override
     public String getView() {
     public String getView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         if(getValue())
         if(getValue())
         {
         {
             return trueText;
             return trueText;
@@ -27,6 +31,10 @@ public class BoolModelOutput extends ThingsModelItemBase<Boolean>
 
 
     @Override
     @Override
     public String getSaveView() {
     public String getSaveView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         return getValue().toString();
         return getValue().toString();
     }
     }
 }
 }

@@ -20,11 +20,19 @@ public class DecimalModelOutput extends ThingsModelItemBase<BigDecimal>
 
 
     @Override
     @Override
     public String getView() {
     public String getView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         return getValue().doubleValue()+unit;
         return getValue().doubleValue()+unit;
     }
     }
 
 
     @Override
     @Override
     public String getSaveView() {
     public String getSaveView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         return getValue().toString();
         return getValue().toString();
     }
     }
 }
 }

@@ -18,6 +18,10 @@ public class EnumModelOutput extends ThingsModelItemBase<String>
 
 
     @Override
     @Override
     public String getView() {
     public String getView() {
+        if(null == enumList || enumList.size()==0)
+        {
+            return null;
+        }
         for(EnumItemOutput enumItemOutput:enumList)
         for(EnumItemOutput enumItemOutput:enumList)
         {
         {
             if(enumItemOutput.getValue().equals(getValue()))
             if(enumItemOutput.getValue().equals(getValue()))

@@ -23,11 +23,19 @@ public class IntegerModelOutput extends ThingsModelItemBase<Integer>
 
 
     @Override
     @Override
     public String getView() {
     public String getView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         return getSaveView()+unit;
         return getSaveView()+unit;
     }
     }
 
 
     @Override
     @Override
     public String getSaveView() {
     public String getSaveView() {
+        if(null == getValue())
+        {
+            return null;
+        }
         BigDecimal bigDecimal = new BigDecimal(getValue().toString());
         BigDecimal bigDecimal = new BigDecimal(getValue().toString());
         return bigDecimal.divide(new BigDecimal(acy),acy.toString().length()-1, RoundingMode.HALF_UP).toString();
         return bigDecimal.divide(new BigDecimal(acy),acy.toString().length()-1, RoundingMode.HALF_UP).toString();
     }
     }

@@ -112,7 +112,7 @@ public class DataModeAnalysisService {
                     operateHisList.add(dviceLogService.newLogDeviceOperation(id,thingsModelBase.getSaveView(),null,controlModel+thingsModelItemBase.getName()+"为"+thingsModelBase.getView(),jsData.toString()));
                     operateHisList.add(dviceLogService.newLogDeviceOperation(id,thingsModelBase.getSaveView(),null,controlModel+thingsModelItemBase.getName()+"为"+thingsModelBase.getView(),jsData.toString()));
                 }
                 }
 
 
-                rObjec.put(key,JSONObject.toJSONString(thingsModelBase));
+                rObjec.put(key,thingsModelBase);
             }
             }
 
 
             return rObjec;
             return rObjec;

@@ -42,7 +42,7 @@ mqtt:
   #链接地址
   #链接地址
   broker: tcp://175.24.61.68:1883
   broker: tcp://175.24.61.68:1883
   #唯一标识
   #唯一标识
-  clientId: lh-mqtt-service-001
+  clientId: lh-mqtt-service-002
   #订阅的topic
   #订阅的topic
   topics: "/2/+/+/+/ADD_POST,/2/+/+/+/ALL_POST,/2/+/+/+/DB_TOPIC_DISTRIBUTE,/2/+/+/+/GET,/2/+/+/+/online,/2/+/+/+/PUT_REQ"
   topics: "/2/+/+/+/ADD_POST,/2/+/+/+/ALL_POST,/2/+/+/+/DB_TOPIC_DISTRIBUTE,/2/+/+/+/GET,/2/+/+/+/online,/2/+/+/+/PUT_REQ"
   topicconfig: "/{{roleid}}/{{username}}/{{clientid}}/{{payloadtype}}/{{topicType}}"
   topicconfig: "/{{roleid}}/{{username}}/{{clientid}}/{{payloadtype}}/{{topicType}}"