Browse Source

本地代码提交

lijie 3 years ago
parent
commit
d23abf1397

+ 5 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/controller/AdmModelController.java

@@ -17,9 +17,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 模型操作
+ * 00-建筑楼层管理
+ * 后端服务名:adm-middleware
  * @author lvxy
  * @date 2021/8/25
+ * @module adm-middleware
  */
 @RestController
 @RequestMapping("/model")
@@ -29,7 +31,8 @@ public class AdmModelController {
     private IAdmModelKeyService service;
 
     /**
-     * 模型文件下载地址 key
+     * 000101-模型-模型文件下载地址 key
+     * 
      */
     @PostMapping("/key")
     public AdmResponse count(@RequestBody AdmQueryCriteria request) {

+ 5 - 0
adm-business/adm-server/.easy.api.config

@@ -0,0 +1,5 @@
+#额外要求header中携带token
+method.additional.param={name:"projectId",value:"Pj5001120003",desc:"项目id",required:true}
+method.additional.param={name:"groupCode",value:"XG",desc:"集团编码",required:true}
+method.additional.param={name:"appId",value:"ADM",desc:"appId",required:true}
+method.additional.param={name:"userId",value:"0",desc:"账号id",required:true}

+ 20 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/auth/constant/DeviceTypeEnum.java

@@ -0,0 +1,20 @@
+package com.persagy.adm.server.auth.constant;
+/***
+ * 登录设备类型
+ * @author : lijie
+ * Update By 2022/1/7 21:50
+ */
+public enum DeviceTypeEnum {
+    /**pc*/
+    ONE("1"),
+    /**Android*/
+    TWO("2"),
+    /**ios*/
+    THREE("3"),
+    /**其他*/
+    FOUR("4");
+    private String type;
+    DeviceTypeEnum(String type){
+        this.type=type;
+    };
+}

+ 18 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/auth/constant/LoginTypeEnum.java

@@ -0,0 +1,18 @@
+package com.persagy.adm.server.auth.constant;
+/***
+ * 登录方式
+ * @author : lijie
+ * Update By 2022/1/7 21:50
+ */
+public enum LoginTypeEnum {
+    /**用户名密码方式(默认是ldap用户)*/
+    ONE("1"),
+    /**使用手机号登录*/
+    TWO("2"),
+    /**钉钉扫码登录*/
+    THREE("3");
+    private String type;
+    LoginTypeEnum(String type){
+        this.type=type;
+    };
+}

+ 46 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/auth/controller/AdmAuthController.java

@@ -0,0 +1,46 @@
+package com.persagy.adm.server.auth.controller;
+
+import cn.hutool.core.io.IoUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.persagy.adm.server.auth.domain.LoginVo;
+import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.file.model.FileInfo;
+import com.persagy.dmp.file.model.FileInfoCreator;
+import com.persagy.dmp.file.utils.FileStorageHelper;
+import lombok.SneakyThrows;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * 00-登录及权限控制
+ * 后端服务名:adm-server
+ * @author lvxy
+ * @date 2021/8/25
+ * @module adm-server
+ */
+@RestController
+@RequestMapping("/auth")
+public class AdmAuthController {
+
+    /**
+     * 000101-登录-登录接口
+     * @param loginVo : 登录信息
+     * @return : com.persagy.dmp.common.model.response.CommonResult<java.lang.String>
+     * @author : lijie
+     * Update By 2022/1/7 21:57
+     */
+    @PostMapping("/account/login")
+    public CommonResult<String> accountLogin(@RequestBody LoginVo loginVo) {
+        return ResultHelper.single("eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJ5dXNodS1zYWFzLWNsaWVudCIsInN1YiI6Inl1c2h1LXVzZXIiLCJpc3MiOiJ5dXNodSIsImp0aSI6IjUxNmM2MGFjLWYyNDUtNGFjMC05MjliLTY0MjJkYTk3MjA5ZCJ9.XifozaE83Dktuh9WFCUp10lLt_HP1c5YzFWPBRX53AI");
+    }
+
+
+
+}

+ 46 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/auth/domain/LoginVo.java

@@ -0,0 +1,46 @@
+package com.persagy.adm.server.auth.domain;
+
+import com.persagy.adm.server.auth.constant.DeviceTypeEnum;
+import com.persagy.adm.server.auth.constant.LoginTypeEnum;
+
+/***
+ * Description: 登录的VO类
+ * @author : lijie
+ * Update By 2022/1/7 21:41
+ */
+public class LoginVo {
+    /**
+     * 账号id
+     */
+    private String accountId;
+    /**
+     * 登录设备类型
+     * @see DeviceTypeEnum#type
+     */
+    private String loginDeviceType;
+    /**
+     * 登录方式
+     * @see LoginTypeEnum#type
+     */
+    private String loginType;
+    /**
+     * 登录密码
+     */
+    private String passWord;
+    /**
+     * 钉钉扫码的code
+     */
+    private String dingdingCode;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 短信验证码
+     */
+    private String smsCode;
+    /**
+     * 登录用户名
+     */
+    private String userName;
+}