Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/MessageQO.java

+package com.mmc.iuav.user.model.qo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author han
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MessageQO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "页码", required = true, example = "1")
+    @NotNull(message = "页码不能为空", groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页显示数", required = true, example = "10")
+    @NotNull(message = "每页显示数不能为空", groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/NewMessageVO.java

+package com.mmc.iuav.user.model.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Admin
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class NewMessageVO {
+
+    @ApiModelProperty(value = "飞手列表新信息")
+    private int pilotMessage;
+
+    @ApiModelProperty(value = "加盟申请")
+    private int joinApplyMessage;
+
+    @ApiModelProperty(value = "商城订单信息")
+    private int orderMessage;
+
+    @ApiModelProperty(value = "未审核帖子信息")
+    private int dynamicMessage;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/SystemMessageVO.java

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author han
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SystemMessageVO implements Serializable {
+    private static final long serialVersionUID = 973044768156590099L;
+
+    @ApiModelProperty(value = "消息主题")
+    private String subject;
+
+    @ApiModelProperty(value = "消息内容")
+    private String content;
+}

cms-common/cms-common-util/src/main/java/com/mmc/iuav/page/PageResult.java

@@ -7,9 +7,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
 /**
- * @author 作者 geDuo
- * @version 创建时间：2021年8月28日 下午3:18:21
- * @explain 分页工具类
+ * @author 作者 han
  */
 @Data
 @AllArgsConstructor

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/client/ImsClient.java

@@ -45,4 +45,13 @@ public class ImsClient {
         ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(imsAppUri + "/release/licence/background/insertOrg", HttpMethod.POST, entity, ResultBody.class);
         return responseEntity.getBody();
     }
+
+    public int getDynamicMessageSum() {
+        HttpHeaders headers = new HttpHeaders();
+
+        HttpEntity<String> entity = new HttpEntity<>(null, headers);
+        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(imsAppUri + "/release/backstage/forum/getNotCheckDynamicSum", HttpMethod.GET, entity, ResultBody.class);
+        ResultBody body = responseEntity.getBody();
+        return (int) body.getResult();
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/client/OmsClient.java

+package com.mmc.iuav.user.client;
+
+
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.response.ResultEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author Admin
+ */
+@Component
+public class OmsClient {
+
+    @Value("${iuav.oms.uri}")
+    private String omsAppUri;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    public int getCountNewOrder() {
+        HttpHeaders headers = new HttpHeaders();
+        HttpEntity<String> entity = new HttpEntity<>(null, headers);
+        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(omsAppUri + "/oms/uav-order/getCountNewOrder", HttpMethod.GET, entity, ResultBody.class);
+        ResultBody body = responseEntity.getBody();
+        return (int) body.getResult();
+
+    }
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.BUserAccountQO;
 import com.mmc.iuav.user.model.vo.BUserAccountVO;
 import com.mmc.iuav.user.model.vo.BackUserAccountVO;
+import com.mmc.iuav.user.model.vo.NewMessageVO;
 import com.mmc.iuav.user.service.BackUserAccountService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,4 +90,13 @@ public class BackUserAccountController extends BaseController {
         return ResultBody.success(backUserAccountService.getBackUserAccountById(id));
     }
 
+
+    @ApiOperation("后台——消息提示")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = NewMessageVO.class)})
+    @GetMapping("getMessage")
+    public ResultBody getMessage() {
+        return backUserAccountService.getMessage();
+    }
+
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java

+package com.mmc.iuav.user.controller;
+
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.qo.MessageQO;
+import com.mmc.iuav.user.model.vo.SystemMessageVO;
+import com.mmc.iuav.user.service.MessageService;
+import io.swagger.annotations.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@Api(tags = "消息管理")
+@RequestMapping("/message/")
+@RestController
+public class MessageController  extends BaseController{
+    @Resource
+    private MessageService messageService;
+
+    @ApiOperation(value = "后台发布消息——新增系统消息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/insertSystemMessage")
+    public ResultBody insertSystemMessage(@RequestBody SystemMessageVO messageVO){
+        return messageService.insertSystemMessage(messageVO);
+    }
+
+    @ApiOperation(value = "后台——根据ID查询系统消息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/selectSystemMessageById")
+    public ResultBody selectSystemMessageById(@ApiParam(value = "消息ID") @RequestParam Integer id){
+        return messageService.selectSystemMessageById(id);
+    }
+    @ApiOperation(value = "后台——系统消息列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/selectAllSystemMessage")
+    public ResultBody selectAllSystemMessage(@RequestBody MessageQO messageQO){
+        return ResultBody.success(messageService.selectAllSystemMessage(messageQO));
+    }
+
+    @ApiOperation(value = "后台——删除消息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/removeMessage")
+    public ResultBody removeMessage(@ApiParam(value = "消息ID") @RequestParam Integer id){
+        return messageService.removeMessage(id);
+    }
+
+    @ApiOperation(value = "用户——系统消息列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/systemMessageListByUser")
+    public ResultBody selectAllSystemMessageByUser(HttpServletRequest request,@RequestBody MessageQO messageQO){
+        Integer userId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+        return ResultBody.success(messageService.selectAllSystemMessageByReceive(userId,messageQO));
+    }
+    @ApiOperation(value = "用户查看——系统消息详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/showSystemMessageByUser")
+    public ResultBody showSystemMessageByUser(HttpServletRequest request,@ApiParam(value = "消息ID") @RequestParam Integer messageId){
+        Integer userId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+        return messageService.showSystemMessageByUser(userId,messageId);
+    }
+
+    @ApiOperation(value = "用户——删除接收的消息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/removeMessageByUser")
+    public ResultBody removeMessageByUser(HttpServletRequest request,@ApiParam(value = "消息ID") @RequestParam Integer messageId){
+        Integer userId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+        return messageService.removeMessageByUser(userId,messageId);
+    }
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/MessageDao.java

+package com.mmc.iuav.user.dao;
+
+import com.mmc.iuav.user.entity.SystemMessageDO;
+import com.mmc.iuav.user.model.qo.MessageQO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author han
+* @createDate 2023-12-14 10:46:45
+*/
+@Mapper
+public interface MessageDao {
+
+    /**
+     * 添加系统消息
+     * @param messageDO
+     * @return
+     */
+    int insertSystemMessage(SystemMessageDO messageDO);
+
+    /**
+     * 根据ID查询系统消息
+     * @param id
+     * @return
+     */
+    SystemMessageDO selectSystemMessageById(Integer id);
+
+    /**
+     * 查询所有的系统消息
+     * @return
+     */
+    List<SystemMessageDO> selectAllSystemMessage(MessageQO messageQO);
+
+    int countSystemMessage();
+
+    /**
+     * 删除消息
+     * @param id
+     * @return
+     */
+    int removeMessage(Integer id);
+
+    /**
+     * 查询用户是否读取过
+     */
+    int selectReceiverMessage(@Param("userId") Integer userId,@Param("messageId") Integer messageId);
+
+    /**
+     * 添加用户读取过得信息
+     * @param userId
+     * @param messageId
+     * @return
+     */
+    int insertReceiverMessage(@Param("userId") Integer userId,@Param("messageId") Integer messageId);
+
+    /**
+     * 删除读取过的消息
+     * @param id
+     * @return
+     */
+    int removeReceiverMessage(@Param("userId") Integer userId,@Param("messageId") Integer messageId);
+
+    /**
+     * 根据messageId删除接收方的消息(撤回删除消息之后,接收方应该不能查看)
+     */
+    int removeReceiverMessageByMessageId(@Param("messageId") Integer messageId);
+    /**
+     * 查询读取过但是已经被用户删除的信息
+     * @param userId
+     * @param messageId
+     * @return
+     */
+    int selectReceiverMessageByDel(@Param("userId") Integer userId,@Param("messageId") Integer messageId);
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java

@@ -227,4 +227,11 @@ public interface UserServiceDao {
      * @return {@link UserBaseInfoDTO}
      */
     UserBaseInfoDTO getUserBaseInfo(Integer userAccountId);
+
+    /**
+     * 通过用户id获取用户的电话号码
+     * @param userId 用户的id
+     * @return {@link String}
+     */
+    String getUserPhoneByUserId(Integer userId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java

@@ -150,4 +150,11 @@ public interface PilotCertificationDao {
      */
     Integer selectUserIdByBackUserId(Integer backUserId);
 
+
+    /**
+     * 获取审核通过飞手的电话号码
+     * @param pilotId 飞手表id
+     * @return {@link String}
+     */
+    String getPilotApplyPhone(Integer pilotId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/SystemMessageDO.java

+package com.mmc.iuav.user.entity;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.mmc.iuav.user.model.vo.RoleInfoVO;
+import com.mmc.iuav.user.model.vo.SystemMessageVO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author han
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SystemMessageDO implements Serializable {
+    private static final long serialVersionUID = 973044768156590099L;
+    /**
+     * 消息ID
+     */
+    private Integer id;
+    /**
+     * 消息主题
+     */
+    private String subject;
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 是否读过 false为未读 true为已读
+     */
+    private boolean isRead;
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+    public SystemMessageDO(SystemMessageVO message) {
+        this.subject = message.getSubject();
+        this.content = message.getContent();
+    }
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

@@ -92,4 +92,11 @@ public interface BackUserAccountService {
      * @return
      */
     BackUserAccountVO getBackUserAccountById(Integer backUserAccountId);
+
+
+    /**
+     * 获取后台新消息
+     * @return {@link ResultBody}
+     */
+    ResultBody getMessage();
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/MessageService.java

+package com.mmc.iuav.user.service;
+
+import com.mmc.iuav.page.PageResult;
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.entity.SystemMessageDO;
+import com.mmc.iuav.user.model.qo.MessageQO;
+import com.mmc.iuav.user.model.vo.SystemMessageVO;
+
+import java.util.List;
+
+public interface MessageService {
+    /**
+     * 添加系统消息
+     * @param messageVO
+     * @return
+     */
+    ResultBody insertSystemMessage(SystemMessageVO messageVO);
+
+    /**
+     * 根据ID查询系统消息
+     * @param id
+     * @return
+     */
+    ResultBody selectSystemMessageById(Integer id);
+
+    /**
+     * 后台发布——系统消息列表
+     * 查询所有的系统消息
+     * @return
+     */
+    PageResult selectAllSystemMessage(MessageQO messageQO);
+
+    /**
+     * 删除消息
+     * @param id
+     * @return
+     */
+    ResultBody removeMessage(Integer id);
+
+    /**
+     * 用户接收——系统消息列表
+     * 查询所有的系统消息
+     * @return
+     */
+    PageResult selectAllSystemMessageByReceive(Integer userId, MessageQO messageQO);
+
+    /**
+     * 用户查看——系统消息详情
+     * @return
+     */
+    ResultBody showSystemMessageByUser(Integer userId, Integer messageId);
+
+    /**
+     * 用户——删除用户接收的消息
+     * @param id
+     * @return
+     */
+    ResultBody removeMessageByUser(Integer userId, Integer messageId);
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -28,6 +28,7 @@ import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 import com.mmc.iuav.user.model.vo.userpoints.UserPointsVO;
 import com.mmc.iuav.user.service.dronepilot.PilotCertificationService;
+import com.mmc.iuav.user.util.SmsUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -292,6 +293,12 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         param.setOperatorUserId(userLoginInfoFromRedis.getUserAccountId());
         certificationDao.updateAuditStatus(param);
 
+        //审核通过
+        if (param.getAuditStatus() == 1) {
+            String pilotApplyPhone = certificationDao.getPilotApplyPhone(param.getId());
+            SmsUtil.sendPassPilotApply(pilotApplyPhone);
+        }
+
         PilotCertificationLogDO pilotCertificationLog = new PilotCertificationLogDO(userAccountDO.getId(), userLoginInfoFromRedis.getUserAccountId(), CertificationMessage.match(param.getAuditStatus()));
         certificationDao.insertPilotLog(pilotCertificationLog);
         SendCertificationMessage match = SendCertificationMessage.match(param.getAuditStatus());

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -5,9 +5,13 @@ import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.auth.PwdUtil;
+import com.mmc.iuav.user.client.ImsClient;
+import com.mmc.iuav.user.client.OmsClient;
 import com.mmc.iuav.user.client.PmsClient;
 import com.mmc.iuav.user.dao.BackUserAccountDao;
+import com.mmc.iuav.user.dao.CooperationDao;
 import com.mmc.iuav.user.dao.RoleDao;
+import com.mmc.iuav.user.dao.dronepilot.PilotCertificationDao;
 import com.mmc.iuav.user.entity.BackUserAccountDO;
 import com.mmc.iuav.user.entity.CompanyBackUserDO;
 import com.mmc.iuav.user.entity.CompanyInfoDO;
@@ -19,11 +23,13 @@ import com.mmc.iuav.user.model.qo.BUserAccountQO;
 import com.mmc.iuav.user.model.vo.BUserAccountVO;
 import com.mmc.iuav.user.model.vo.BackUserAccountVO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
+import com.mmc.iuav.user.model.vo.NewMessageVO;
 import com.mmc.iuav.user.service.BackUserAccountService;
 import com.mmc.iuav.user.service.CompanyService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -49,6 +55,18 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
     private RoleDao roleDao;
 
     @Autowired
+    private CooperationDao cooperationDao;
+
+    @Autowired
+    private PilotCertificationDao certificationDao;
+
+    @Autowired
+    private OmsClient omsClient;
+
+    @Autowired
+    private ImsClient imsClient;
+
+    @Autowired
     private PmsClient pmsClient;
 
     @Transactional
@@ -274,4 +292,15 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         }
         return null;
     }
+
+    @Override
+    public ResultBody getMessage() {
+        NewMessageVO newMessageVO = new NewMessageVO();
+        newMessageVO.setPilotMessage(certificationDao.getPilotAuditSum(0));
+        newMessageVO.setJoinApplyMessage(cooperationDao.getAuditSum(0));
+
+        newMessageVO.setOrderMessage(omsClient.getCountNewOrder());
+        newMessageVO.setDynamicMessage(imsClient.getDynamicMessageSum());
+        return ResultBody.success(newMessageVO);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java

+package com.mmc.iuav.user.service.impl;
+
+import com.mmc.iuav.page.PageResult;
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.dao.MessageDao;
+import com.mmc.iuav.user.entity.SystemMessageDO;
+import com.mmc.iuav.user.model.qo.MessageQO;
+import com.mmc.iuav.user.model.vo.SystemMessageVO;
+import com.mmc.iuav.user.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class MessageServiceImpl implements MessageService {
+
+    @Autowired
+    private MessageDao messageDao;
+    @Override
+    public ResultBody insertSystemMessage(SystemMessageVO messageVO) {
+        SystemMessageDO systemMessageDO = new SystemMessageDO(messageVO);
+        if(messageDao.insertSystemMessage(systemMessageDO) != 0){
+            return ResultBody.success("消息发布成功");
+        }
+        return ResultBody.error("消息发布失败");
+    }
+
+    @Override
+    public ResultBody selectSystemMessageById(Integer id) {
+        return ResultBody.success(messageDao.selectSystemMessageById(id));
+    }
+
+    @Override
+    public PageResult selectAllSystemMessage(MessageQO messageQO) {
+        int count = messageDao.countSystemMessage();
+        if (count == 0) {
+            return PageResult.buildPage(messageQO.getPageNo(), messageQO.getPageSize(), count);
+        }
+        Integer pageNo = messageQO.getPageNo();
+        messageQO.buildCurrentPage();
+        List<SystemMessageDO> messageList = messageDao.selectAllSystemMessage(messageQO);
+        return PageResult.buildPage(pageNo, messageQO.getPageSize(), count, messageList);
+    }
+    @Override
+    public ResultBody removeMessage(Integer id) {
+        if(messageDao.removeMessage(id) != 0){
+            messageDao.removeReceiverMessageByMessageId(id);
+            return ResultBody.success("删除成功");
+        }
+        return ResultBody.error("删除失败");
+    }
+    @Override
+    public PageResult selectAllSystemMessageByReceive(Integer userId, MessageQO messageQO) {
+        if(userId == null){
+            ResultBody.error("未登录");
+        }
+        int count = messageDao.countSystemMessage();
+        if (count == 0) {
+            return PageResult.buildPage(messageQO.getPageNo(), messageQO.getPageSize(), count);
+        }
+        Integer pageNo = messageQO.getPageNo();
+        messageQO.buildCurrentPage();
+        List<SystemMessageDO> messagesDO = new ArrayList<>();
+        List<SystemMessageDO> messages = messageDao.selectAllSystemMessage(messageQO);
+        for (SystemMessageDO message : messages) {
+            if(messageDao.selectReceiverMessage(userId, message.getId()) != 0){
+                // 已读
+                message.setRead(true);
+            }
+            // 读过但是已经删除
+            if(messageDao.selectReceiverMessageByDel(userId, message.getId()) != 0){
+                continue;
+            }
+            messagesDO.add(message);
+        }
+        return PageResult.buildPage(pageNo, messageQO.getPageSize(), count, messagesDO);
+    }
+
+    @Override
+    public ResultBody showSystemMessageByUser(Integer userId, Integer messageId) {
+        if(userId == null){
+            ResultBody.error("未登录");
+        }
+        SystemMessageDO message = messageDao.selectSystemMessageById(messageId);
+        if(message == null){
+            return ResultBody.success(message);
+        }
+        //没有读过,查看之后标为已读
+        if(messageDao.selectReceiverMessage(userId, messageId) == 0){
+            messageDao.insertReceiverMessage(userId,messageId);
+        }
+        message.setRead(true);
+        // 读过但是已经删除
+        if(messageDao.selectReceiverMessageByDel(userId, message.getId()) != 0){
+            message = null;
+        }
+        return ResultBody.success(message);
+    }
+
+    @Override
+    public ResultBody removeMessageByUser(Integer userId, Integer messageId) {
+        if(messageDao.removeReceiverMessage(userId, messageId) != 0){
+            return ResultBody.success("删除成功");
+        }
+        return ResultBody.error("删除失败");
+    }
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/WithdrawalServiceImpl.java

@@ -6,6 +6,7 @@ import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.dao.RealNameAuthDao;
+import com.mmc.iuav.user.dao.UserServiceDao;
 import com.mmc.iuav.user.dao.wallet.PayWalletDao;
 import com.mmc.iuav.user.dao.xzsz.WithdrawalDao;
 import com.mmc.iuav.user.dao.xzsz.XzDao;
@@ -27,6 +28,7 @@ import com.mmc.iuav.user.model.vo.XzWithdrawalVO;
 import com.mmc.iuav.user.model.vo.wallet.ApplyWithdrawalVO;
 import com.mmc.iuav.user.service.xzsz.WithdrawalService;
 import com.mmc.iuav.user.service.xzsz.XzService;
+import com.mmc.iuav.user.util.SmsUtil;
 import com.mmc.iuav.user.util.TDateUtil;
 import com.mmc.iuav.user.xzsz.SingleSubmitResp;
 import lombok.extern.slf4j.Slf4j;
@@ -64,6 +66,9 @@ public class WithdrawalServiceImpl implements WithdrawalService {
     @Autowired
     private XzService xzService;
 
+    @Autowired
+    private UserServiceDao userServiceDao;
+
     @Override
     @Transactional
     public ResultBody apply(ApplyWithdrawalVO applyWithdrawalVO, Integer userAccountId) {
@@ -234,6 +239,8 @@ public class WithdrawalServiceImpl implements WithdrawalService {
                 return ResultBody.error("操作失败，请稍后重试!");
             }
         }
+        String userPhone = userServiceDao.getUserPhoneByUserId(applyInfo.getUserAccountId());
+        SmsUtil.sendPassWithdrawalApply(userPhone);
         return ResultBody.success();
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java

@@ -11,8 +11,8 @@ import com.google.gson.Gson;
  */
 public class SmsUtil {
 
-    public static String ALIYUN_OSS_ACCESS_KEY_ID = "LTAI5tAAbkYDUQ4j5m8m2nkf";
-    public static String ALIYUN_OSS_ACCESS_KEY_SECRET = "nkgSWNLwXB6NnNkAEfgZ5pFLV4WMpi";
+    public static String ALIYUN_OSS_ACCESS_KEY_ID = "LTAI5tS3GNPRZAkG9LCQBZmc";
+    public static String ALIYUN_OSS_ACCESS_KEY_SECRET = "ZkPrv1u2mN2DmOIc7GfPKRuy4Risqe";
 
     public static String CLOUD_JOIN_WEBSITE = "云享飞Pro";
 
@@ -26,6 +26,9 @@ public class SmsUtil {
     private static String COOPERATION_TEMPLATE_PASS_CODE_3 = "SMS_462620535";
     private static String COOPERATION_TEMPLATE_PASS_CODE_4 = "SMS_462605558";
     private static String COOPERATION_TEMPLATE_PASS_CODE_5 = "SMS_464125992";
+    private static String COOPERATION_TEMPLATE_PASS_CODE_6 = "SMS_464380042";
+
+    private static String COOPERATION_TEMPLATE_PASS_CODE_7 = "SMS_464335035";
     //短信验证码模板
     private static String VERIFYCODE="SMS_211825548";
 
@@ -42,6 +45,16 @@ public class SmsUtil {
         return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_CODE_1, null, phone);
     }
 
+//    飞手审核通过通知
+    public static String sendPassPilotApply(String phone) {
+        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_6, null, phone);
+    }
+
+    //飞手提现通知
+    public static String sendPassWithdrawalApply(String phone) {
+        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_7, null, phone);
+    }
+
     public static String send(String TemplateCode, String param, String phone) {
         return send(CLOUD_JOIN_WEBSITE, TemplateCode, param, phone);
     }

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -100,5 +100,7 @@ iuav:
     uri: http://pms-svc:8099
   ims:
     uri: http://ims-svc:10001
+  oms:
+    uri: https://test.iuav.com
 scheduling:
   enabled: true

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -62,3 +62,5 @@ iuav:
     uri: http://127.0.0.1:8099
   ims:
     uri: http://localhost:10001
+  oms:
+    uri: http://localhost:8077

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -92,5 +92,7 @@ iuav:
     uri: http://pms-svc:8099
   ims:
     uri: http://ims-svc:10001
+  oms:
+    url: https://www.iuav.com
 scheduling:
   enabled: true

csm-service/cms-service-user/src/main/resources/mapper/MessageDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.iuav.user.dao.MessageDao">
+
+
+    <select id="selectSystemMessageById" resultType="com.mmc.iuav.user.entity.SystemMessageDO">
+        select
+            id, subject, content, type, create_time
+        from message
+        where  id = #{id} and is_deleted = 0
+    </select>
+    <select id="selectAllSystemMessage" resultType="com.mmc.iuav.user.entity.SystemMessageDO">
+        select
+            id, subject, content, type, create_time
+        from message
+        where type = 0 and is_deleted = 0
+        order by create_time desc
+            LIMIT #{pageNo},#{pageSize}
+    </select>
+    <select id="selectReceiverMessage" resultType="java.lang.Integer">
+        select count(*)
+        from receiver_message
+        where user_id = #{userId} and message_id = #{messageId}
+    </select>
+    <select id="selectReceiverMessageByDel" resultType="java.lang.Integer">
+        select count(*)
+        from receiver_message
+        where user_id = #{userId} and message_id = #{messageId} and is_deleted = 1
+    </select>
+    <select id="countSystemMessage" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM message
+        where is_deleted = 0
+    </select>
+    <insert id="insertSystemMessage">
+        insert into message
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="subject != null">subject,</if>
+            <if test="content != null">content,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="subject != null">#{subject,jdbcType=VARCHAR},</if>
+            <if test="content != null">#{content,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <insert id="insertReceiverMessage">
+        insert into receiver_message
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="messageId != null">message_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="messageId != null">#{messageId},</if>
+        </trim>
+    </insert>
+    <update id="removeMessage">
+        update message
+        set is_deleted = 1, deleted_time = NOW()
+        where   id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="removeReceiverMessage">
+        update receiver_message
+        set is_deleted = 1, deleted_time = NOW()
+        where   user_id = #{userId} and message_id = #{messageId}
+    </update>
+    <update id="removeReceiverMessageByMessageId">
+        update receiver_message
+        set is_deleted = 1, deleted_time = NOW()
+        where message_id = #{messageId}
+    </update>
+
+</mapper>

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -663,5 +663,8 @@
         select rna.user_account_id,ua.nick_name,rna.user_name,ua.phone_num from user_account ua left join real_name_auth rna on ua.id = rna.user_account_id
         where ua.id = #{userAccountId}
     </select>
+    <select id="getUserPhoneByUserId" resultType="java.lang.String">
+        select  phone_num from user_account where id = #{userId}
+    </select>
 
 </mapper>

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -520,5 +520,9 @@
         where cbu.back_user_account_id = #{backUserId}
         limit 1
     </select>
+    <select id="getPilotApplyPhone" resultType="java.lang.String">
+        select phone_num from pilot_certification pc left join user_account ua on pc.user_account_id = ua.id
+        where pc.id = #{pilotId}
+    </select>
 
 </mapper>

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -42,4 +42,5 @@ data-filter:
     - /userapp/user-account/userMessages
     - /userapp/company/getCompanyInfoByBUId
     - /userapp/user-account/feignGetUserBaseInfo
+    - /userapp/back-user/getMessage
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: f364bdf4788be9eb9edf743f768b3c33fbc36c9e
+  newTag: a65911c558c751fe6e978306a29ad8cde9fcbe86