Merge remote-tracking branch 'origin/develop' into release_temp

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -486,7 +486,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         dto.setMobile(formDTO.getMobile());
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto);
         if (!customerStaffResult.success()) {
-            logger.error(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
+            logger.warn(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
             throw new RenException(customerStaffResult.getCode());
         }
         //2、密码是否正确
@@ -529,7 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         if(result.success()&&null!=result.getData()){
             return result.getData();
         }
-        logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
+        logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
                 ServiceConstant.GOV_ORG_SERVER,
                 formDTO.getMobile(),
                 formDTO.getPassword(),

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java

@@ -103,6 +103,13 @@ public class SpecialSubjectDTO implements Serializable {
      */
 	private Date updatedTime;
 
-    // 扩展属性
+	/**
+	 * 标签名
+	 */
     private String tagName;
+
+	/**
+	 * 扩展属性：标签颜色
+	 */
+    private String tagColor;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java

@@ -38,6 +38,6 @@ public interface SpecialSubjectDao extends BaseDao<SpecialSubjectEntity> {
 
     List<SpecialSubjectDTO> queryExistedList(@Param("orgId") String orgId,@Param("notList")List<String> notList);
 
-    SpecialSubjectEntity getInfo(@Param("tagId") String tagId);
+    SpecialSubjectDTO getInfo(@Param("tagId") String tagId);
 
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java

@@ -44,7 +44,7 @@ public class SpecialSubjectEntity extends BaseEpmetEntity {
      * 标签id
      */
 	private String tagId;
-	private String tagName;
+
     /**
      * 新增此专题的用户id
      */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -210,6 +210,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             result.setCanDel(true);
             result.setAddOrgId(dto.getAddOrgId());
             result.setOrgLevel(dto.getOrgLevel());
+            result.setTagColor(dto.getTagColor());
             currentOrgList.add(result);
         });
         if (CollectionUtils.isNotEmpty(currentOrgList)) {
@@ -232,6 +233,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
                     result.setCanDel(false);
                     result.setAddOrgId(dto.getAddOrgId());
                     result.setOrgLevel(dto.getOrgLevel());
+                    result.setTagColor(dto.getTagColor());
                     resultDTOList.add(result);
                 });
             }
@@ -280,14 +282,16 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
     @Override
     public List<PreviewResultDTO> preview(PreviewFormDTO formDTO) {
         List<PreviewResultDTO> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(formDTO.getTagIdList())) {
             formDTO.getTagIdList().forEach(tagId -> {
                 PreviewResultDTO previewResultDTO = new PreviewResultDTO();
-            SpecialSubjectEntity subjectEntity = baseDao.getInfo(tagId);
-            previewResultDTO.setSpecialSubjectId(subjectEntity.getId());
-            previewResultDTO.setTagName(subjectEntity.getTagName());
+                SpecialSubjectDTO subject = baseDao.getInfo(tagId);
+                previewResultDTO.setSpecialSubjectId(subject.getId());
+                previewResultDTO.setTagName(subject.getTagName());
                 previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize()));
                 result.add(previewResultDTO);
             });
+        }
         return result;
 
     }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -394,7 +394,7 @@
         art.ID AS articleId,
         art.TITLE AS articleTitle,
         art.PUBLISHER_NAME AS publishName,
-        art.PUBLISH_DATE AS publishDate,
+        date_format(art.PUBLISH_DATE,'%Y-%m-%d') AS publishDate,
         IFNULL(art.PREVIEW_CONTENT,'') AS articleContent,
         IFNULL(art.TAGS,'') AS tagName
         FROM

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml

@@ -28,7 +28,7 @@
             </if>
             order by ss.CREATED_TIME desc
     </select>
-    <select id="getInfo" resultType="com.epmet.entity.SpecialSubjectEntity">
+    <select id="getInfo" resultType="com.epmet.dto.SpecialSubjectDTO">
         SELECT
             ss.id,
             TAG_NAME

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

@@ -22,7 +22,7 @@
                     pr.STAFF_ID = #{userId}
                 </foreach>
                 )
-        GROUP BY pr.STAFF_ID ORDER BY pr.CREATED_TIME DESC)t
+        ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID
     </select>
 
     <!-- 巡查记录查询 -->