返回未处理消息总数

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;
+}

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/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/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/util/SmsUtil.java

@@ -12,7 +12,7 @@ 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_SECRET = "ZkPrv1u2mN2DmOIc7GfPKRuy4Risqe";
 
     public static String CLOUD_JOIN_WEBSITE = "云享飞Pro";
 

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/not-check.yml

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