Browse Source

传感器-OGT编码字段

WXF 3 years ago
parent
commit
5829ba0c52

+ 2 - 2
api-common/src/main/java/api/common/pojo/po/model/OgtPO.java

@@ -10,8 +10,8 @@ public class OgtPO extends CommonPO {
 
 
     //主键id
     //主键id
     private String id;
     private String id;
-    //传感器id
-    private String sensorId;
+    //传感器编码
+    private String sensorCode;
     //传感器名称
     //传感器名称
     private String sensorName;
     private String sensorName;
     //传感器描述
     //传感器描述

+ 2 - 2
api-common/src/main/java/api/common/pojo/vo/model/OgtVO.java

@@ -9,8 +9,8 @@ public class OgtVO {
 
 
     //主键id
     //主键id
     private String id;
     private String id;
-    //传感器id
-    private String sensorId;
+    //传感器编码
+    private String sensorCode;
     //传感器名称
     //传感器名称
     private String sensorName;
     private String sensorName;
     //传感器描述
     //传感器描述

+ 2 - 2
simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/OgtService.java

@@ -59,7 +59,7 @@ public class OgtService {
         String id = ogtPO.getId();
         String id = ogtPO.getId();
         if(ObjectUtil.isNull(id)){//新增
         if(ObjectUtil.isNull(id)){//新增
             ogtPO.setId(StringUtil.getRandomUUID());
             ogtPO.setId(StringUtil.getRandomUUID());
-            ogtPO.setSensorId(StringUtil.getRandomUUID());
+            ogtPO.setSensorCode(StringUtil.getRandomUUID());
             ogtPO.setShare(DictConstants.NO);//私有
             ogtPO.setShare(DictConstants.NO);//私有
             ogtMapper.insert(ogtPO);
             ogtMapper.insert(ogtPO);
         }else{//修改
         }else{//修改
@@ -80,7 +80,7 @@ public class OgtService {
 
 
         ogtPO.setShare(DictConstants.YES);//转公有
         ogtPO.setShare(DictConstants.YES);//转公有
         ogtPO.setId(StringUtil.getRandomUUID());
         ogtPO.setId(StringUtil.getRandomUUID());
-        ogtPO.setSensorId(StringUtil.getRandomUUID());
+        ogtPO.setSensorCode(StringUtil.getRandomUUID());
         ogtMapper.insert(ogtPO);
         ogtMapper.insert(ogtPO);
         return ogtPO;
         return ogtPO;
     }
     }

+ 4 - 4
simulation-resource-server/src/main/resources/mapper/model/OgtMapper.xml

@@ -30,7 +30,7 @@
     <select id="getOgtInfo" parameterType="api.common.pojo.param.model.OgtParam" resultMap="OgtVOMap">
     <select id="getOgtInfo" parameterType="api.common.pojo.param.model.OgtParam" resultMap="OgtVOMap">
         select
         select
             id,
             id,
-            sensor_id,
+            sensor_code,
             sensor_name,
             sensor_name,
             description,
             description,
             near_distance,
             near_distance,
@@ -61,7 +61,7 @@
     <insert id="insert" parameterType="api.common.pojo.po.model.OgtPO">
     <insert id="insert" parameterType="api.common.pojo.po.model.OgtPO">
         insert into model_sensor_ogt(
         insert into model_sensor_ogt(
             id,
             id,
-            sensor_id,
+            sensor_code,
             sensor_name,
             sensor_name,
             description,
             description,
             near_distance,
             near_distance,
@@ -84,7 +84,7 @@
         )
         )
         values(
         values(
             #{id,jdbcType=VARCHAR},
             #{id,jdbcType=VARCHAR},
-            #{sensorId,jdbcType=VARCHAR},
+            #{sensorCode,jdbcType=VARCHAR},
             #{sensorName,jdbcType=VARCHAR},
             #{sensorName,jdbcType=VARCHAR},
             #{description,jdbcType=VARCHAR},
             #{description,jdbcType=VARCHAR},
             #{nearDistance,jdbcType=DECIMAL},
             #{nearDistance,jdbcType=DECIMAL},
@@ -108,7 +108,7 @@
 
 
     <update id="update" parameterType="api.common.pojo.po.model.OgtPO">
     <update id="update" parameterType="api.common.pojo.po.model.OgtPO">
         update model_sensor_ogt set
         update model_sensor_ogt set
-            sensor_id = #{sensorId,jdbcType=VARCHAR},
+            sensor_code = #{sensorCode,jdbcType=VARCHAR},
             sensor_name = #{sensorName,jdbcType=VARCHAR},
             sensor_name = #{sensorName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             near_distance = #{nearDistance,jdbcType=DECIMAL},
             near_distance = #{nearDistance,jdbcType=DECIMAL},