user/role/tright 6.6

还需要调用其他服务

src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java

@@ -29,6 +29,52 @@ public class CompanyManagementController {
     @Autowired
     CompanyService companyServiceImpl;
 
+    /**y
+     * 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
+     * @param reqVo 公司以及公司扩展表信息
+     * @return 公司信息
+     */
+    @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
+        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
+    }
+
+    private void checkCompany(SaveCompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("account",reqVo.getAccount())
+                .notBlankCheck("companyType",reqVo.getCompanyType())
+                .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
+                .notBlankCheck("merchantName",reqVo.getMerchantName())
+                .notBlankCheck("merchantAddress",reqVo.getMerchantAddress())
+                .notBlankCheck("companyName",reqVo.getCompanyName())
+                .notBlankCheck("companyAddress",reqVo.getCompanyAddress())
+                .notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
+                .notBlankCheck("contactName",reqVo.getContactName())
+                .notBlankCheck("contactCode",reqVo.getContactCode())
+                .checkIdCard("contactCode",reqVo.getContactCode())
+                .notBlankCheck("contactPhone",reqVo.getContactPhone())
+                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
+                .checkException();
+    }
+
+
+    /**
+     * 添加公司提交按钮
+     * @param reqVo 封装了公司id和验证码的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult companySubmit(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .notBlankCheck("verifyCode",reqVo.getVerifyCode())
+                .checkException();
+        companyServiceImpl.companySubmit(reqVo);
+        return new ResponseResult();
+    }
+
     /**y
      * 商户查看详情，根据公司id返回用户信息和公司主表信息
      * @param reqVo 包含公司id的请求对象
@@ -61,12 +107,12 @@ public class CompanyManagementController {
      * @return 二维码url
      */
     @RequestMapping(value = "/generateQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
+    public Object generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .notBlankCheck("select",reqVo.getSelect())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));
+        return companyServiceImpl.generateQrCodeUrl(reqVo);
     }
 
     /**y
@@ -202,4 +248,17 @@ public class CompanyManagementController {
         companyServiceImpl.batchUpdate(reqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<CompanyVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.myInvite(reqVo));
+    }
 }

src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java

@@ -67,6 +67,11 @@ public class PangdingManagementController {
      */
     @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
+        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
+    }
+
+    private void checkCompany(SaveCompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("account",reqVo.getAccount())
                 .notBlankCheck("companyType",reqVo.getCompanyType())
@@ -82,7 +87,6 @@ public class PangdingManagementController {
                 .notBlankCheck("contactPhone",reqVo.getContactPhone())
                 .checkPhoneNo("contactPhone",reqVo.getContactPhone())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
     }
 
 
@@ -92,7 +96,8 @@ public class PangdingManagementController {
      * @return
      */
     @RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult companySubmit(@RequestBody CompanySubmitReqVo reqVo){
+    public ResponseResult companySubmit(@RequestBody SaveCompanyReqVo reqVo){
+        checkCompany(reqVo);
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .notBlankCheck("verifyCode",reqVo.getVerifyCode())
@@ -258,4 +263,17 @@ public class PangdingManagementController {
         companyServiceImpl.batchDelete(reqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<CompanyVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.myInvite(reqVo));
+    }
 }

src/main/java/com/pangding/web/authority/controller/RoleController.java

@@ -2,6 +2,7 @@ package com.pangding.web.authority.controller;
 
 
 import com.pangding.web.authority.vo.RoleVo;
+import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * @author zhangjinyao
@@ -60,7 +63,7 @@ public class RoleController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult listRoles(@RequestBody ListRoleReqVo req){
+    public ResponseResult<List<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",req.getCompanyId())
                 .checkException();

src/main/java/com/pangding/web/authority/controller/UserController.java

 package com.pangding.web.authority.controller;
 
 
+import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * @author zhangjinyao
@@ -79,5 +82,4 @@ public class UserController {
                 .checkException();
         return ResponseResult.result(userServiceImpl.getUserById(webUserReqVo.getId()));
     }
-
 }

src/main/java/com/pangding/web/authority/dao/UserDao.java

 package com.pangding.web.authority.dao;
 
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
@@ -56,4 +57,11 @@ public interface UserDao extends BaseDao {
     PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
 
     UserVo getSuperAdmin(UserGetSuperAdminReqVo reqVo);
+
+    /**
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
+     */
+    PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java

@@ -28,7 +28,8 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("companyName","and company_name = ? ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")
-                .add("status","and status = ?");
+                .add("examineStatus","and examine_status = ?")
+                .add("companyId","and pid = ? ");
     }
 
     @Override

src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java

@@ -2,6 +2,7 @@ package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.UserDao;
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
@@ -22,6 +23,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
     private static final String CHECK_PHONE = "CHECK_PHONE";
     private static final String GET_SUPER_ADMIN = "GET_SUPER_ADMIN";
+    private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE";
 
     @Override
     protected void init() {
@@ -37,6 +39,11 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
                 .add("superAdminRoleId","and ur.role_id = ?")
                 .add("companyId","and u.company_id = ? ");
 
+        table.add(COUNT_BY_ROLE,"select u.* from pd_user u,pd_user_role ur where WHERE u.id = ur.user_id")
+                .add("companyId","and u.company_id = ? ")
+                .add("roleId","and ur.role_id = ? ")
+                .add("query","and u.name = ? or u.account = ? or phone = ?");
+
     }
 
     @Override
@@ -68,4 +75,9 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     public UserVo getSuperAdmin(UserGetSuperAdminReqVo reqVo) {
         return this.queryFirst(UserVo.class,GET_SUPER_ADMIN,reqVo);
     }
+
+    @Override
+    public PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo) {
+        return this.queryPage(UserVo.class,reqVo,COUNT_BY_ROLE,reqVo);
+    }
 }

src/main/java/com/pangding/web/authority/feign/WxFeign.java

+package com.pangding.web.authority.feign;
+
+import com.pangding.web.authority.vo.WxVo;
+import com.pangding.web.authority.vo.reqvo.QrCodeReqVo;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 16:20
+ */
+@FeignClient(value="pd-interface-wx")
+@RequestMapping(value="/wx")
+public interface WxFeign {
+    /**
+     * 获取二维码
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/qcCodeGet")
+    public ResponseResult<WxVo> qcCodeGet(@RequestBody QrCodeReqVo req);
+}

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -63,7 +63,7 @@ public interface CompanyService{
      * @param reqVo 封装了公司id和验证码的请求对象
      * @return
      */
-    void companySubmit(CompanySubmitReqVo reqVo);
+    void companySubmit(SaveCompanyReqVo reqVo);
 
     /**
      * 仅将公司状态设置为12（停用）
@@ -142,4 +142,11 @@ public interface CompanyService{
      * @return
      */
     void batchUpdate(BatchUpdateReqVo reqVo) throws Exception;
+
+    /**
+     * 通过公司id查询该公司邀请的公司
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/service/RoleService.java

@@ -60,7 +60,7 @@ public interface RoleService {
      * @param reqVo 封装了公司id和权限id的请求对象
      * @return 用户列表
      */
-    List<UserVo> countByRole(CountByRoleReqVo reqVo);
+    List<UserVo> count(CountByRoleReqVo reqVo);
 
     /**
      * 通过角色id查询该角色权限id列表
@@ -101,4 +101,11 @@ public interface RoleService {
      */
     void delete(WebRoleReqVo webRoleReqVo);
 
+    /**
+     * 获取该公司该角色已分配的角色列表
+     * @param reqVo 封装了公司id和权限id的请求对象
+     * @return 用户列表
+     */
+    PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo);
+
 }

src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java

@@ -145,7 +145,7 @@ public class RoleServiceImpl implements RoleService {
             CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo();
             countByRoleReqVo.setCompanyId(req.getCompanyId());
             countByRoleReqVo.setRoleId(roleVo.getId());
-            List<UserVo> userVoList = countByRole(countByRoleReqVo);
+            List<UserVo> userVoList = count(countByRoleReqVo);
             if (null == userVoList || userVoList.isEmpty()){
                 resVo.setCount(0);
             }
@@ -163,7 +163,7 @@ public class RoleServiceImpl implements RoleService {
      * @return 用户列表
      */
     @Override
-    public List<UserVo> countByRole(CountByRoleReqVo reqVo) {
+    public List<UserVo> count(CountByRoleReqVo reqVo) {
         UserRoleGetReqVo getReqVo = new UserRoleGetReqVo();
         getReqVo.setRoleId(reqVo.getRoleId());
         List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(getReqVo,UserRoleVo.class);
@@ -268,4 +268,9 @@ public class RoleServiceImpl implements RoleService {
         RoleVo roleVo = this.getRoleById(webRoleReqVo);
         this.deleteRole(roleVo);
     }
+
+    @Override
+    public PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo) {
+        return userDaoImpl.countByRole(reqVo);
+    }
 }

src/main/java/com/pangding/web/authority/vo/Scene.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 17:09
+ */
+public class Scene extends BaseVo {
+    /**
+     * 场景值ID，临时二维码时为32位非0整型，永久二维码时最大值为100000（目前参数只支持1--100000）
+     */
+    private String scene_id;
+    /**
+     * 场景值ID（字符串形式的ID），字符串类型，长度限制为1到64
+     */
+    private String scene_str;
+
+    public String getScene_id() {
+        return scene_id;
+    }
+
+    public void setScene_id(String scene_id) {
+        this.scene_id = scene_id;
+    }
+
+    public String getScene_str() {
+        return scene_str;
+    }
+
+    public void setScene_str(String scene_str) {
+        this.scene_str = scene_str;
+    }
+}

src/main/java/com/pangding/web/authority/vo/SceneInfo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 16:31
+ */
+public class SceneInfo extends BaseVo {
+    private Scene scene;
+
+    public Scene getScene() {
+        return scene;
+    }
+
+    public void setScene(Scene scene) {
+        this.scene = scene;
+    }
+}

src/main/java/com/pangding/web/authority/vo/WxVo.java

+package com.pangding.web.authority.vo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 17:43
+ */
+public class WxVo {
+    private String gcCodeId;
+
+    private String ticket;
+
+    private String expireSeconds;
+
+    private String wxUrl;
+
+    private String pdUrl;
+
+    private String scenicInfo;
+
+    private String codeType;
+
+    public String getGcCodeId() {
+        return gcCodeId;
+    }
+
+    public void setGcCodeId(String gcCodeId) {
+        this.gcCodeId = gcCodeId;
+    }
+
+    public String getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(String ticket) {
+        this.ticket = ticket;
+    }
+
+    public String getExpireSeconds() {
+        return expireSeconds;
+    }
+
+    public void setExpireSeconds(String expireSeconds) {
+        this.expireSeconds = expireSeconds;
+    }
+
+    public String getWxUrl() {
+        return wxUrl;
+    }
+
+    public void setWxUrl(String wxUrl) {
+        this.wxUrl = wxUrl;
+    }
+
+    public String getPdUrl() {
+        return pdUrl;
+    }
+
+    public void setPdUrl(String pdUrl) {
+        this.pdUrl = pdUrl;
+    }
+
+    public String getScenicInfo() {
+        return scenicInfo;
+    }
+
+    public void setScenicInfo(String scenicInfo) {
+        this.scenicInfo = scenicInfo;
+    }
+
+    public String getCodeType() {
+        return codeType;
+    }
+
+    public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/CountByRoleReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
+import com.yanzuoguang.util.vo.PageSizeData;
+
 /**
  * @Author zhangjinyao
  * @create 2019/6/3 15:50
  */
-public class CountByRoleReqVo {
+public class CountByRoleReqVo extends PageSizeData {
     private String reqId;
 
     private String roleId;
 
     private String companyId;
 
+    private String query;
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
     public String getReqId() {
         return reqId;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/ListCompanyReqVo.java

@@ -15,7 +15,17 @@ public class ListCompanyReqVo extends PageSizeReqVo {
 
     private String companyAttribute;
 
-    private String status;
+    private String examineStatus;
+
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
 
     public String getCompanyName() {
         return companyName;
@@ -41,12 +51,12 @@ public class ListCompanyReqVo extends PageSizeReqVo {
         this.companyAttribute = companyAttribute;
     }
 
-    public String getStatus() {
-        return status;
+    public String getExamineStatus() {
+        return examineStatus;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setExamineStatus(String examineStatus) {
+        this.examineStatus = examineStatus;
     }
 
     public String getReqId() {

src/main/java/com/pangding/web/authority/vo/reqvo/QrCodeReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.pangding.web.authority.vo.SceneInfo;
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 16:23
+ */
+public class QrCodeReqVo extends BaseVo {
+    /**
+     * 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒。
+     */
+    private int expire_seconds;
+    /**
+     * 二维码类型，QR_SCENE为临时的整型参数值，QR_STR_SCENE为临时的字符串参数值，QR_LIMIT_SCENE为永久的整型参数值，QR_LIMIT_STR_SCENE为永久的字符串参数值
+     */
+    private String action_name;
+    /**
+     * 二维码详细信息
+     */
+    private SceneInfo action_info;
+    /**
+     * 二维码下载标识
+     */
+    private String ticket;
+
+    public String getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(String ticket) {
+        this.ticket = ticket;
+    }
+
+    public int getExpire_seconds() {
+        return expire_seconds;
+    }
+
+    public void setExpire_seconds(int expire_seconds) {
+        this.expire_seconds = expire_seconds;
+    }
+
+    public String getAction_name() {
+        return action_name;
+    }
+
+    public void setAction_name(String action_name) {
+        this.action_name = action_name;
+    }
+
+    public SceneInfo getAction_info() {
+        return action_info;
+    }
+
+    public void setAction_info(SceneInfo action_info) {
+        this.action_info = action_info;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/QueryUserReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/6 11:07
+ */
+public class QueryUserReqVo {
+    private String query;
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/SaveCompanyReqVo.java

@@ -5,8 +5,10 @@ package com.pangding.web.authority.vo.reqvo;
  * @create 2019/6/4 16:52
  */
 public class SaveCompanyReqVo {
+
     private String reqId;
 
+    private String id;
     /**
      * 用户名
      */
@@ -103,6 +105,24 @@ public class SaveCompanyReqVo {
 
     private String userId;
 
+    private String verifyCode;
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getCompanyExtendId() {
         return companyExtendId;
     }