新增公司消息

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

@@ -50,7 +50,7 @@ public class CompanyController {
         CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
                 .notBlankCheck("agreementCode", req.getAgreementCode())
                 .checkException();
-        return ResponseResult.result(companyAgreementService.checkAgreement(req));
+        return ResponseResult.resultAllowNull(companyAgreementService.checkAgreement(req));
     }
 
     @RequestMapping(value = "saveComapnyAgreement")

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.service.CompanyMsgService;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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(value = "/companyMsg", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "公司消息类", description = "公司消息等相关操作")
+public class CompanyMagController {
+
+    @Autowired
+    private CompanyMsgService companyMsgService;
+
+
+    @RequestMapping(value = "/getListAgreement")
+    @ApiOperation(value = "获取公司消息列表", notes = "返回公司消息列表")
+    public ResponseResult<PageSizeData<CompanyMsgResVo>> getCompanyMsgList(@RequestBody CompanyMsgReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId", req.getCompanyId())
+                .checkException();
+        return ResponseResult.result(companyMsgService.findCompanyMsgList(req));
+    }
+
+}

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

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.vo.reqvo.CompanyMsgReqVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyMsgResVo;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -10,4 +12,7 @@ public interface CompanyMsgDao extends BaseDao{
 
     List<GetCompanyMsgResVo> findCompanyMsgList(CompanyMsgReqVo req);
 
+
+    PageSizeData<CompanyMsgResVo> findPageCompanyMsgList(CompanyMsgReqVo req);
+
 }

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

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.CompanyMsgDao;
-import com.pangding.web.authority.vo.reqvo.CompanyMsgReqVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyMsgResVo;
 import com.pangding.web.vo.system.pd.CompanyMsgVo;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -12,6 +14,8 @@ import java.util.List;
 @Component
 public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
 
+    private static final String QUERY_LIST_PAGE = "QUERY_LIST_PAGE";
+
     private static final String QUERY_LIST = "QUERY_LIST";
 
     @Override
@@ -19,7 +23,7 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
 
         register(CompanyMsgVo.class);
 
-        table.add(QUERY_LIST, "select m.*,cm.company_id,cm.type,cm.merchant_id " +
+        table.add(QUERY_LIST_PAGE, "select m.*,cm.company_id,cm.type,cm.merchant_id " +
                 "from pd_company_msg cm left join pd_msg m on cm.msg_id = m.id where 1=1 ")
                 .add("companyId", "and cm.company_id = ? ")
                 .add("", " AND cm.merchantId = ? ")
@@ -29,7 +33,12 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
 
     @Override
     public List<GetCompanyMsgResVo> findCompanyMsgList(CompanyMsgReqVo req) {
-        return this.query(GetCompanyMsgResVo.class, QUERY_LIST, req);
+        return this.query(GetCompanyMsgResVo.class, QUERY_LIST_PAGE, req);
+    }
+
+    @Override
+    public PageSizeData<CompanyMsgResVo> findPageCompanyMsgList(CompanyMsgReqVo req) {
+        return this.queryPage(CompanyMsgResVo.class, req, QUERY_LIST_PAGE, req);
     }
 
 }

src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java

 package com.pangding.web.authority.mq;
 
+import com.pangding.web.authority.service.CompanyMsgService;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.constant.MqConstant;
 import com.pangding.web.mq.CompanyProducer;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
 import com.rabbitmq.client.Channel;
 import com.yanzuoguang.mq.service.MqService;
@@ -28,6 +30,8 @@ public class CompanyConsumer {
     private MqService mqService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private CompanyMsgService companyMsgService;
 
 
     /**
@@ -58,6 +62,19 @@ public class CompanyConsumer {
         }
     }
 
+    @RabbitListener(queues = {MqConstant.COMPANY_MSG})
+    public void saveComapnyMsg(String content, Message message, Channel channel) {
+        log.info("[saveComapnyMsg 监听的消息] - [消费时间] - [{}] - [{}]", DateHelper.getNow(), content);
+        try {
+            CompanyMsgReqVo companyMsgReqVo = JsonHelper.deserialize(content, CompanyMsgReqVo.class);
+            companyMsgService.saveCompanyMsg(companyMsgReqVo);
+        } catch (Exception e) {
+            Log.error(CompanyConsumer.class, e);
+        } finally {
+            mqService.basicAck(message, channel);
+        }
+    }
+
 
 //    @RabbitListener(queues = {MqConstant.COMPANY_MONEY_UPDATE})
 //    public void UpdateCompanyMoney(String content, Message message, Channel channel) {

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

+package com.pangding.web.authority.service;
+
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+
+public interface CompanyMsgService {
+
+    /**
+     * 找到公司消息列表
+     * @param req
+     * @return
+     */
+    PageSizeData<CompanyMsgResVo> findCompanyMsgList(CompanyMsgReqVo req);
+
+
+    /**
+     * 保存公司消息
+     * @param reqVo
+     * @return
+     */
+    ResponseResult saveCompanyMsg(CompanyMsgReqVo reqVo);
+
+}

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

@@ -5,8 +5,10 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -167,6 +169,8 @@ public interface CompanyService{
      */
     GetCompanyResVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo);
 
+
+
     /**
      * 获得公司分润信息
      * @param req

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

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.CompanyMsgDao;
+import com.pangding.web.authority.service.CompanyMsgService;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CompanyMsgServiceImpl implements CompanyMsgService{
+
+    @Autowired
+    private CompanyMsgDao companyMsgDao;
+
+
+    @Override
+    public PageSizeData<CompanyMsgResVo> findCompanyMsgList(CompanyMsgReqVo req){
+        return companyMsgDao.findPageCompanyMsgList(req);
+    }
+
+    @Override
+    public ResponseResult saveCompanyMsg(CompanyMsgReqVo reqVo){
+
+        companyMsgDao.create(reqVo);
+
+        return ResponseResult.result("处理成功");
+    }
+
+}

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

@@ -25,9 +25,11 @@ import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
+import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
 import com.pangding.web.vo.system.res.company.CompanyMoneyDetailResVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
@@ -700,12 +702,12 @@ public class CompanyServiceImpl implements CompanyService {
             companyMsgVo = new CompanyMsgVo();
             companyMsgVo.setId(StringHelper.getNewID());
             companyMsgVo.setCompanyId(companyResVo.getId());
-            companyMsgVo.setMerchantId("");
+            companyMsgVo.setMerchantId(reqVo.getMerchantId());
             companyMsgVo.setCompanyName(companyResVo.getCompanyName());
             companyMsgVo.setMerchantName("");
             companyMsgVo.setMsgId("4");
             companyMsgVo.setMsgLocation(1);
-            companyMsgVo.setType(1);
+            companyMsgVo.setType(companyResVo.getCompanyAttribute());
             companyMsgDao.create(companyMsgVo);
         }
         return url;
@@ -1165,4 +1167,6 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
 
+
+
 }

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

-package com.pangding.web.authority.vo.reqvo;
-
-public class CompanyMsgReqVo {
-
-    private String companyId;
-
-    private int type;
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-}