!103 变更 0.8.0

Merge pull request !103 from 山东云则/hotfix_poster

pom.xml

@@ -2,47 +2,42 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
+    <modelVersion>4.0.0</modelVersion>
+
     <groupId>com.yunze</groupId>
     <artifactId>yunze</artifactId>
-    <version>1.2.1</version>
+    <version>0.8.0</version>
 
     <name>yunze</name>
     <url>http://www.5iot.com</url>
     <description>IOT综合业务支撑平台</description>
-    
+
     <properties>
-        <yunze.version>1.2.1</yunze.version>
+        <yunze.version>0.8.0</yunze.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.8</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
-        <swagger.version>2.9.2</swagger.version>
-		<kaptcha.version>2.3.2</kaptcha.version>
-		<mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
+        <swagger.version>3.0.0</swagger.version>
+        <kaptcha.version>2.3.2</kaptcha.version>
+        <mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>5.6.0</oshi.version>
         <jna.version>5.7.0</jna.version>
-        <commons.io.version>2.5</commons.io.version>
+        <commons.io.version>2.9.0</commons.io.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.collections.version>3.2.2</commons.collections.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
-
-
-
-
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
-
             <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -143,7 +138,6 @@
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
-
             <!--velocity代码生成使用模板 -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>

yunze-admin/src/main/java/com/yunze/web/controller/yunze/sysgl/YzIndexpageController.java

@@ -14,6 +14,7 @@ import com.yunze.system.service.yunze.sysgl.IYzIndexpageService;
 import com.yunze.web.core.config.MyBaseController;
 import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -89,7 +90,13 @@ public class YzIndexpageController extends MyBaseController {
         return Myerr("资产明细统计图加载 操作失败！");
     }
 
-
+    /**
+     * 首页加载续费计划未处理数量
+     */
+    @GetMapping("/apiRenewalOrder")
+    public String ApiRenewalOrder() {
+        return MyRetunSuccess(iYzIndexpageService.apiRenewalOrder(), null);
+    }
 }
 
 

yunze-common/src/main/java/com/yunze/common/mapper/mysql/sysgl/YzIndexpageMapper.java

@@ -54,4 +54,5 @@ public interface YzIndexpageMapper {
     public List<String> findToExist(Map<String,Object> map);
 
 
+    Map<String, Object> getApiRenewalOrer();
 }

yunze-common/src/main/resources/mapper/mysql/yunze/sysgl/YzIndexpageMapper.xml

@@ -179,7 +179,15 @@
     <select id="findToExist" parameterType="java.util.HashMap" resultType="java.lang.String">
         SELECT dept_id FROM yz_indexpage WHERE DATE_FORMAT( record_date , '%Y-%m' ) = #{yyyyMM} GROUP BY dept_id
     </select>
-
+    <!--获取api续费未审核订单数量-->
+    <select id="getApiRenewalOrer" resultType="java.util.Map">
+        SELECT
+            count( 1 ) as api_not_reviewed_order
+        FROM
+            yz_applicationfor_renewal_primary
+        WHERE
+            `status` = 0
+    </select>
 
 
 

yunze-system/src/main/java/com/yunze/system/service/impl/yunze/sysgl/YzIndexpageServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -158,6 +159,12 @@ public class YzIndexpageServiceImpl implements IYzIndexpageService {
         return RMap;
     }
 
+    @Override
+    public Map<String, Object> apiRenewalOrder() {
+        Map<String, Object> resultMap = yzIndexpageMapper.getApiRenewalOrer();
+        return resultMap;
+    }
+
     /**
      * 资产明细数据生成
      * */

yunze-system/src/main/java/com/yunze/system/service/yunze/sysgl/IYzIndexpageService.java

@@ -22,4 +22,5 @@ public interface IYzIndexpageService {
      */
     public Map<String,Object> assetDetails(Map<String,Object> map);
 
+    Map<String,Object> apiRenewalOrder();
 }