刘一凡 3 anni fa
parent
commit
1ebd395269

+ 3 - 0
src/main/java/com/chuanghai/h3c_reporting/bo/DeleteIds.java

@@ -13,5 +13,8 @@ import lombok.Data;
 @Data
 public class DeleteIds {
 
+    /**
+     * id数组
+     */
     private Long[] ids;
 }

+ 3 - 0
src/main/java/com/chuanghai/h3c_reporting/bo/DeleteReporting.java

@@ -18,5 +18,8 @@ public class DeleteReporting {
     */
     private String name;
 
+    /**
+     * id数组
+     */
     private Long[] ids;
 }

+ 3 - 0
src/main/java/com/chuanghai/h3c_reporting/dto/ReportingDownloadDTO.java

@@ -20,6 +20,9 @@ public class ReportingDownloadDTO implements Serializable {
 //     */
 //    private String adminName;
 
+    /**
+     * id数组
+     */
     private Long[] ids;
 
     /**

+ 0 - 87
src/main/java/com/chuanghai/h3c_reporting/util/WxUtils.java

@@ -1,87 +0,0 @@
-//package com.chuanghai.h3c_reporting.util;
-//
-//import com.alibaba.excel.util.StringUtils;
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.chuanghai.h3c_reporting.common.exception.BizCodeEnume;
-//import com.chuanghai.h3c_reporting.common.exception.RRException;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.http.HttpStatus;
-//import org.springframework.http.client.ClientHttpResponse;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.client.ResponseErrorHandler;
-//import org.springframework.web.client.RestTemplate;
-//
-//import java.io.IOException;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * @Author 浮生
-// * @Date 2023/3/12 14:30
-// * @PackageName:com.chuanghai.h3c_reporting.util
-// * @ClassName: WxUtils
-// * @Description: TODO
-// * @Version 1.0
-// */
-//@Component
-//@Slf4j
-//public class WxUtils {
-//    private final RestTemplate restTemplate;
-//
-//    {
-//        restTemplate = new RestTemplate();
-//        ResponseErrorHandler responseErrorHandler = new ResponseErrorHandler() {
-//            @Override
-//            public boolean hasError(ClientHttpResponse response) throws IOException {
-//                return false;
-//            }
-//
-//            @Override
-//            public void handleError(ClientHttpResponse response) throws IOException {
-//                HttpStatus statusCode = response.getStatusCode();
-//                String statusText = response.getStatusText();
-//                log.info("【微信接口请求失败】 errorCode={},errorMsg={}", statusCode, statusText);
-//                throw new RRException(BizCodeEnume.WX_EXCEPTION, "微信网络繁忙,请稍后再试。");
-//            }
-//        };
-//
-//        restTemplate.setErrorHandler(responseErrorHandler);
-//    }
-//
-//
-//
-//    /**
-//     * @params: []
-//     * @return: java.lang.String
-//     * @Description: 获取用户openId
-//     */
-//    public String code2Session(String appId, String secret, String code) {
-//
-//
-//        //组装参数
-//        Map<String, String> params = new HashMap<>();
-//        params.put("appid", appId);
-//        params.put("secret", secret);
-//        params.put("code", code);
-//        params.put("grant_type", "authorization_code");
-//
-//
-//        StringBuilder sb = new StringBuilder(UrlConstants.WX_CODE_2_SESSION);
-//        sb.append("?")
-//                .append("appid=").append(appId).append("&")
-//                .append("secret=").append(secret).append("&")
-//                .append("js_code=").append(code).append("&")
-//                .append("grant_type=").append("authorization_code");
-//
-//        String result = restTemplate.getForObject(sb.toString(), String.class);
-//
-//        JSONObject jsonResult = JSON.parseObject(result);
-//        String openid = jsonResult.getString("openid");
-//        if (StringUtils.isEmpty(openid)) {
-//            log.error("【微信code2Session失败!】url={},Params:{},wxResult={}", sb.toString(), JSON.toJSONString(params), result);
-//            throw new RRException(BizCodeEnume.WX_EXCEPTION, "获取用户信息失败,请稍后再试。");
-//        }
-//        return jsonResult.getString("openid");
-//    }
-//}

+ 4 - 2
src/main/java/com/chuanghai/h3c_reporting/vo/AddUserVO.java

@@ -2,7 +2,7 @@ package com.chuanghai.h3c_reporting.vo;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Author 浮生
@@ -18,22 +18,24 @@ public class AddUserVO {
     /**
      * id
      */
-    @NotBlank(message = "id不能为空")
     private Long id;
 
     /**
      * 用户名
      */
+    @NotNull(message = "用户名不能为空")
     private String userName;
 
     /**
      * 管理员姓名
      */
+    @NotNull(message = "管理员姓名不能为空")
     private String name;
 
     /**
      * 密码
      */
+    @NotNull(message = "管理员姓名不能为空")
     private String password;
 
 }

File diff suppressed because it is too large
+ 72 - 61
src/main/resources/static/doc/index.html


+ 21 - 2
src/main/resources/static/doc/search.js

@@ -8,12 +8,20 @@ api.push({
 })
 api[0].list.push({
     order: '1',
-    desc: '删除信息',
+    desc: '信息上传',
 });
 api[0].list.push({
     order: '2',
+    desc: '删除信息',
+});
+api[0].list.push({
+    order: '3',
     desc: '项目列表',
 });
+api[0].list.push({
+    order: '4',
+    desc: '信息导出',
+});
 api.push({
     alias: 'UserController',
     order: '2',
@@ -46,8 +54,19 @@ api[1].list.push({
     desc: '管理员列表',
 });
 api.push({
-    alias: 'dict',
+    alias: 'WxController',
     order: '3',
+    link: '获取微信绑定手机号',
+    desc: '获取微信绑定手机号',
+    list: []
+})
+api[2].list.push({
+    order: '1',
+    desc: '通过code换取用户手机号',
+});
+api.push({
+    alias: 'dict',
+    order: '4',
     link: 'dict_list',
     desc: '数据字典',
     list: []