1、年度平均指数 2、月度指数分析-饼状图

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/MonthPieChartFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 3:10 下午
+ */
+@Data
+public class MonthPieChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3163410637094615814L;
+
+    public interface MonthPieChart{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {MonthPieChart.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/YearAverageIndexFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 2:40 下午
+ */
+@Data
+public class YearAverageIndexFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2389432085360116229L;
+
+    public interface YearAverageIndex{}
+
+    /**
+     * 机关Id
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {YearAverageIndex.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/MonthPieChartResultDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 3:12 下午
+ */
+@Data
+public class MonthPieChartResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8399158251970739021L;
+
+    /**
+     * 服务能力
+     */
+    private Double serviceAbility = 0.0;
+
+    /**
+     * 党建能力
+     */
+    private Double partyDevAbility = 0.0;
+
+    /**
+     * 治理能力
+     */
+    private Double governAbility = 0.0;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/YearAverageIndexResultDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/8/19 2:45 下午
+ */
+@Data
+public class YearAverageIndexResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6453379153616899440L;
+
+    /**
+     * 年度平均指数
+     */
+    private Double yearAverageIndex = 0.0;
+
+    /**
+     * 服务能力
+     */
+    private Double serviceAbility = 0.0;
+
+    /**
+     * 党建能力
+     */
+    private Double partyDevAbility = 0.0;
+
+    /**
+     * 治理能力
+     */
+    private Double governAbility = 0.0;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java

@@ -72,7 +72,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/19 1:29 下午
      */
-//    @ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("project")
     public Result<List<ProjectResultDTO>> project(@RequestBody ProjectFormDTO projectFormDTO){
         ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class);
@@ -85,7 +85,7 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/19 1:52 下午
      */
-//    @ExternalAppRequestAuth
+    @ExternalAppRequestAuth
     @PostMapping("topprofile")
     public Result<TopProfileResultDTO> topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){
         ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -1,5 +1,16 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,4 +23,35 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/screen/index")
 public class IndexController {
+
+    @Autowired
+    private IndexService indexService;
+
+    /**
+     * @Description  1、年度平均指数
+     * @param yearAverageIndexFormDTO
+     * @author zxc
+     * @date 2020/8/19 2:53 下午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("yearaverageindex")
+    public Result<YearAverageIndexResultDTO> yearAverageIndex(@RequestBody YearAverageIndexFormDTO yearAverageIndexFormDTO){
+        ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
+        return new Result<YearAverageIndexResultDTO>().ok(indexService.yearAverageIndex(yearAverageIndexFormDTO));
+    }
+
+    /**
+     * @Description  2、月度指数分析-饼状图
+     * @param monthPieChartFormDTO
+     * @author zxc
+     * @date 2020/8/19 3:17 下午
+     */
+    @ExternalAppRequestAuth
+    @PostMapping("monthindexanalysis/piechart")
+    public Result<MonthPieChartResultDTO> monthPieChart(@RequestBody MonthPieChartFormDTO monthPieChartFormDTO){
+        ValidatorUtils.validateEntity(monthPieChartFormDTO, MonthPieChartFormDTO.MonthPieChart.class);
+        return new Result<MonthPieChartResultDTO>().ok(indexService.monthPieChart(monthPieChartFormDTO));
+    }
+
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataMonthlyDao.java

@@ -17,7 +17,9 @@
 
 package com.epmet.datareport.dao.screen;
 
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 指数-指数数据
@@ -28,4 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenIndexDataMonthlyDao{
 
+    /**
+     * @Description  2、月度指数分析-饼状图
+     * @param agencyId
+     * @author zxc
+     * @date 2020/8/19 3:43 下午
+     */
+    MonthPieChartResultDTO selectMonthPieChart(@Param("agencyId")String agencyId);
+	
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenIndexDataYearlyDao.java

@@ -17,7 +17,9 @@
 
 package com.epmet.datareport.dao.screen;
 
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 指数-指数数据(按年统计)
@@ -28,4 +30,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenIndexDataYearlyDao{
 
+    /**
+     * @Description  1、年度平均指数
+     * @param agencyId
+     * @author zxc
+     * @date 2020/8/19 3:43 下午
+     */
+    YearAverageIndexResultDTO selectYearAverageIndex(@Param("agencyId")String agencyId);
+	
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/IndexService.java

@@ -1,5 +1,10 @@
 package com.epmet.datareport.service.screen;
 
+import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+
 /**
  * 指数相关相关各指标查询
  *
@@ -7,4 +12,21 @@ package com.epmet.datareport.service.screen;
  * @date 2020/8/18 10:21
  */
 public interface IndexService {
+
+    /**
+     * @Description  1、年度平均指数
+     * @param yearAverageIndexFormDTO
+     * @author zxc
+     * @date 2020/8/19 2:53 下午
+     */
+    YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO);
+
+    /**
+     * @Description  2、月度指数分析-饼状图
+     * @param monthPieChartFormDTO
+     * @author zxc
+     * @date 2020/8/19 3:17 下午
+     */
+    MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java

@@ -1,6 +1,13 @@
 package com.epmet.datareport.service.screen.impl;
 
+import com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao;
+import com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao;
 import com.epmet.datareport.service.screen.IndexService;
+import com.epmet.screen.dto.form.MonthPieChartFormDTO;
+import com.epmet.screen.dto.form.YearAverageIndexFormDTO;
+import com.epmet.screen.dto.result.MonthPieChartResultDTO;
+import com.epmet.screen.dto.result.YearAverageIndexResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -11,4 +18,39 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class IndexServiceImpl implements IndexService {
+
+    @Autowired
+    private ScreenIndexDataYearlyDao screenIndexDataYearlyDao;
+    @Autowired
+    private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao;
+
+    /**
+     * @Description  1、年度平均指数
+     * @param yearAverageIndexFormDTO
+     * @author zxc
+     * @date 2020/8/19 2:53 下午
+     */
+    @Override
+    public YearAverageIndexResultDTO yearAverageIndex(YearAverageIndexFormDTO yearAverageIndexFormDTO) {
+        YearAverageIndexResultDTO yearAverageIndexResultDTO = screenIndexDataYearlyDao.selectYearAverageIndex(yearAverageIndexFormDTO.getAgencyId());
+        if (null == yearAverageIndexResultDTO){
+            return new YearAverageIndexResultDTO();
+        }
+        return yearAverageIndexResultDTO;
+    }
+
+    /**
+     * @Description  2、月度指数分析-饼状图
+     * @param monthPieChartFormDTO
+     * @author zxc
+     * @date 2020/8/19 3:17 下午
+     */
+    @Override
+    public MonthPieChartResultDTO monthPieChart(MonthPieChartFormDTO monthPieChartFormDTO) {
+        MonthPieChartResultDTO monthPieChartResultDTO = screenIndexDataMonthlyDao.selectMonthPieChart(monthPieChartFormDTO.getAgencyId());
+        if (null == monthPieChartFormDTO){
+            return new MonthPieChartResultDTO();
+        }
+        return monthPieChartResultDTO;
+    }
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -3,6 +3,18 @@
 
 <mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataMonthlyDao">
 
-
+    <!-- 2、月度指数分析-饼状图 -->
-
+    <select id="selectMonthPieChart" resultType="com.epmet.screen.dto.result.MonthPieChartResultDTO">
+        SELECT
+            service_ablity AS serviceAbility,
+            party_dev_ablity AS partyDevAbility,
+            govern_ablity AS governAbility
+        FROM
+            screen_index_data_monthly
+        WHERE
+            del_flag = '0'
+            AND org_type = 'agency'
+            AND org_id = #{agencyId}
+            AND month_id = DATE_FORMAT(NOW(),'%Y%m')
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@@ -3,6 +3,19 @@
 
 <mapper namespace="com.epmet.datareport.dao.screen.ScreenIndexDataYearlyDao">
 
-
+    <!-- 1、年度平均指数 -->
-
+    <select id="selectYearAverageIndex" resultType="com.epmet.screen.dto.result.YearAverageIndexResultDTO">
+        SELECT
+            index_total AS yearAverageIndex,
+            service_ablity AS serviceAbility,
+            party_dev_ablity AS partyDevAbility,
+            govern_ablity AS governAbility
+        FROM
+            screen_index_data_yearly
+        WHERE
+            del_flag = '0'
+            AND org_type = 'agency'
+            AND org_id = #{agencyId}
+            AND year_id = DATE_FORMAT(NOW(),'%Y')
+    </select>
 </mapper>