Merge remote-tracking branch 'origin/dev' into dev

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -82,4 +82,14 @@ public interface IssueConstant {
      * 议题表决缓存属性值 shouldVoteCount
      * */
     String CACHE_ATTRIBUTE_SHOULD_VOTE_COUNT = "shouldVoteCount";
+
+    /**
+     * 空字符串
+     */
+    String NULL_CHARACTER_STRING = "";
+
+    /**
+     * 北京时区（北京时间）
+     */
+    String BEIJING_TIME_ZONE = "+8";
 }

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

@@ -32,9 +32,7 @@ import com.epmet.dto.form.IssueIdFormDTO;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
 import com.epmet.dto.result.ProcessListResultDTO;
 import com.epmet.entity.IssueProcessEntity;
-import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.GovProjectFeignClient;
-import com.epmet.redis.IssueProcessRedis;
 import com.epmet.service.IssueProcessService;
 import com.epmet.service.IssueService;
 import org.apache.commons.lang3.StringUtils;
@@ -56,13 +54,9 @@ import java.util.Map;
 @Service
 public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, IssueProcessEntity> implements IssueProcessService {
 
-    @Autowired
-    private IssueProcessRedis issueProcessRedis;
     @Autowired
     private IssueService issueService;
     @Autowired
-    private GovOrgFeignClient govOrgFeignClient;
-    @Autowired
     private GovProjectFeignClient govProjectFeignClient;
     @Autowired
     private IssueProjectRelationDao issueProjectRelationDao;

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.IssueConstant;
 import com.epmet.dao.IssueSatisfactionDetailDao;
 import com.epmet.dto.EvaluateInfoDTO;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
@@ -126,8 +127,8 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
         }else {
             resultDTO.setStatus(false);
             EvaluateInfoDTO evaluateInfo = new EvaluateInfoDTO();
-            evaluateInfo.setEvaluateContent("");
-            evaluateInfo.setSatisfaction("");
+            evaluateInfo.setEvaluateContent(IssueConstant.NULL_CHARACTER_STRING);
+            evaluateInfo.setSatisfaction(IssueConstant.NULL_CHARACTER_STRING);
             resultDTO.setEvaluateInfo(evaluateInfo);
         }
         return resultDTO;

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

@@ -176,7 +176,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         //DB获取表决 日统计详情
         List<PolyLineDTO> polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId);
         PolyLineDTO polyLineDTO = new PolyLineDTO();
-        polyLineDTO.setVoteDate(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
+        polyLineDTO.setVoteDate(LocalDateTime.now().toEpochSecond(ZoneOffset.of(IssueConstant.BEIJING_TIME_ZONE)));
         //议题 已转项目 或 已结案 的时间
         String date = issueDao.operateTime(issueId.getIssueId());
         //今天刚转项目或刚刚关闭，当天数据DB没有，直接从缓存拿
@@ -187,8 +187,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         } else {
             //折线数据=DB，今天之前转成的议题，今天 “已转项目”或“已结案”
             if (date.equals(LocalDate.now().toString())) {
-                Integer yesterdaySupport = 0;
-                Integer yesterdayOppose = 0;
+                Integer yesterdaySupport = NumConstant.ZERO;
+                Integer yesterdayOppose = NumConstant.ZERO;
                 for (PolyLineDTO lineDTO : polyLineDTOS) {
                     yesterdaySupport += lineDTO.getSupportIncrement();
                     yesterdayOppose += lineDTO.getOppositionIncrement();

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java

@@ -26,4 +26,19 @@ public interface HallConstat {
      */
     String CLOSED = "closed";
 
+    /**
+     * 空字符串
+     */
+    String NULL_CHARACTER_STRING = "";
+
+    /**
+     * 反对投票
+     */
+    String OPPOSITION = "opposition";
+
+    /**
+     * 支持投票
+     */
+    String SUPPORT = "support";
+
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -60,33 +60,21 @@ public class IssueServiceImpl implements IssueService {
         initiatorFormDTO.setUserId(issueResult.getUserId());
         if (!StringUtils.isBlank(issueResult.getUserId())) {
             IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
-            if (initiatorResult == null) {
-                issueDetailResult.setIssueInitiator("");
-            } else {
-                issueDetailResult.setIssueInitiator(initiatorResult.getIssueInitiator());
-            }
+            issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
         }
         //网格名称
         BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO();
         belongGridName.setGridId(issueResult.getGridId());
         if (!StringUtils.isBlank(issueResult.getGridId())) {
             BelongGridNameResultDTO belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName).getData();
-            if (belongGridNameResult == null) {
-                issueDetailResult.setBelongsGridName("");
-            } else {
-                issueDetailResult.setBelongsGridName(belongGridNameResult.getBelongsGridName());
-            }
+            issueDetailResult.setBelongsGridName(belongGridNameResult == null ? HallConstat.NULL_CHARACTER_STRING : belongGridNameResult.getBelongsGridName());
         }
         //话题信息
         TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
         topicInfoFormDTO.setTopicId(issueResult.getTopicId());
         if (!StringUtils.isBlank(issueResult.getTopicId())) {
             TopicInfoDTO topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
-            if (topicInfoDTOResult == null) {
-                issueDetailResult.setTopicInfo(new TopicInfoDTO());
-            } else {
-                issueDetailResult.setTopicInfo(topicInfoDTOResult);
-            }
+            issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult);
         }
         //判断是否投票
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();
@@ -131,7 +119,7 @@ public class IssueServiceImpl implements IssueService {
     @Override
     public void support(TokenDto tokenDto, IssueIdFormDTO issueId) {
         VoteFormDTO voteFormDTO = new VoteFormDTO();
-        voteFormDTO.setAttitude("support");
+        voteFormDTO.setAttitude(HallConstat.SUPPORT);
         voteFormDTO.setCreatedBy(tokenDto.getUserId());
         voteFormDTO.setIssueId(issueId.getIssueId());
         govIssueFeignClient.vote(voteFormDTO);
@@ -145,7 +133,7 @@ public class IssueServiceImpl implements IssueService {
     @Override
     public void oppose(TokenDto tokenDto, IssueIdFormDTO issueId) {
         VoteFormDTO voteFormDTO = new VoteFormDTO();
-        voteFormDTO.setAttitude("opposition");
+        voteFormDTO.setAttitude(HallConstat.OPPOSITION);
         voteFormDTO.setCreatedBy(tokenDto.getUserId());
         voteFormDTO.setIssueId(issueId.getIssueId());
         govIssueFeignClient.vote(voteFormDTO);

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.44
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.45
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <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>
-    <version>0.3.44</version>
+    <version>0.3.45</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

@@ -37,7 +37,7 @@
             <if test='null != gridId and "" != gridId'>
                 AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
             </if>
-            <if test='gridId == null or gridId = ""'>
+            <if test='null == gridId or "" == gridId'>
                 AND ur.GRID_ID = 'all'
             </if>
         </where>