Merge branch 'zhaoyue-dev' into 'master'

Add admin info inter



See merge request !19

+package com.xkl.controller.uploadsoft;
+
+import com.wordnik.swagger.annotations.ApiImplicitParam;
+import com.wordnik.swagger.annotations.ApiImplicitParams;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.xkl.authorization.annotation.*;
+import com.xkl.config.ResultStatus;
+import com.xkl.domain.XklAdminEntity;
+import com.xkl.domain.XklCompanyEntity;
+import com.xkl.model.AdminLoginModel;
+import com.xkl.model.ResultModel;
+import com.xkl.repository.XklCompanyRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 操作员信息查询接口
+ */
+@RestController
+@RequestMapping("/adminInfo")
+public class AdminInfoController {
+    @Autowired
+    private XklCompanyRepository xklCompanyRepository;
+
+    @RequestMapping(method = RequestMethod.GET)
+    @Authorization
+    @ApiOperation(value = "操作员信息查询接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "authorization", value = "请输入登录返回信息：userId_tokens", required = true, dataType = "string", paramType = "header"),
+    })
+    public ResponseEntity<ResultModel> getAdminInfo(@CurrentAdmin XklAdminEntity admin) {
+        XklCompanyEntity companyEntity = xklCompanyRepository.findById(admin.getCoid());
+        if (companyEntity == null) {
+            return new ResponseEntity<>(ResultModel.error(ResultStatus.COMPANY_ERROR), HttpStatus.OK);
+        }
+        AdminLoginModel adminLoginModel = new AdminLoginModel(admin.getId(), admin.getAccount(), companyEntity.getId(), companyEntity.getName(), "", "");
+        return new ResponseEntity<>(ResultModel.ok(adminLoginModel), HttpStatus.OK);
+    }
+}