Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_demand_service_stats

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java

@@ -1,9 +1,6 @@
 package com.epmet.dto.screen.form;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 
 import java.io.Serializable;
 
@@ -26,4 +23,8 @@ public class ScreenCentralZoneDataFormDTO implements Serializable {
      * 时间维度 不一定是dateId 需要根据其格式进行判断维度的类型
      * */
     private String dateId;
+
+    private String startDate;
+
+    private String endDate;
 }

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

@@ -881,10 +881,17 @@ public class DemoController {
      */
     @PostMapping("project-test")
     public Result project(@RequestBody ScreenCentralZoneDataFormDTO param) {
-        if(StringUtils.isBlank(param.getDateId())){
-            //默认截止到昨天。
-            param.setDateId(DateUtils.getBeforeNDay(1));
+        List<String> dateIds = new ArrayList<>();
+        if ((StringUtils.isBlank(param.getStartDate()) && StringUtils.isBlank(param.getEndDate()))){
+            if (StringUtils.isNotBlank(param.getDateId())){
+                dateIds.add(param.getDateId());
+            }else {
+                dateIds.add(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)));
+            }
+        }else {
+            dateIds = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
         }
+
         List<String> customerIds = new ArrayList();
         if (StringUtils.isNotBlank(param.getCustomerId())) {
             customerIds.add(param.getCustomerId());
@@ -892,10 +899,12 @@ public class DemoController {
             customerIds = dimCustomerService.selectCustomerIdPage(1, 100);
         }
         for (String customerId : customerIds) {
-            ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO();
-            formDTO.setCustomerId(customerId);
-            formDTO.setDateId(param.getDateId());
-            screenProjectSettleService.extractScreenData(param);
+            dateIds.forEach(dateId -> {
+                ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO();
+                formDTO.setCustomerId(customerId);
+                formDTO.setDateId(dateId);
+                screenProjectSettleService.extractScreenData(formDTO);
+            });
         }
         return new Result();
     }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzIssueCategoryDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/20 5:14 下午
+ * @DESC
+ */
+@Data
+public class ResiBuzzIssueCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 5050318228251317747L;
+
+    private String issueId;
+
+    private List<String> cn;
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -262,4 +262,12 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(@Param("orgId")String orgId,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
+    /**
+     * @Description  根据issueIds查询分类名
+     * @param issueIds
+     * @author zxc
+     * @date 2021/12/20 5:15 下午
+     */
+    List<ResiBuzzIssueCategoryDTO> selectCategoryNameByIssueIds(@Param("issueIds")List<String> issueIds);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1594,6 +1594,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         List<ResiBuzzDTO> list = allList.stream().skip(formDTO.getPageSize() * (formDTO.getPageNo() - NumConstant.ONE))
                 .limit(formDTO.getPageSize()).collect(Collectors.toList());
+        List<ResiBuzzIssueCategoryDTO> names = baseDao.selectCategoryNameByIssueIds(allList.stream().map(m -> m.getIssueId()).collect(Collectors.toList()));
+        if (CollectionUtils.isNotEmpty(names)){
+            list.forEach(l -> names.stream().filter(n -> l.getIssueId().equals(n.getIssueId())).forEach(n -> l.setCategoryName(n.getCn())));
+        }
         AtomicReference<Integer> no = new AtomicReference<>((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE);
         ResiBuzzResultDTO result = new ResiBuzzResultDTO();
         UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -580,21 +580,7 @@
     </select>
 
     <!-- 查询表决前50名 -->
-    <resultMap id="selectIssueLimit50" type="com.epmet.dto.result.ResiBuzzDTO">
-        <result column="issueId" property="issueId"/>
-        <result column="issueTitle" property="issueTitle"/>
-        <result column="suggestion" property="suggestion"/>
-        <result column="createdBy" property="createdBy"/>
-        <result column="status" property="status"/>
-        <result column="createdTime" property="createdTime"/>
-        <result column="supportCount" property="supportCount"/>
-        <result column="oppositionCount" property="oppositionCount"/>
-        <result column="voteAccount" property="voteAccount"/>
-        <collection property="categoryName" ofType="java.lang.String">
-            <result column="cn"/>
-        </collection>
-    </resultMap>
-    <select id="selectIssueLimit50" resultMap="selectIssueLimit50">
+    <select id="selectIssueLimit50" resultType="com.epmet.dto.result.ResiBuzzDTO">
         SELECT
             i.ID AS issueId,
             i.ISSUE_TITLE AS issueTitle,
@@ -607,12 +593,9 @@
             i.CREATED_TIME AS createdTime,
             s.SUPPORT_COUNT AS supportCount,
             s.OPPOSITION_COUNT AS oppositionCount,
-            CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount,
-            cd.CATEGORY_NAME as cn
+            CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount
         FROM issue i
-        LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
-        LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)
-        LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
+        INNER JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
         WHERE i.DEL_FLAG = '0'
             <if test='status != "all" '>
                 AND i.ISSUE_STATUS = #{status}
@@ -645,7 +628,7 @@
                 IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
                 IFNULL(cd.color,'#0091ed') AS color
             FROM issue i
-            LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
+            INNER JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
             LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)
             LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
             WHERE i.DEL_FLAG = '0'
@@ -672,4 +655,25 @@
             AND DATE_FORMAT(SHIFTED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         GROUP BY GRID_ID
     </select>
+
+    <!-- 根据issueIds查询分类名 -->
+    <resultMap id="selectCategoryNameMaps" type="com.epmet.dto.result.ResiBuzzIssueCategoryDTO">
+        <result property="issueId" column="issueId"/>
+        <collection property="cn" ofType="java.lang.String">
+            <result column="categoryName"/>
+        </collection>
+    </resultMap>
+    <select id="selectCategoryNameByIssueIds" resultMap="selectCategoryNameMaps">
+        SELECT
+               ic.ISSUE_ID AS issueId,
+               cd.CATEGORY_NAME as categoryName
+        FROM issue_category ic
+        LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,4) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
+        WHERE ic.DEL_FLAG = '0'
+          AND ic.ISSUE_ID IN (
+              <foreach collection="issueIds" item="i" separator=",">
+                  #{i}
+              </foreach>
+            )
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -100,7 +100,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setStaffPatrolRecId(entity.getId());
 		result.setStatus(entity.getStatus());
 		result.setLatestSerialNum(PatrolConstant.END.equals(entity.getStatus()) ? NumConstant.ONE_NEG : detail.getSerialNum());
-		result.setCarmDown(NumConstant.THIRTY);
+		//最小间隔设置 3*60s
+		result.setCarmDown(NumConstant.THREE * NumConstant.SIXTY);
 		result.setPatrolStartTime(DateUtils.format(entity.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
 		//状态为巡查中时返回所在网格ID和名称
 		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) {