web端添加人脸识别锁支持

backend/src/dashoo.cn/mcs_api/business/device/channels.go

@@ -71,7 +71,7 @@ type DeviceChannels struct {
 	Pressure     string
 	Ots          string //压力
 	Displacement string //位移
-	Doorlock     string //门禁
+	Doorlock     string //智能锁
 	ClO2         string
 	C2H4         string
 	C2H2         string //乙炔

backend/src/dashoo.cn/mcs_api/controllers/channels.go

@@ -35,7 +35,7 @@ type ChannelLast struct {
 	Pressure     string
 	Ots          string //压力
 	Displacement string //位移
-	Doorlock     string //门禁
+	Doorlock     string //智能锁
 	ClO2         string
 	C2H4         string
 	C2H2         string
@@ -178,7 +178,7 @@ func (this *ChannelsController) DataValue() {
 		data.O3 = utils.ToStr(lastdata.O3)
 		data.TVOC = utils.ToStr(lastdata.TVOC)
 		data.H2O = utils.ToStr(lastdata.H2O)
-		data.Doorlock = utils.ToStr(lastdata.Doorlock) //门禁
+		data.Doorlock = utils.ToStr(lastdata.Doorlock) //智能锁
 		data.SO2 = utils.ToStr(lastdata.SO2)
 		data.Power = utils.ToStr(lastdata.ElectricalPower)
 		data.Supply = utils.ToStr(lastdata.ElectricalSupply)
@@ -1064,7 +1064,7 @@ func (this *ChannelsController) ChannelManageview(client labsop.LabSopClient, co
 				arrvs = append(arrvs, arr)
 			}
 		}
-	case "31": //门禁
+	case "31", "33": //智能锁 人脸识别锁
 		queryGroupCommand = fmt.Sprintf("select max(doorlock),min(doorlock),MEAN(doorlock) from %v where time > %vs and time < %vs", code, start, end)
 		if level == "0" {
 			queryCommand = fmt.Sprintf("select doorlock from %v where time > %vs and time < %vs", code, start, end)

backend/src/dashoo.cn/mcs_api/controllers/common.go

@@ -201,45 +201,45 @@ func CoderGBKtoUTF8(str string) string {
 const (
 	Device_Box         = "0"                                                                      //设备，普通box
 	Device_Alertor     = "4"                                                                      //设备，报警器
-	ChannelItem_Sensor = "0,6,7,9,10,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32" //sensor，0:常温，6:深低温，7:o2，9:co2，10:特殊（隐藏湿度的常温）,13:功率,14:外接设备1,15:外接液位设备,16:常温带定位,
-	//	17:氧气设备,18:风速,19:气压,20:二氧化氯,21:乙烯,22:氯气,23:臭氧,24:TVOC,25:乙炔,26:纯二氧化碳,27:电导率28:二氧化硫 29:压力 30:位移 31 门禁  32：基点5传感器
-	ChannelItem_Report          = "0,6,7,9,10,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32" //sensor报表使用，不需要功率，常温，深低温，o2，co2，特殊（隐藏湿度的常温）,外接设备1,外接液位设备,常温带定位,氧气设备
-	ChannelItem_Box             = "1"                                                                   //sensor，box自身数据
-	ChannelItem_TAndH           = "0,14,16"                                                             //sensor，常温，显示温湿度
-	ChannelItem_Temperature     = "6,10"                                                                //sensor，深低温，特殊，显示温度
-	ChannelItem_Co2             = "9,26"                                                                //sensor，co2，显示温湿度，co2
-	ChannelItem_O2              = "7,17"                                                                //sensor，o2，显示温湿度，O2
-	ChannelItem_Power           = "13"                                                                  //sensor，功率插座，显示功率，电量
-	ChannelItem_LiquidLevel     = "15"                                                                  //sensor，外接液位设备，显示温度，液位
-	ChannelItem_HaveT           = "0,6,7,9,10,15,16"                                                    //含温度数据
-	ChannelItem_HaveV           = "0,6,7,9,10,16"                                                       //含电压数据
-	ChannelItem_HaveH           = "0,7,9,16"                                                            //含湿度数据
-	ChannelItem_HaveCO2         = "9,26"                                                                //含二氧化碳数据，co2
-	ChannelItem_HaveO2          = "7,17"                                                                //含氧气数据，o2
-	ChannelItem_HaveLiquidLevel = "15"                                                                  //含液位数据
-	ChannelItem_WindSpeed       = "18"                                                                  //风速
-	ChannelItem_Pressure        = "19"                                                                  //气压
-	ChannelItem_Ots             = "29"                                                                  //压力大港
-	ChannelItem_Displacement    = "30"                                                                  //位移大港
-	ChannelItem_Doorlock        = "31"                                                                  //门禁
-	ChannelItem_ClO2            = "20"                                                                  //二氧化氯
-	ChannelItem_C2H4            = "21"                                                                  //乙烯
-	ChannelItem_Cl2             = "22"                                                                  //氯气
-	ChannelItem_O3              = "23"                                                                  //臭氧
-	ChannelItem_TVOC            = "24"                                                                  //TVOC
-	ChannelItem_C2H2            = "25"                                                                  //乙炔
-	ChannelItem_H2O             = "27"                                                                  //水质
-	ChannelItem_SO2             = "28"                                                                  //二氧化硫
-	Alertor_Alarm               = "2,4,5,8,12"                                                          //报警器，普通，纯报警，纯正常，android,条屏
-	Alertor_AlarmBindData       = "3"                                                                   //报警器，绑定数据
-	Alertor_Alarm1              = "2"                                                                   //报警器，普通
-	Alertor_Alarm3              = "4"                                                                   //报警器，纯报警
-	Alertor_AlarmOnlyData       = "5"                                                                   //报警器，纯正常
-	Alertor_AlarmAndroid        = "8"                                                                   //报警器，android
-	Alertor_AlarmBaoJing        = "2,4,5,8"                                                             //报警器，报警
-	Alertor_AlarmLed            = "12"                                                                  //报警器，条屏
-	Alertor_NeedAction          = "2,4,5,8"                                                             //报警器，需要添加动作
-	Alertor_NotNeedAction       = "12"                                                                  //报警器，不需要添加动作
+	ChannelItem_Sensor = "0,6,7,9,10,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33" //sensor 0:常温,6:深低温,7:o2,9:co2,10:特殊（隐藏湿度的常温）,13:功率,14:外接设备1,15:外接液位设备,16:常温带定位,
+	//	17:氧气设备,18:风速,19:气压,20:二氧化氯,21:乙烯,22:氯气,23:臭氧,24:TVOC,25:乙炔,26:纯二氧化碳,27:电导率,28:二氧化硫,29:压力,30:位移,31:智能锁,32：基点5传感器,33:人脸识别锁
+	ChannelItem_Report          = "0,6,7,9,10,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,32" //sensor报表使用，不需要功率，常温，深低温，o2，co2，特殊（隐藏湿度的常温）,外接设备1,外接液位设备,常温带定位,氧气设备
+	ChannelItem_Box             = "1"                                                                //sensor，box自身数据
+	ChannelItem_TAndH           = "0,14,16"                                                          //sensor，常温，显示温湿度
+	ChannelItem_Temperature     = "6,10"                                                             //sensor，深低温，特殊，显示温度
+	ChannelItem_Co2             = "9,26"                                                             //sensor，co2，显示温湿度，co2
+	ChannelItem_O2              = "7,17"                                                             //sensor，o2，显示温湿度，O2
+	ChannelItem_Power           = "13"                                                               //sensor，功率插座，显示功率，电量
+	ChannelItem_LiquidLevel     = "15"                                                               //sensor，外接液位设备，显示温度，液位
+	ChannelItem_HaveT           = "0,6,7,9,10,15,16"                                                 //含温度数据
+	ChannelItem_HaveV           = "0,6,7,9,10,16"                                                    //含电压数据
+	ChannelItem_HaveH           = "0,7,9,16"                                                         //含湿度数据
+	ChannelItem_HaveCO2         = "9,26"                                                             //含二氧化碳数据，co2
+	ChannelItem_HaveO2          = "7,17"                                                             //含氧气数据，o2
+	ChannelItem_HaveLiquidLevel = "15"                                                               //含液位数据
+	ChannelItem_WindSpeed       = "18"                                                               //风速
+	ChannelItem_Pressure        = "19"                                                               //气压
+	ChannelItem_Ots             = "29"                                                               //压力大港
+	ChannelItem_Displacement    = "30"                                                               //位移大港
+	ChannelItem_Doorlock        = "31,33"                                                            //智能锁
+	ChannelItem_ClO2            = "20"                                                               //二氧化氯
+	ChannelItem_C2H4            = "21"                                                               //乙烯
+	ChannelItem_Cl2             = "22"                                                               //氯气
+	ChannelItem_O3              = "23"                                                               //臭氧
+	ChannelItem_TVOC            = "24"                                                               //TVOC
+	ChannelItem_C2H2            = "25"                                                               //乙炔
+	ChannelItem_H2O             = "27"                                                               //水质
+	ChannelItem_SO2             = "28"                                                               //二氧化硫
+	Alertor_Alarm               = "2,4,5,8,12"                                                       //报警器，普通，纯报警，纯正常，android,条屏
+	Alertor_AlarmBindData       = "3"                                                                //报警器，绑定数据
+	Alertor_Alarm1              = "2"                                                                //报警器，普通
+	Alertor_Alarm3              = "4"                                                                //报警器，纯报警
+	Alertor_AlarmOnlyData       = "5"                                                                //报警器，纯正常
+	Alertor_AlarmAndroid        = "8"                                                                //报警器，android
+	Alertor_AlarmBaoJing        = "2,4,5,8"                                                          //报警器，报警
+	Alertor_AlarmLed            = "12"                                                               //报警器，条屏
+	Alertor_NeedAction          = "2,4,5,8"                                                          //报警器，需要添加动作
+	Alertor_NotNeedAction       = "12"                                                               //报警器，不需要添加动作
 )
 
 //设备类型判断

backend/src/dashoo.cn/mcs_api/go.mod

@@ -6,12 +6,12 @@ require (
 	dashoo.cn/base_common v0.0.0
 	dashoo.cn/mms_api_weixin v0.0.0
 	github.com/Unknwon/goconfig v0.0.0 // indirect
-	//github.com/astaxie/beego v1.12.3
 	github.com/astaxie/beego v1.12.3
 	github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
 	github.com/beego/i18n v0.0.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-xorm/xorm v0.7.9
+	github.com/kr/pretty v0.2.1 // indirect
 	github.com/nsqio/go-nsq v1.0.8
 	github.com/signintech/gopdf v0.9.15
 	github.com/smartystreets/goconvey v1.6.4

backend/src/dashoo.cn/mcs_api/go.sum

@@ -128,6 +128,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -253,6 +254,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -309,6 +311,7 @@ google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyz
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=

frontend_web/src/views/main/equipment.vue

@@ -122,17 +122,16 @@
                                  message.equipment.curve')"></i> -->
                     </router-link>
                     <b>|</b>
-                    <router-link v-if="item.DataItem !== '31'"
+                    <router-link v-if="!contains(doorlock,item.DataItem)"
                                  :to="'/devices/gps/'+item.Serial+'_'+item.DataItem">
                       <!-- v-if="contains(havegps,item.DataItem)" -->
                       <a>路线轨迹</a>
                       <!-- <i class="icon icon-location2 chartico" style="margin:0" :title="$t('message.equipment.Map')"></i> -->
                     </router-link>
-                    <router-link v-if="item.DataItem === '31'"
+                    <router-link v-if="contains(doorlock,item.DataItem)"
                                  :to="'/record_history?code='+item.Serial">
                       <!-- v-if="contains(havegps,item.DataItem)" -->
                       <a>开锁记录</a>
-                      <!-- <i class="icon icon-location2 chartico" style="margin:0" :title="$t('message.equipment.Map')"></i> -->
                     </router-link>
                   </div>
                 </el-col>
@@ -157,7 +156,7 @@
                 <el-col :span="8"
                         v-if="contains(doorlock,item.DataItem)">
                   <div class="indgrid-content doorlock">
-                    门禁
+                    智能锁
                     <div class="indata">{{item.Doorlock}}</div>
                   </div>
                 </el-col>
@@ -690,8 +689,8 @@ export default {
       windspeed: '18',
       pressure: '19',
       ots: '29',
-      doorlock: '31',
-      wuyuansu: '32',
+      doorlock: '31,33',
+      wuyuansu: '32', // 五元素
       displacement: '30',
       clo2: '20',
       h2o: '27',

frontend_web/src/views/main/index.vue

@@ -106,7 +106,7 @@
                     v-if="contains(Doorlock,v.DataItem)"
                     style="margin:5px">
               <div class="indgrid-content doorlockc">
-                门禁
+                智能锁
                 <div class="indata">{{v.Doorlock}}</div>
               </div>
             </el-col>
@@ -254,7 +254,7 @@ export default {
       haveco2: '9,26',
       windspeed: '18',
       pressure: '19',
-      Doorlock: '31',
+      Doorlock: '31,33',
       Ots: '29',
       Displacement: '30',
       clo2: '20',
@@ -352,7 +352,6 @@ export default {
           } else {
             _this.list[k].Doorlock = '开启'
           }
-
           _this.list[k].Displacement = res.data.Displacement
           _this.list[k].C2H4 = res.data.C2H4
           _this.list[k].C2H2 = res.data.C2H2