Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/controller/CorpController.java

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.CorpIndexHandle;
 import com.mokamrp.privates.entity.PostCorpWxLoginHandle;
@@ -33,7 +34,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/corp")
-public class CorpController extends BaseController<Corp>{
+public class CorpController extends BaseController<Corp> {
 
     @Autowired
     public CorpService corpService;
@@ -48,19 +49,19 @@ public class CorpController extends BaseController<Corp>{
      * @return
      */
     @PostMapping("/indexMake")
-    public Object indexMake(@Valid @RequestBody CorpIndexHandle corpIndexHandle, @AuthUser User authUser, BindingResult bindingResult){
+    public Object indexMake(@Valid @RequestBody CorpIndexHandle corpIndexHandle, @AuthUser User authUser, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        if (authUser.getIsSuperAdmin() != 1){
+        if (authUser.getIsSuperAdmin() != 1) {
             corpIndexHandle.setUserId(authUser.getId());
         }
-        Map<String,Object> res = corpService.selectCorpList(corpIndexHandle);
+        Map<String, Object> res = corpService.selectCorpList(corpIndexHandle);
         return AjaxResult.success(res);
     }
 
     /*
-    *偷个懒，在控制器写这个
+     *偷个懒，在控制器写这个
      */
     @PostMapping("/loginInfo")
     @ResponseBody
@@ -71,14 +72,14 @@ public class CorpController extends BaseController<Corp>{
         String token = "Ij0dujMAh40oR0QfyH4Y6LDxrvY6bguEN0uoWwBJ";
         String client = "co_01";
         XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
-        int max=99999,min=10000;
-        Long timestamp = (System.currentTimeMillis()/1000);
+        int max = 99999, min = 10000;
+        Long timestamp = (System.currentTimeMillis() / 1000);
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Integer ran2 = (int) (Math.random()*(max-min)+min);
+        Integer ran2 = (int) (Math.random() * (max - min) + min);
 
         List<String> list = new ArrayList<String>();
         list.add(client);
@@ -86,27 +87,31 @@ public class CorpController extends BaseController<Corp>{
         list.add(timestamp.toString());
         list.add(ran2.toString());
         list.sort(Comparator.naturalOrder());
-        String imploded= StringUtils.join(list, "");
+        String imploded = StringUtils.join(list, "");
 
         String sign = DigestUtils.sha1Hex(imploded);
         System.out.println(list);
         System.out.println(sign);
         System.out.println(imploded);
         List<String> a = list;
-        Map<String,String> requestParams = new HashMap<>();
-
-        requestParams.put("type","workwechat");
-        requestParams.put("client_id",client);
-        requestParams.put("signature",sign);
-        requestParams.put("nonce",ran2.toString());
-        requestParams.put("timestamp",timestamp.toString());
-        requestParams.put("mobile_id",handle.getMobile().toString());
-        requestParams.put("uuid",handle.getUuid());
-
-        String url = HttpUtils.getRqstUrl("http://account.kwnpv.com/onekeyload/workwechat",requestParams);
-        return AjaxResult.success("ok",url);
+        Map<String, String> requestParams = new HashMap<>();
+
+        requestParams.put("type", "workwechat");
+        requestParams.put("client_id", client);
+        requestParams.put("signature", sign);
+        requestParams.put("nonce", ran2.toString());
+        requestParams.put("timestamp", timestamp.toString());
+        requestParams.put("mobile_id", handle.getMobile().toString());
+        requestParams.put("uuid", handle.getUuid());
+
+        String url = HttpUtils.getRqstUrl("http://account.kwnpv.com/onekeyload/workwechat", requestParams);
+        return AjaxResult.success("ok", url);
     }
 
+    @PostMapping("/selectList")
+    public Object selectList() {
+        return AjaxResult.success(corpService.list(new LambdaQueryWrapper<Corp>().orderByAsc(Corp::getId)));
+    }
 
 
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxMobileMapper.xml

@@ -25,6 +25,7 @@
         <result column="wx_appid" property="wxAppid"/>
         <result column="bank_card_no" property="bankCardNo" />
         <result column="bank_card_mobile_no" property="bankCardMobileNo" />
+        <result column="work_wx_corp_id" property="workWxCorpId" />
         <result column="work_wx_corp" property="workWxCorp" />
         <result column="work_wx_register_at" property="workWxRegisterAt" />
         <result column="work_wx_status" property="workWxStatus" />
@@ -38,7 +39,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , station_id, mobile_code, mobile_unio_code, mobile_no, mobile_operator, mobile_create_at, mobile_advance_pay_amt, mobile_combo, mobile_combo_flow, mobile_real_name, mobile_identity_card_no, status, wx_status, wx_password, wx_real_name, wx_identity_card_no, wx_register_at, wx_appid, bank_card_no, bank_card_mobile_no, work_wx_corp, work_wx_register_at, work_wx_status, in_pool, task_start_at, code_url, create_at, update_at
+        , station_id, mobile_code, mobile_unio_code, mobile_no, mobile_operator, mobile_create_at, mobile_advance_pay_amt, mobile_combo, mobile_combo_flow, mobile_real_name, mobile_identity_card_no, status, wx_status, wx_password, wx_real_name, wx_identity_card_no, wx_register_at, wx_appid, bank_card_no, bank_card_mobile_no, work_wx_corp_id, work_wx_corp, work_wx_register_at, work_wx_status, in_pool, task_start_at, code_url, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile">
         SELECT * FROM pan_fosterwx_mobile

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobile.java

@@ -137,6 +137,11 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     private String bankCardMobileNo;
 
     /**
+     * 企业微信id
+     */
+    private Integer workWxCorpId;
+
+    /**
      * 企业微信主体
      */
     private String workWxCorp;
@@ -344,6 +349,14 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
         this.bankCardMobileNo = bankCardMobileNo;
     }
 
+    public Integer getWorkWxCorpId() {
+        return workWxCorpId;
+    }
+
+    public void setWorkWxCorpId(Integer workWxCorpId) {
+        this.workWxCorpId = workWxCorpId;
+    }
+
     public String getWorkWxCorp() {
         return workWxCorp;
     }
@@ -429,6 +442,7 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
                 ", wxAppid=" + wxAppid +
                 ", bankCardNo=" + bankCardNo +
                 ", bankCardMobileNo=" + bankCardMobileNo +
+                ", workWxCorpId=" + workWxCorpId +
                 ", workWxCorp=" + workWxCorp +
                 ", workWxRegisterAt=" + workWxRegisterAt +
                 ", workWxStatus=" + workWxStatus +