Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

17 小时以前 1bff330017b9fd91ee4a0b93b7484b82cb92ccf4

Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

 admin/.env.development

@@ -3,13 +3,11 @@

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'

# VUE_APP_API_URL  = 'http://192.168.1.45:10010'

VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

VUE_APP_API_URL  = 'http://localhost:10010'

#VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

# VUE_APP_API_URL  = 'http://localhost:10010'

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'

#key：045542fc5f436b75e6c911c5c84ff8cd
#密钥：8bd38497f9aee2b75e7a888a4dfd1e6c

 admin/src/components/business/OperaJkCabinetWindow.vue

@@ -42,6 +42,18 @@
          <span style="margin-left: 20px;">单位：分钟</span>
        </div>
      </el-form-item>
      <el-form-item label="酒精检测" prop="doubleAuth">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-switch
            v-model="form.alcoholStatus"
            active-color="#13ce66"
            inactive-color="#ff4949"
            :active-value="0"
            :inactive-value="1">
          </el-switch>
          <span style="margin-left: 20px; color: #999999;">开启后，需要酒精检测通过后，才能开门</span>
        </div>
      </el-form-item>
      <el-form-item label="双重验证" prop="doubleAuth">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-switch
@@ -177,7 +189,8 @@
        noLength: '',
        noIndex: '',
        sortType: 0,
        activateFile: null
        activateFile: null,
        alcoholStatus: 0
      },
      // 验证规则
      rules: {

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java

@@ -148,6 +148,9 @@
    @ExcelColumn(name="起始编码")
    private Integer noIndex;

    @ApiModelProperty(value = "酒精检测开启：0=开启；1=关闭", example = "1")
    private Integer alcoholStatus;

    @ApiModelProperty(value = "经纬度信息 参数值：经度,纬度")
    @TableField(exist = false)
    private String jwd;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java

@@ -64,6 +64,8 @@
    @ApiModelProperty(value = "激活文件地址")
    private String activateFileUrl;

    @ApiModelProperty(value = "酒精检测开启：0=开启；1=关闭", example = "1")
    private Integer alcoholStatus;

    @ApiModelProperty(value = "轮播图地址", example = "1")
    private List<String> bannerList;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java

@@ -81,6 +81,7 @@
            || CollectionUtils.isEmpty(jkCabinet.getManagerIdList())
            || CollectionUtils.isEmpty(jkCabinet.getAuthMemberIdList())
            || Objects.isNull(jkCabinet.getDoubleAuth())
            || Objects.isNull(jkCabinet.getAlcoholStatus())

            || Objects.isNull(jkCabinet.getRowNum())
            || jkCabinet.getRowNum() <= Constants.ZERO
@@ -214,6 +215,7 @@
                || CollectionUtils.isEmpty(jkCabinet.getAuthMemberIdList())
                || Objects.isNull(jkCabinet.getPort())
                || Objects.isNull(jkCabinet.getDoubleAuth())
                || Objects.isNull(jkCabinet.getAlcoholStatus())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }