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

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java

@@ -11,6 +11,7 @@
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.JkCabinetGrid;
import com.doumee.dao.business.model.JkInterfaceLog;
import com.doumee.dao.business.model.JkVersion;
import com.doumee.dao.business.vo.AdminCabinetVO;
import com.doumee.dao.business.vo.CabinetDetailVO;
@@ -52,7 +53,7 @@
    private JkCabinetGridService jkCabinetGridService;

    @Autowired
    private InterfaceLogService interfaceLogService;
    private JkInterfaceLogService interfaceLogService;

    @Autowired
    private JkIccardService jkIccardService;
@@ -86,8 +87,6 @@
        this.saveInterfaceLog(Constants.strToJson("id",id.toString()), null,"updateRunStatusById","更新钥匙柜在线状态");
        return ApiResponse.success("更新成功");
    }



    @ApiOperation("获取可管理的钥匙柜列表 - 管理员")
    @GetMapping("/getAdminCabinetInfo")
@@ -190,7 +189,7 @@
    }

    private void saveInterfaceLog(String s, String result,String url,String name) {
        InterfaceLog hkMonitoryLogDO=new InterfaceLog();
        JkInterfaceLog hkMonitoryLogDO=new JkInterfaceLog();
        hkMonitoryLogDO.setType(0);
        hkMonitoryLogDO.setCreateDate(new Date());
        hkMonitoryLogDO.setIsdeleted(0);
@@ -200,7 +199,6 @@
        hkMonitoryLogDO.setUrl(url);
        interfaceLogService.create(hkMonitoryLogDO);
    }


    @LoginNoRequired
    @ApiOperation("酒精检测告警")