Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java

@@ -17,14 +17,13 @@
 
 package com.epmet.dto.indexcal;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.IndexCalConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 区/街道相关分数表 
@@ -80,20 +79,26 @@ public class AgencyScoreDTO implements Serializable {
     /**
      * 分值
      */
-	private BigDecimal score;
+    private BigDecimal score;
 
     /**
      * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；街道相关：jiedaoxiangguan；全区相关:quanquxiangguan
      */
-	private String indexCode;
+    private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
 
     /**
-     *  数据类型 district  ：全区；street：街道
+     * 数据类型 district  ：全区；street：街道
      */
     private String dataType;
 
     /**
-     * 
+     *
      */
 	private Integer delFlag;
 

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDTO.java

@@ -17,11 +17,11 @@
 
 package com.epmet.dto.indexcal;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 区直部门分值表
@@ -77,12 +77,18 @@ public class DeptScoreDTO implements Serializable {
     /**
      * 分值
      */
-	private BigDecimal score;
+    private BigDecimal score;
 
     /**
      * 治理能力：zhilinengli；
      */
-	private String indexCode;
+    private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
 
     /**
      *

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityFormDTO.java

@@ -48,7 +48,7 @@ public class GridPartyAbilityFormDTO implements Serializable {
     /**
      * 网格党员人均提出的议题转项目数
      */
-    private Integer partyAvgShiftProjectCount;
+    private BigDecimal partyAvgShiftProjectCount;
 
     /**
      * 网格活跃群众用户数
@@ -78,7 +78,7 @@ public class GridPartyAbilityFormDTO implements Serializable {
     /**
      * 网格群众人均提出的议题转项目数
      */
-    private Integer userAvgShiftProjectCount;
+    private BigDecimal userAvgShiftProjectCount;
 
     /**
      * 建群党员数（累计值）

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/ScreenCollFormDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto.screencoll;
+
+import com.alibaba.fastjson.JSON;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 大屏采集通用入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/9 10:25
+ */
+@Data
+public class ScreenCollFormDTO<T> implements Serializable {
+
+    private static final long serialVersionUID = 4605543711669000348L;
+    /**
+     * 当为true时后台将先删除当前维度的数据，后新增
+     */
+    private Boolean isFirst;
+
+    /**
+     * 日期Id, 数据更新至：yyyyMMdd
+     */
+    private String dateId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 数据集合
+     */
+    private List<T> dataList;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java

@@ -0,0 +1,15 @@
+package com.epmet.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 孔村大屏数据采集api
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/9 10:18
+ */
+@RestController
+@RequestMapping("kcscreencoll")
+public class KcScreenCollController {
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java

@@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * 大屏数据采集api
+ * 市北大屏数据采集api
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:25
  */
 @RestController
 @RequestMapping("screencoll")
-public class ScreenCollController {
+public class ShiBeiScreenCollController {
 
     @Autowired
     private ScreenCollService screenCollService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexCommunityScoreDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.screen;
+package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
@@ -33,7 +33,7 @@ import java.util.List;
  * @since v1.0.0 2020-08-31
  */
 @Mapper
-public interface FactIndexCommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity> {
+public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity> {
 
     /**
      * @Description 【社区】中间表插入

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java

@@ -20,6 +20,8 @@ package com.epmet.dao.evaluationindex.indexcal;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.GridScoreDTO;
+import com.epmet.dto.screen.FactIndexGridScoreDTO;
+import com.epmet.dto.screen.result.SubGridAvgResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -66,4 +68,45 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @Date 2020/8/31 16:42
      **/
     List<GridScoreDTO> selectList(CalculateCommonFormDTO formDTO);
+
+    /**
+     * @Description  下属所有网格的平均值
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/8/28 3:20 下午
+     */
+    List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
+
+    /**
+     * 根据入参查询  网格相关分值记录
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.screen.FactIndexGridScoreDTO>
+     * @Author zhangyong
+     * @Date 10:43 2020-09-03
+     **/
+    List<FactIndexGridScoreDTO> selectListGridScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 根据入参查询  网格id
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<java.util.String>
+     * @Author zhangyong
+     * @Date 10:43 2020-09-03
+     **/
+    List<String> selectListGridId(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 批量插入 网格相关分值表
+     *
+     * @param list
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 11:11 2020-09-04
+     **/
+    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list,@Param("customerId")String customerId);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexGridScoreDao.java

@@ -1,77 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.dao.evaluationindex.screen;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.screen.FactIndexGridScoreDTO;
-import com.epmet.dto.screen.result.SubGridAvgResultDTO;
-import com.epmet.entity.evaluationindex.screen.FactIndexGridScoreEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 网格相关分值
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-08-28
- */
-@Mapper
-public interface FactIndexGridScoreDao extends BaseDao<FactIndexGridScoreEntity> {
-
-    /**
-     * @Description  下属所有网格的平均值
-     * @param customerId
-     * @param monthId
-     * @author zxc
-     * @date 2020/8/28 3:20 下午
-     */
-    List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
-
-    /**
-     * 根据入参查询  网格相关分值记录
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.screen.FactIndexGridScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<FactIndexGridScoreDTO> selectListGridScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
-
-    /**
-     * 根据入参查询  网格id
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.util.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListGridId(@Param("customerId")String customerId, @Param("monthId")String monthId);
-
-    /**
-     * 批量插入 网格相关分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list,@Param("customerId")String customerId);
-}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenEventImgDataDao.java

@@ -22,6 +22,8 @@ import com.epmet.entity.evaluationindex.screen.ScreenEventImgDataEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 中央区-事件数据图片数据
  *
@@ -34,10 +36,12 @@ public interface ScreenEventImgDataDao extends BaseDao<ScreenEventImgDataEntity>
     /**
      * 根据原始事件Id，进行物理删除
      *
-     * @param eventId
+     * @param eventIds
      * @return void
      * @Author zhangyong
      * @Date 16:47 2020-08-18
      **/
-    void delEventImgDataByEventId(@Param("eventId") String eventId);
+    void delEventImgDataByEvent(@Param("eventIds") String[] eventIds);
+
+    void batchInsertEventImgData(@Param("list") List<ScreenEventImgDataEntity> list);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcScoreEntity.java

@@ -71,15 +71,20 @@ public class CpcScoreEntity extends BaseEpmetEntity {
     /**
      * 分值
      */
-	private BigDecimal score;
+    private BigDecimal score;
 
     /**
      * 指标code
      */
-	private String indexCode;
+    private String indexCode;
 
-	/**
+    /**
-	 * 是否是总分 1是0不是
+     * 所有指标code拼接的字符串 冒号隔开
-	 */
+     */
-	private String isTotal;
+    private String allParentIndexCode;
+
+    /**
+     * 是否是总分 1是0不是
+     */
+    private String isTotal;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptScoreEntity.java

@@ -75,11 +75,16 @@ public class DeptScoreEntity extends BaseEpmetEntity {
     /**
      * 分值
      */
-	private BigDecimal score;
+    private BigDecimal score;
 
     /**
      * 治理能力：zhilinengli；
      */
-	private String indexCode;
+    private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridScoreEntity.java

@@ -77,14 +77,19 @@ public class GridScoreEntity extends BaseEpmetEntity {
 	 */
 	private String isTotal;
 
-	/**
+    /**
-	 * 分值
+     * 分值
-	 */
+     */
-	private BigDecimal score;
+    private BigDecimal score;
-
+
-	/**
+    /**
-	 * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；网格相关：wanggexiangguan
+     * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；网格相关：wanggexiangguan
-	 */
+     */
-	private String indexCode;
+    private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/FactIndexCommunityScoreEntity.java

@@ -75,11 +75,16 @@ public class FactIndexCommunityScoreEntity extends BaseEpmetEntity {
     /**
      * 分值
      */
-	private BigDecimal score;
+    private BigDecimal score;
 
     /**
      * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan
      */
-	private String indexCode;
+    private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexDictEntity.java

@@ -35,19 +35,24 @@ public class IndexDictEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
-    /**
+	/**
-     * 指标名
+	 * 指标名
-     */
+	 */
 	private String indexName;
 
-    /**
+	/**
-     * 指标描述
+	 * 指标编码
-     */
+	 */
+	private String indexCode;
+
+	/**
+	 * 指标描述
+	 */
 	private String indexDesc;
 
-    /**
+	/**
-     * 指标级别（1,2,3,4,5）
+	 * 指标级别（1,2,3,4,5）
-     */
+	 */
 	private String level;
 
 	/**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java

@@ -266,6 +266,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity.setIndexName(data.getLevel1Index());
             entity.setCorrelation(data.getCorrelation());
             entity.setLevel("1");
+            entity.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel1Index(), false, 4));
             indexDicMap.put(data.getLevel1Index(), entity);
         }
         if (!indexDicMap.containsKey(data.getLevel2Index())) {
@@ -273,6 +274,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity2.setIndexName(data.getLevel2Index());
             entity2.setCorrelation(data.getCorrelation());
             entity2.setLevel("2");
+            entity2.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel2Index(), false, 4));
             indexDicMap.put(data.getLevel2Index(), entity2);
         }
         if (!indexDicMap.containsKey(data.getLevel3Index())) {
@@ -280,6 +282,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity3.setIndexName(data.getLevel3Index());
             entity3.setCorrelation(data.getCorrelation());
             entity3.setLevel("3");
+            entity3.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel3Index(), false, 4));
             indexDicMap.put(data.getLevel3Index(), entity3);
         }
         if (!indexDicMap.containsKey(data.getLevel4Index())) {
@@ -287,6 +290,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity4.setIndexName(data.getLevel4Index());
             entity4.setCorrelation(data.getCorrelation());
             entity4.setLevel("4");
+            entity4.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel4Index(), false, 4));
             indexDicMap.put(data.getLevel4Index(), entity4);
         }
         if (!indexDicMap.containsKey(data.getLevel5Index())) {
@@ -294,6 +298,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity5.setIndexName(data.getLevel5Index());
             entity5.setCorrelation(data.getCorrelation());
             entity5.setLevel("5");
+            entity5.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel5Index(), false, 4));
             indexDicMap.put(data.getLevel5Index(), entity5);
         }
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -23,6 +23,7 @@ import com.epmet.support.normalizing.Correlation;
 import com.epmet.support.normalizing.ScoreCalculator;
 import com.epmet.support.normalizing.ScoreConstants;
 import com.epmet.support.normalizing.batch.BatchScoreCalculator;
+import com.epmet.support.normalizing.batch.CalculateResult;
 import com.epmet.support.normalizing.batch.IndexInputVO;
 import com.epmet.support.normalizing.batch.SampleValue;
 import lombok.extern.slf4j.Slf4j;
@@ -224,7 +225,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
             }
         }
         log.info("计算的参数：{}", JSON.toJSONString(indexMap));
-        HashMap<String, BigDecimal> result = calculateScore(indexMap);
+        HashMap<String, CalculateResult> result = calculateScore(indexMap);
         log.info("计算的结果：{}", result);
 
         //处理结果
@@ -244,13 +245,20 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
      * @param result
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveCpcScore(CalculateCommonFormDTO formDTO, Map<String, CpcScoreEntity> indexDetails, String parentIndexCode, HashMap<String, BigDecimal> result) {
+    public void saveCpcScore(CalculateCommonFormDTO formDTO, Map<String, CpcScoreEntity> indexDetails, String parentIndexCode, HashMap<String, CalculateResult> result) {
 
         List<CpcScoreEntity> list = new ArrayList<>();
         result.forEach((userId, score) -> {
             CpcScoreEntity cpcScoreEntity = indexDetails.get(userId);
-            cpcScoreEntity.setScore(score);
+            cpcScoreEntity.setScore(score.getTotalScore());
             list.add(cpcScoreEntity);
+            score.getDetails().forEach(o -> {
+                CpcScoreEntity child = ConvertUtils.sourceToTarget(o, CpcScoreEntity.class);
+                child.setIndexCode(o.getIndexCode());
+                child.setScore(o.getScore());
+                list.add(child);
+            });
+
         });
         this.deleteAndInsertBatch(formDTO, list, parentIndexCode);
     }
@@ -295,7 +303,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                     ScoreConstants.MAX_SCORE,
                     Correlation.getCorrelation(index.getCorrelation())
             );
-            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(), new ArrayList<>(), index.getThreshold(), index.getWeight(), scoreCalculator);
+            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(), index.getAllParentIndexCode(), new ArrayList<>(), index.getThreshold(), index.getWeight(), scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO);
         }
         return map;
@@ -307,11 +315,11 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
      * @param indexMap
      * @return
      */
-    private HashMap<String, BigDecimal> calculateScore(Map<String, IndexInputVO<BigDecimal>> indexMap) {
+    private HashMap<String, CalculateResult> calculateScore(Map<String, IndexInputVO<BigDecimal>> indexMap) {
         //构造入参
         List<IndexInputVO> indexInputVOS = indexMap.values().stream().collect(Collectors.toList());
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        return batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+        return batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
     }
 
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java

@@ -249,6 +249,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             );
             List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>();
             IndexInputVO indexInputVO1 = new IndexInputVO(index.getIndexCode(),
+                    index.getAllParentIndexCode(),
                     sampleValueList,
                     index.getThreshold(),
 //                    new BigDecimal("-1"),   //FOR TEST

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -454,11 +454,12 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             );
             List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>();
             IndexInputVO indexInputVO1 = new IndexInputVO(index.getIndexCode(),
-                                                         sampleValueList,
+                    index.getAllParentIndexCode(),
-                                                         index.getThreshold(),
+                    sampleValueList,
+                    index.getThreshold(),
 //                                                         new BigDecimal("-1"),//FOR TEST
-                                                         index.getWeight(),
+                    index.getWeight(),
-                                                         scoreCalculator);
+                    scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO1);
         }
         return map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -8,11 +8,11 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
+import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
-import com.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao;
-import com.epmet.dao.evaluationindex.screen.FactIndexGridScoreDao;
 import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
 import com.epmet.dto.screen.result.SubGridAvgResultDTO;
@@ -59,9 +59,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     @Autowired
     private IndexCodeFieldReService indexCodeFieldReService;
     @Autowired
-    private FactIndexCommunityScoreDao factIndexCommunityScoreDao;
+    private CommunityScoreDao factIndexCommunityScoreDao;
     @Autowired
-    private FactIndexGridScoreDao factIndexGridScoreDao;
+    private GridScoreDao factIndexGridScoreDao;
 
     /**
      * @param customerId
@@ -102,7 +102,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -133,7 +133,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -185,7 +185,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -216,7 +216,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -265,7 +265,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -295,7 +295,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -121,7 +121,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -152,7 +152,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -197,7 +197,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -217,7 +217,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -265,7 +265,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -8,10 +8,10 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
-import com.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
@@ -59,7 +59,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     @Autowired
     private IndexCodeFieldReService indexCodeFieldReService;
     @Autowired
-    private FactIndexCommunityScoreDao communityScoreDao;
+    private CommunityScoreDao communityScoreDao;
     @Autowired
     private AgencyScoreDao agencyScoreDao;
     @Autowired
@@ -128,7 +128,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -158,7 +158,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldName))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -203,7 +203,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -234,7 +234,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -280,7 +280,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -310,7 +310,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexId(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -7,7 +7,9 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.*;
 import com.epmet.dao.evaluationindex.screen.*;
 import com.epmet.dto.ScreenCustomerGridDTO;
@@ -63,9 +65,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     @Autowired
     private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao;
     @Autowired
-    private FactIndexGridScoreDao factIndexGridScoreDao;
+    private GridScoreDao factIndexGridScoreDao;
     @Autowired
-    private FactIndexCommunityScoreDao factIndexCommunityScoreDao;
+    private CommunityScoreDao factIndexCommunityScoreDao;
     @Autowired
     private DeptScoreDao deptScoreDao;
     @Autowired

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCollServiceImpl.java

@@ -171,22 +171,31 @@ public class ScreenCollServiceImpl implements ScreenCollService {
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
             screenEventDataDao.batchInsertEventData(formDTO.getDataList(), customerId);
-        }
 
-        // 处理图片
+            // 处理图片
-        for (int i = NumConstant.ZERO; i < formDTO.getDataList().size(); i++) {
+            String[] events = new String[formDTO.getDataList().size()];
-            if (null != formDTO.getDataList().get(i).getImgDataList() && formDTO.getDataList().get(i).getImgDataList().size() > NumConstant.ZERO) {
+            List<ScreenEventImgDataEntity> eventImgDataList = new ArrayList<>();
-                // 根据原始事件ID，物理删除 - 事件数据图片数据
+            Boolean isImgUrl = false;
-                screenEventImgDataDao.delEventImgDataByEventId(formDTO.getDataList().get(i).getEventId());
+            for (int i = NumConstant.ZERO; i < formDTO.getDataList().size(); i++) {
-                for (int j = NumConstant.ZERO; j < formDTO.getDataList().get(i).getImgDataList().size(); j++){
+                if (null != formDTO.getDataList().get(i).getImgDataList() && formDTO.getDataList().get(i).getImgDataList().size() > NumConstant.ZERO) {
-                    // 新增 中央区-事件数据图片数据 表
+                    // 根据原始事件ID，物理删除 - 事件数据图片数据
-                    ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
+                    events[i] = formDTO.getDataList().get(i).getEventId();
-                    imgDataEntity.setEventId(formDTO.getDataList().get(i).getImgDataList().get(j).getEventId());
+                    for (int j = NumConstant.ZERO; j < formDTO.getDataList().get(i).getImgDataList().size(); j++){
-                    imgDataEntity.setEventImgUrl(formDTO.getDataList().get(i).getImgDataList().get(j).getImgUrl());
+                        // 新增 中央区-事件数据图片数据 表
-                    imgDataEntity.setSort(formDTO.getDataList().get(i).getImgDataList().get(j).getSort());
+                        ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
-                    screenEventImgDataDao.insert(imgDataEntity);
+                        imgDataEntity.setEventId(formDTO.getDataList().get(i).getImgDataList().get(j).getEventId());
+                        imgDataEntity.setEventImgUrl(formDTO.getDataList().get(i).getImgDataList().get(j).getImgUrl());
+                        imgDataEntity.setSort(formDTO.getDataList().get(i).getImgDataList().get(j).getSort());
+                        eventImgDataList.add(imgDataEntity);
+                        isImgUrl = true;
+                    }
                 }
             }
+            if (isImgUrl){
+                screenEventImgDataDao.delEventImgDataByEvent(events);
+                screenEventImgDataDao.batchInsertEventImgData(eventImgDataList);
+            }
+
         }
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@@ -67,7 +67,7 @@ public class BatchScoreCalculator {
                     result.setDetails(new ArrayList<>());
                     scoreCountOfSamples.put(sampleId, result);
                 }
-                SampleScore sampleScore = new SampleScore(idx.getIndexId(), score);
+                IndexScoreVo sampleScore = new IndexScoreVo(idx.getIndexId(), idx.getAllParentIndexCode(), score);
                 result.getDetails().add(sampleScore);
                 result.setTotalScore(result.getTotalScore().add(score).setScale(6, RoundingMode.HALF_UP));
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/CalculateResult.java

@@ -21,5 +21,5 @@ public class CalculateResult implements Serializable {
     /**
      * 每项具体的分支
      */
-    private List<SampleScore> details;
+    private List<IndexScoreVo> details;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexInputVO.java

@@ -19,6 +19,11 @@ public class IndexInputVO<T extends Number> implements Serializable {
      */
     private String indexId;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
     /**
      * 指标的样本值
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexScoreVo.java

@@ -0,0 +1,31 @@
+package com.epmet.support.normalizing.batch;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author liujianjun
+ */
+@Data
+@AllArgsConstructor
+public class IndexScoreVo implements Serializable {
+
+    private static final long serialVersionUID = 65642416224721650L;
+    /**
+     * 指标code
+     */
+    private String indexCode;
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+    /**
+     * 分值
+     */
+    private BigDecimal score;
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexCommunityScoreDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml

@@ -1,7 +1,7 @@
 <?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.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao">
+<mapper namespace="com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao">
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml

@@ -112,4 +112,105 @@
                 AND m.CUSTOMER_ID =#{customerId}
                 AND m.MONTH_ID =#{monthId}
     </select>
+
+
+
+    <!-- 下属所有网格的平均值 -->
+    <select id="selectSubGridAvgScore" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
+        SELECT
+            figc.agency_id AS agencyId,
+            figc.month_id as monthId,
+            figc.quarter_id as quarterId,
+            figc.year_id as yearId,
+            ROUND(AVG( figc.score ),6) AS score,
+            figc.customer_id as customerId,
+            sca.pid AS parentId
+        FROM
+            fact_index_grid_score figc
+                LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = figc.AGENCY_ID
+        WHERE
+            figc.del_flag = '0'
+          AND sca.DEL_FLAG = 0
+          AND figc.customer_id = #{customerId}
+          AND figc.month_id = #{monthId}
+          AND figc.index_code = #{indexCode}
+        GROUP BY figc.agency_id
+    </select>
+
+    <select id="selectListGridScore" resultType="com.epmet.dto.screen.FactIndexGridScoreDTO">
+        SELECT
+            CUSTOMER_ID customerId,
+            GRID_ID gridId,
+            AGENCY_ID agencyId,
+            YEAR_ID yearId,
+            MONTH_ID monthId,
+            IS_TOTAL isTotal,
+            SCORE score,
+            INDEX_CODE indexCode
+        FROM
+            fact_index_grid_score
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+        ORDER BY GRID_ID
+    </select>
+
+    <insert id="batchInsertGridScoreData" parameterType="map">
+        insert into fact_index_grid_score
+        (
+        ID,
+        CUSTOMER_ID,
+        GRID_ID,
+        AGENCY_ID,
+        ALL_PARENT_IDS,
+        QUARTER_ID,
+        YEAR_ID,
+        MONTH_ID,
+        IS_TOTAL,
+        SCORE,
+        INDEX_CODE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{item.gridId},
+            #{item.agencyId},
+            #{item.allParentIds},
+            #{item.quarterId},
+
+            #{item.yearId},
+            #{item.monthId},
+            #{item.isTotal},
+            #{item.score},
+            #{item.indexCode},
+            #{item.delFlag},
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+    <select id="selectListGridId" resultType="String">
+        SELECT
+            GRID_ID gridId
+        FROM
+            fact_index_grid_score
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+        ORDER BY GRID_ID
+    </select>
+
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexGridScoreDao.xml

@@ -1,103 +0,0 @@
-<?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.epmet.dao.evaluationindex.screen.FactIndexGridScoreDao">
-
-    <!-- 下属所有网格的平均值 -->
-    <select id="selectSubGridAvgScore" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
-        SELECT
-            figc.agency_id AS agencyId,
-            figc.month_id as monthId,
-            figc.quarter_id as quarterId,
-            figc.year_id as yearId,
-            ROUND(AVG( figc.score ),6) AS score,
-            figc.customer_id as customerId,
-            sca.pid AS parentId
-        FROM
-            fact_index_grid_score figc
-             LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = figc.AGENCY_ID
-        WHERE
-            figc.del_flag = '0'
-          AND sca.DEL_FLAG = 0
-          AND figc.customer_id = #{customerId}
-          AND figc.month_id = #{monthId}
-          AND figc.index_code = #{indexCode}
-        GROUP BY figc.agency_id
-    </select>
-
-    <select id="selectListGridScore" resultType="com.epmet.dto.screen.FactIndexGridScoreDTO">
-        SELECT
-            CUSTOMER_ID customerId,
-            GRID_ID gridId,
-            AGENCY_ID agencyId,
-            YEAR_ID yearId,
-            MONTH_ID monthId,
-            IS_TOTAL isTotal,
-            SCORE score,
-            INDEX_CODE indexCode
-        FROM
-            fact_index_grid_score
-        WHERE
-            DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            ORDER BY GRID_ID
-    </select>
-
-    <insert id="batchInsertGridScoreData" parameterType="map">
-        insert into fact_index_grid_score
-        (
-        ID,
-        CUSTOMER_ID,
-        GRID_ID,
-        AGENCY_ID,
-        ALL_PARENT_IDS,
-        QUARTER_ID,
-        YEAR_ID,
-        MONTH_ID,
-        IS_TOTAL,
-        SCORE,
-        INDEX_CODE,
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.gridId},
-            #{item.agencyId},
-            #{item.allParentIds},
-            #{item.quarterId},
-
-            #{item.yearId},
-            #{item.monthId},
-            #{item.isTotal},
-            #{item.score},
-            #{item.indexCode},
-            #{item.delFlag},
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
-
-    <select id="selectListGridId" resultType="String">
-        SELECT
-            GRID_ID gridId
-        FROM
-            fact_index_grid_score
-        WHERE
-            DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            ORDER BY GRID_ID
-    </select>
-</mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenEventImgDataDao.xml

@@ -3,9 +3,42 @@
 
 <mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenEventImgDataDao">
 
-    <delete id="delEventImgDataByEventId">
+    <delete id="delEventImgDataByEvent">
         delete from screen_event_img_data
-        where DEL_FLAG = '0' AND EVENT_ID = #{eventId}
+        where DEL_FLAG = '0'
+        AND EVENT_ID  IN
+        <foreach item="item" collection="eventIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </delete>
 
+    <insert id="batchInsertEventImgData" parameterType="map">
+        insert into screen_event_img_data
+        (
+        ID,
+        EVENT_ID,
+        EVENT_IMG_URL,
+        SORT,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.eventId},
+            #{item.eventImgUrl},
+            #{item.sort},
+            0,
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java

@@ -75,8 +75,8 @@ public class DemoScoreCal {
         List<SampleValue<Integer>> index2SampleValues = Arrays.asList(new SampleValue<>("id1", 1), new SampleValue<>("id2", 8), new SampleValue<>("id3", 3));
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO<Integer> index1VO = new IndexInputVO<>("aaa", index1SampleValues, new BigDecimal(10), new BigDecimal(1), sc1);
+        IndexInputVO<Integer> index1VO = new IndexInputVO<>("aaa", "a:bbb2", index1SampleValues, new BigDecimal(10), new BigDecimal(1), sc1);
-        IndexInputVO<Integer> index2VO = new IndexInputVO<>("bbb", index2SampleValues, new BigDecimal(10), new BigDecimal(1), sc2);
+        IndexInputVO<Integer> index2VO = new IndexInputVO<>("bbb", "a:bbb2", index2SampleValues, new BigDecimal(10), new BigDecimal(1), sc2);
 
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
 
@@ -101,8 +101,8 @@ public class DemoScoreCal {
         List<SampleValue> index2SampleValues = Arrays.asList(new SampleValue<>("id1", new BigDecimal(1)), new SampleValue<>("id2", new BigDecimal(8)), new SampleValue<>("id3", new BigDecimal(3)));
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO index1VO = new IndexInputVO("aaa", index1SampleValues, new BigDecimal(6), new BigDecimal(1), sc1);
+        IndexInputVO index1VO = new IndexInputVO("aaa", "a:aaa", index1SampleValues, new BigDecimal(6), new BigDecimal(1), sc1);
-        IndexInputVO index2VO = new IndexInputVO("bbb", index2SampleValues, new BigDecimal(6), new BigDecimal(1), sc2);
+        IndexInputVO index2VO = new IndexInputVO("bbb", "b:bbb", index2SampleValues, new BigDecimal(6), new BigDecimal(1), sc2);
 
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
 
@@ -160,13 +160,13 @@ public class DemoScoreCal {
 
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO index1VO = new IndexInputVO("aaa1", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.2), sc1);
+        IndexInputVO index1VO = new IndexInputVO("aaa1", "a:bbb2", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.2), sc1);
-        IndexInputVO index2VO = new IndexInputVO("aaa2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.15), sc2);
+        IndexInputVO index2VO = new IndexInputVO("aaa2", "a:bbb2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.15), sc2);
-        IndexInputVO index3VO = new IndexInputVO("aaa3", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.15), sc3);
+        IndexInputVO index3VO = new IndexInputVO("aaa3", "a:bbb2", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.15), sc3);
-        IndexInputVO index4VO = new IndexInputVO("aaa4", index1SampleValues4, new BigDecimal(-1), new BigDecimal(0.5), sc4);
+        IndexInputVO index4VO = new IndexInputVO("aaa4", "a:bbb2", index1SampleValues4, new BigDecimal(-1), new BigDecimal(0.5), sc4);
 
 
-        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO,index3VO,index4VO);
+        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO);
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
@@ -224,13 +224,13 @@ public class DemoScoreCal {
 
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO index1VO = new IndexInputVO("aaa1", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.3), sc1);
+        IndexInputVO index1VO = new IndexInputVO("aaa1", "a:bbb2", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.3), sc1);
-        IndexInputVO index2VO = new IndexInputVO("aaa2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.2), sc2);
+        IndexInputVO index2VO = new IndexInputVO("aaa2", "a:bbb2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.2), sc2);
-        IndexInputVO index3VO = new IndexInputVO("aaa3", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.2), sc3);
+        IndexInputVO index3VO = new IndexInputVO("aaa3", "a:bbb2", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.2), sc3);
-        IndexInputVO index4VO = new IndexInputVO("aaa4", index1SampleValues4, new BigDecimal(0.6), new BigDecimal(0.3), sc4);
+        IndexInputVO index4VO = new IndexInputVO("aaa4", "a:bbb2", index1SampleValues4, new BigDecimal(0.6), new BigDecimal(0.3), sc4);
 
 
-        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO,index3VO,index4VO);
+        List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO);
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
         HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);