修改app注册

pom.xml

@@ -36,8 +36,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.pangding.web</groupId>
-            <artifactId>pd-upload-feign</artifactId>
+            <groupId>com.yanzuoguang</groupId>
+            <artifactId>yzg-util-mq</artifactId>
         </dependency>
     </dependencies>
 

src/main/java/com/pangding/web/UserApp.java

@@ -15,7 +15,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "org.springframework.jdbc.*"
 })
 @EnableEurekaClient
-@EnableFeignClients
+@EnableFeignClients(basePackages={
+        "com.pangding.*",
+        "com.yanzuoguang.*"
+})
 public class UserApp {
 
     public static void main(String[] args) {

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

+package com.pangding.web.authority.controller;
+
+
+import com.pangding.web.authority.service.CompanyService;
+import com.pangding.web.vo.system.req.company.CompanyReqVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/newCompany")
+public class CompanyCtroller {
+
+    @Autowired
+    private CompanyService companyService;
+
+    @RequestMapping(value = "/findCompanyBalance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult findCompanyBalance(@RequestBody CompanyReqVo req){
+        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+        return ResponseResult.result(companyService.findCompanyBalance(req));
+    }
+
+
+
+}

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

@@ -3,7 +3,7 @@ package com.pangding.web.authority.controller;
 import com.pangding.web.authority.service.RegisterService;
 import com.pangding.web.authority.service.VerifyCodeService;
 import com.pangding.web.authority.vo.cloudvo.LoginResVo;
-import com.pangding.web.authority.vo.reqvo.LoginReqVo;
+import com.pangding.web.vo.system.req.LoginReqVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,38 +41,6 @@ public class LoginController {
                 .notBlankCheck("password",reqVo.getPassword())
                 .checkException();
         return ResponseResult.result(registerServiceImpl.login(reqVo));
-        /*ResponseResult result = new ResponseResult();*//*
-        if (LoginConstant.PERSONAL_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
-            *//*result.setCode("00");
-            result.setMessage("个人基本信息未完善，跳转个人完善页面");
-            reqVo.setPassword("");
-            reqVo.setCode("01");
-            result.setData(reqVo);*//*
-            resVo.setCode();
-            return result;
-        }else if (LoginConstant.COMPANY_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
-            result.setCode("00");
-            result.setMessage("公司基本信息未完善，跳转公司完善页面");
-            reqVo.setPassword("");
-            reqVo.setCode("02");
-            result.setData(reqVo);
-            return result;
-        }else if (LoginConstant.HAVE_NO_BANK_CARD.equals(resVo.getCode())){
-            result.setCode("00");
-            result.setMessage("还未添加银行卡，跳转添加银行卡页面");
-            reqVo.setPassword("");
-            reqVo.setCode("03");
-            result.setData(reqVo);
-            return result;
-        }else if (LoginConstant.NOT_SIGNING.equals(resVo.getCode())){
-            result.setCode("00");
-            result.setMessage("未签约，跳转签约页面");
-            reqVo.setPassword("");
-            reqVo.setCode("04");
-            result.setData(reqVo);
-            return result;
-        }*/
-        /*return ResponseResult.result(resVo);*/
     }
 
     /*@RequestMapping(value = "/computer", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)

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

 package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.TokenService;
-import com.pangding.web.authority.vo.LoginVo;
-import com.pangding.web.authority.vo.reqvo.LoginReqVo;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
+import com.pangding.web.vo.system.req.LoginReqVo;
+import com.pangding.web.vo.system.req.company.CompanyKeyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyKeyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,19 @@ public class TokenController {
     @Autowired
     private TokenService tokenService;
 
+
+    /**
+     * 获取分销商key
+     */
+    @RequestMapping(value = "/getCompanyKey", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<CompanyKeyResVo> getCompanyKey(@RequestBody CompanyKeyReqVo companyKeyReqVo) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId", companyKeyReqVo.getCompanyId())
+                .checkException(companyKeyReqVo);
+
+        return ResponseResult.result(tokenService.getCompanyKey(companyKeyReqVo));
+    }
+
     /**
      * 登录实体创建
      *
@@ -47,7 +62,7 @@ public class TokenController {
      * @param loginVo 登录信息
      */
     @RequestMapping(value = "/load", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<LoginVo> load(@RequestBody LoginReqVo loginVo) {
+    public ResponseResult<LoginTokenVo> load(@RequestBody LoginReqVo loginVo) {
         CheckerHelper.newInstance()
                 .notBlankCheck("token", loginVo.getToken())
                 .checkException(loginVo);

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

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CompanyKeyDao extends BaseDao {
+}

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

@@ -33,6 +33,8 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
                 .add("id","and pid = ? ")
                 .add("pid","and pid = ? ")
                 .add("sort","and sort = ? ")
+                .add("search", "and (name like concat(?,'%') " +
+                        "or alias like concat(?,'%')) " )
                 .add("levelOne","and pid = '' order by sort asc");
 
         table.add(GET_LEVEL_ONE,"select * from pd_authority where 1=1 ")

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

@@ -16,7 +16,8 @@ public class CompanyDivideRuleDaoImpl extends BaseDaoImpl implements CompanyDivi
     protected void init() {
         register(CompanyDivideRuleVo.class);
 
-        table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name from pd_company_divide_rule cdr left join pd_company c on c.id = cdr.company_id " +
+        table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name from pd_company_divide_rule cdr " +
+                "left join pd_company c on c.id = cdr.company_id " +
                 "left join pd_company_extend ce on c.id = ce.id where 1=1 ")
         .add("companyId"," and cdr.company_id = ?");
     }

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

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.CompanyKeyDao;
+import com.pangding.web.vo.system.pd.company.CompanyKeyVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyKeyDaoImpl extends BaseDaoImpl implements CompanyKeyDao {
+
+    @Override
+    protected void init() {
+        register(CompanyKeyVo.class);
+    }
+
+}

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

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.TokenDao;
-import com.pangding.web.authority.vo.LoginVo;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
@@ -21,7 +21,7 @@ public class TokenDaoImpl extends BaseDaoImpl implements TokenDao {
     @Override
     protected void init() {
         // 根据实体生成增删改查语句
-        register(LoginVo.class);
+        register(LoginTokenVo.class);
 
         cacheList.setClearSecond(TOKEN_MEMORY_CACHE_TIME);
     }

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

@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
+import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 
@@ -179,4 +180,12 @@ public interface CompanyService{
     void examineConfig(ExamineConfigReqVo reqVo);
 
     ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req);
+
+
+    /**
+     * 找到公司信息及公司余额明细
+     * @param req
+     * @return
+     */
+    FindCompanyBalanceResVo findCompanyBalance(com.pangding.web.vo.system.req.company.CompanyReqVo req);
 }

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

@@ -6,6 +6,7 @@ import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import com.pangding.web.vo.system.req.LoginReqVo;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

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

 package com.pangding.web.authority.service;
 
 
-import com.pangding.web.authority.vo.LoginVo;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
+import com.pangding.web.vo.system.req.company.CompanyKeyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyKeyResVo;
 
 /**
  * 登录服务
@@ -9,25 +11,27 @@ import com.pangding.web.authority.vo.LoginVo;
  * @author 颜佐光
  */
 public interface TokenService {
+
+    CompanyKeyResVo getCompanyKey(CompanyKeyReqVo companyKeyReqVo);
     /**
      * 保存接口请求日志
      *
      * @param loginVo 请求数据
      * @retur 保存主键
      */
-    String save(LoginVo loginVo);
+    String save(LoginTokenVo loginVo);
     /**
      * 保存接口请求日志
      *
      * @param loginVo 请求数据
      * @retur 保存主键
      */
-    LoginVo load(LoginVo loginVo);
+    LoginTokenVo load(LoginTokenVo loginVo);
     /**
      * 保存接口请求日志
      *
      * @param loginVo 请求数据
      * @retur 保存主键
      */
-    int remove(LoginVo loginVo);
+    int remove(LoginTokenVo loginVo);
 }

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

@@ -12,6 +12,8 @@ import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.util.RSAUtils;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
+import com.pangding.web.vo.system.req.LoginReqVo;
 import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -366,7 +368,7 @@ public class RegisterServiceImpl implements RegisterService {
             userVo = userServiceImpl.getUserByAccount(accountOrPhone);
         }
         if (userVo == null){
-            throw new CodeException("用户名或密码错误");
+            throw new CodeException("用户名不存在");
         }
 
         /*通过私钥将rsa加密的密码解密*/
@@ -389,12 +391,16 @@ public class RegisterServiceImpl implements RegisterService {
         resVo.setCompanyResVo(loginCompanyResVo);
         reqVo.setToken(token);
 
-        LoginVo loginVo = new LoginVo();
+        LoginTokenVo loginVo = new LoginTokenVo();
         loginVo.setToken(token);
+        loginVo.setDataPwd(token);
         loginVo.setData(JsonHelper.serialize(reqVo));
         loginVo.setExpairTime(DateHelper.getNow());
         tokenService.save(loginVo);
         TokenHelper.write(token,loginVo);
+        // TODO
+        // LoginTokenVo longVo1 =  TokenHelper.get(false,LoginTokenVo.class);
+        // System.out.println("loning=====" + JsonHelper.serialize(longVo1));
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         getReqVo.setCompanyId(companyVo.getId());
         List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);
@@ -485,7 +491,7 @@ public class RegisterServiceImpl implements RegisterService {
                 AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
                 authorityGetReqVo.setId(authorityIdList.get(i));
                 AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
-                if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
+                if (!StringHelper.isEmpty(authorityVo) && StringHelper.isEmpty(authorityVo.getPid())){
                     levelOneList.add(authorityVo);
                     authorityIdList.set(i,"");
                 }
@@ -513,6 +519,7 @@ public class RegisterServiceImpl implements RegisterService {
         }
 
         resVo.setCode("00");
+        System.out.println(JsonHelper.serialize(resVo));
         return resVo;
     }
 

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

 package com.pangding.web.authority.service.impl;
 
+import com.pangding.web.authority.dao.CompanyKeyDao;
 import com.pangding.web.authority.dao.TokenDao;
 import com.pangding.web.authority.service.TokenService;
-import com.pangding.web.authority.vo.LoginVo;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
+import com.pangding.web.vo.system.req.company.CompanyKeyReqVo;
+import com.pangding.web.vo.system.res.company.CompanyKeyResVo;
 import com.yanzuoguang.util.helper.JsonHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -13,12 +17,21 @@ import org.springframework.transaction.annotation.Transactional;
  *
  * @author 颜佐光
  */
-@Component
+@Service
 @Transactional(rollbackFor = Exception.class)
 public class TokenServiceImpl implements TokenService {
 
     @Autowired
     private TokenDao tokenDao;
+    @Autowired
+    private CompanyKeyDao companyKeyDao;
+
+    @Override
+    public CompanyKeyResVo getCompanyKey(CompanyKeyReqVo companyKeyReqVo){
+        CompanyKeyResVo companyKeyResVo = companyKeyDao.load(companyKeyReqVo, CompanyKeyResVo.class);
+        return companyKeyResVo;
+    }
+
 
     /**
      * 保存接口请求日志
@@ -26,8 +39,8 @@ public class TokenServiceImpl implements TokenService {
      * @param loginVo
      */
     @Override
-    public String save(LoginVo loginVo) {
-        LoginVo to = tokenDao.load(loginVo, LoginVo.class);
+    public String save(LoginTokenVo loginVo) {
+        LoginTokenVo to = tokenDao.load(loginVo, LoginTokenVo.class);
         if (JsonHelper.compare(to,loginVo)) {
             return to.getToken();
         } else if (to != null) {
@@ -44,8 +57,8 @@ public class TokenServiceImpl implements TokenService {
      * @retur 保存主键
      */
     @Override
-    public LoginVo load(LoginVo loginVo) {
-        return tokenDao.load(loginVo, LoginVo.class);
+    public LoginTokenVo load(LoginTokenVo loginVo) {
+        return tokenDao.load(loginVo, LoginTokenVo.class);
     }
 
     /**
@@ -55,7 +68,7 @@ public class TokenServiceImpl implements TokenService {
      * @retur 保存主键
      */
     @Override
-    public int remove(LoginVo loginVo) {
+    public int remove(LoginTokenVo loginVo) {
 
         return tokenDao.remove(loginVo);
     }

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

-package com.pangding.web.authority.vo;
-
-
-import com.yanzuoguang.dao.TableAnnotation;
-import com.yanzuoguang.util.helper.StringHelper;
-import com.yanzuoguang.util.vo.BaseVo;
-import com.yanzuoguang.util.vo.InitDao;
-
-/**
- * 日志服务表结构映射
- *
- * @author 颜佐光
- */
-@TableAnnotation("login_token")
-public class LoginVo extends BaseVo implements InitDao {
-    /**
-     * 编号,主键请放第一个
-     * 假如是一样的字段，则不需要写映射.下面的代码添加映射关系
-     */
-    private String token;
-    /**
-     * 数据密钥
-     */
-    @TableAnnotation("data_pwd")
-    private String dataPwd;
-
-    /**
-     * 登录数据
-     */
-    private String data;
-    /**
-     * 失效时间
-     */
-    @TableAnnotation("expair_time")
-    private String expairTime;
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getDataPwd() {
-        return dataPwd;
-    }
-
-    public void setDataPwd(String dataPwd) {
-        this.dataPwd = dataPwd;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public String getExpairTime() {
-        return expairTime;
-    }
-
-    public void setExpairTime(String expairTime) {
-        this.expairTime = expairTime;
-    }
-
-    @Override
-    public void init() {
-        this.token = StringHelper.getFirst(this.token);
-        this.dataPwd = StringHelper.getFirst(this.dataPwd);
-        this.data = StringHelper.getFirst(this.data);
-        this.expairTime = StringHelper.getFirstNull(this.expairTime);
-    }
-}

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

 package com.pangding.web.authority.vo.reqvo;
 
-import com.pangding.web.authority.vo.LoginVo;
+import com.pangding.web.vo.system.pd.LoginTokenVo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/27 15:17
  */
-public class ComputerLoginReqVo extends LoginVo {
+public class ComputerLoginReqVo extends LoginTokenVo {
     private String reqId;
 
     private int accountOrPhone;

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

@@ -11,6 +11,8 @@ public class ListAuthorityByPageReqVo extends PageSizeReqVo {
 
     private String levelOne;
 
+    private String search;
+
     public String getReqId() {
         return reqId;
     }
@@ -26,4 +28,12 @@ public class ListAuthorityByPageReqVo extends PageSizeReqVo {
     public void setLevelOne(String levelOne) {
         this.levelOne = levelOne;
     }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
 }

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

-package com.pangding.web.authority.vo.reqvo;
-
-
-import com.pangding.web.authority.vo.LoginVo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/14 11:46
- */
-public class LoginReqVo extends LoginVo {
-
-    private String reqId;
-
-    private String accountOrPhone;
-
-    private String password;
-
-    /**
-     * 返回状态码
-     * 01：个人基本信息未完善
-     * 02：公司基本信息未完善
-     * 03：未绑定银行卡
-     * 04：未签约
-     */
-    private String code;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getAccountOrPhone() {
-        return accountOrPhone;
-    }
-
-    public void setAccountOrPhone(String accountOrPhone) {
-        this.accountOrPhone = accountOrPhone;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getReqId() {
-        return reqId;
-    }
-
-    public void setReqId(String reqId) {
-        this.reqId = reqId;
-    }
-}

src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
   cloud:
     config:
       # base为所有服务的公共配置，pd-db-system为需要连接的数据库配置,${spring.application.name}为当前程序的配置，3个配置组合才为当前程序的启动配置
-      name: base,pd-db-user,${spring.application.name}
+      name: base,pd-db-user,pd-mq-mq,${spring.application.name}
       label: master
       fail-fast: true
       # 设置从服务中拿取配置