Merge remote-tracking branch 'origin/master'

wisenergy-model/src/main/java/cn/wisenergy/model/vo/PrizeShowVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 86187
+ * @ Description:  最大进步奖展示Vo
+ * @ Author     : 86187
+ * @ Date       : 2021/3/9 19:22
+ */
+@Data
+@ApiModel("PrizeShowVo")
+public class PrizeShowVo {
+    /**
+     * 本月最大进步奖
+     */
+    @ApiModelProperty(value = "本月最大进步奖", name = "growthTotal")
+    private Double growthTotal;
+
+    /**
+     * 进步奖详情列表展示
+     */
+    @ApiModelProperty(value = "进步奖详情列表展示", name = "prizeVos")
+    private List<ProgressPrizeVo> prizeVos;
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/ProgressPrizeService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.vo.PrizeShowVo;
 import cn.wisenergy.model.vo.ProgressPrizeVo;
 
 import java.util.List;
@@ -18,5 +19,5 @@ public interface ProgressPrizeService {
      *
      * @return 进步奖列表
      */
-    R<List<ProgressPrizeVo>> getProgressPrizes();
+    R<PrizeShowVo> getProgressPrizes();
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProgressPrizeServiceImpl.java

@@ -4,11 +4,13 @@ import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.ProgressPrizeMapper;
 import cn.wisenergy.model.app.ProgressPrize;
+import cn.wisenergy.model.vo.PrizeShowVo;
 import cn.wisenergy.model.vo.ProgressPrizeVo;
 import cn.wisenergy.service.app.ProgressPrizeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -21,12 +23,23 @@ import java.util.List;
 public class ProgressPrizeServiceImpl extends ServiceImpl<ProgressPrizeMapper, ProgressPrize> implements ProgressPrizeService {
 
     @Override
-    public R<List<ProgressPrizeVo>> getProgressPrizes() {
+    public R<PrizeShowVo> getProgressPrizes() {
         log.info("shop-mall[]ProgressPrizeServiceImpl[]getProgressPrizes[]input.method");
         //获取本月进步奖 列表
         Date date = new Date();
         String yearMonth = DateUtil.convertDateToStr(date, "yyyy-MM");
         List<ProgressPrizeVo> list = baseMapper.getByTime(yearMonth);
-        return R.ok(list);
+        if (CollectionUtils.isEmpty(list)) {
+            return R.ok(new PrizeShowVo());
+        }
+
+        double sum = 0.0;
+        for (ProgressPrizeVo prizeVo : list) {
+            sum = sum + prizeVo.getAwardMoney();
+        }
+        PrizeShowVo prizeShowVo = new PrizeShowVo();
+        prizeShowVo.setGrowthTotal(sum);
+        prizeShowVo.setPrizeVos(list);
+        return R.ok(prizeShowVo);
     }
 }

wisenergy-web-admin/pom.xml

@@ -62,7 +62,7 @@
 
     <!-- MAVEN构建 -->
     <build>
-        <finalName>shop-mall</finalName>
+        <finalName>shop-mall-comm</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProgressPrizeController.java

 package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.vo.ProgressPrizeVo;
+import cn.wisenergy.model.vo.PrizeShowVo;
 import cn.wisenergy.service.app.ProgressPrizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 
 /**
  * @author 86187
@@ -26,7 +25,7 @@ public class ProgressPrizeController {
 
     @ApiOperation(value = "获取本月进步奖列表", notes = "获取本月进步奖列表", httpMethod = "GET")
     @GetMapping("/getProgressPrizes")
-    public R<List<ProgressPrizeVo>> getProgressPrizes() {
+    public R<PrizeShowVo> getProgressPrizes() {
         log.info("shop-mall[]ProgressPrizeController[]getProgressPrizes[]input.method");
         return progressPrizeService.getProgressPrizes();
     }

wisenergy-web-admin/src/main/resources/application-test.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    threads:
-      max: 1000
-      min-spare: 30
-  port: 8997
-  servlet:
-    context-path: /shop-mall
-
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
@@ -78,16 +68,3 @@ sms:
   version: 2017-05-25
   action: SendSms
   signName: 西田森生物科技
-
-xxl:
-  job:
-    accessToken:
-    admin:
-      addresses: http://172.24.252.165:8090/job-admin
-    executor:
-      address:
-      appname: shop-mall
-      ip: 172.24.252.165
-      logpath: /home/meepo/logs/xxl-job/jobhandler
-      logretentiondays: 30
-      port: 9999

wisenergy-web-admin/src/main/resources/application.yml

@@ -50,4 +50,17 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
     call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'
+    jdbc-type-for-null: 'null'
\ No newline at end of file
+
+xxl:
+  job:
+    accessToken:
+    admin:
+      addresses: http://172.24.252.165:81/job-admin
+    executor:
+      address:
+      appname: shop-mall
+      ip: 172.24.252.165
+      logpath: /home/meepo/logs/xxl-job/jobhandler
+      logretentiondays: 30
+      port: 9999
\ No newline at end of file