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

epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@@ -8,9 +8,11 @@ import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LoginByPassWordFormDTO;
 import com.epmet.dto.form.LoginByWxCodeFormDTO;
+import com.epmet.dto.form.ResiWxPhoneFormDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.CaptchaService;
 import com.epmet.service.LoginService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -96,4 +98,21 @@ public class LoginController {
 	public Result logout(@LoginUser TokenDto tokenDto, HttpServletRequest request) {
 		return loginService.logoutByToken(tokenDto);
 	}
+
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author yinzuomei
+	 * @description 获取用户微信绑定的手机号
+	 * @Date 2020/7/2 14:33
+	 **/
+	@PostMapping("getresiwxphone")
+	public Result getResiWxPhone(@RequestBody ResiWxPhoneFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ResiWxPhoneFormDTO.AddUserInternalGroup.class);
+		String phone = loginService.getResiWxPhone(formDTO);
+		if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) {
+			return new Result().ok(phone);
+		}
+		return new Result().ok("");
+	}
 }

epmet-auth/src/main/java/com/epmet/dto/form/ResiWxPhoneFormDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/2 14:28
+ */
+@Data
+public class ResiWxPhoneFormDTO implements Serializable {
+    private static final long serialVersionUID = 4381236451736209332L;
+    public interface AddUserInternalGroup {}
+    /**
+     * 微信code
+     */
+    @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
+    private String wxCode;
+
+    /**
+     * 用户信息
+     */
+    @NotBlank(message = "encryptedData不能为空",groups = {AddUserInternalGroup.class})
+    private String encryptedData;
+
+    /**
+     * 加密算法的初始向量
+     */
+    @NotBlank(message = "iv不能为空",groups = {AddUserInternalGroup.class})
+    private String iv;
+}

epmet-auth/src/main/java/com/epmet/service/LoginService.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.LoginByPassWordFormDTO;
 import com.epmet.dto.form.LoginByWxCodeFormDTO;
+import com.epmet.dto.form.ResiWxPhoneFormDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 
 /**
@@ -50,4 +51,12 @@ public interface LoginService {
 	 **/
 	WxMaJscode2SessionResult getWxMaUser(String app, String wxCode);
 
+	/**
+	 * @return java.lang.String
+	 * @param formDTO
+	 * @author yinzuomei
+	 * @description 获取用户微信绑定的手机号
+	 * @Date 2020/7/2 14:33
+	 **/
+	String getResiWxPhone(ResiWxPhoneFormDTO formDTO);
 }

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

@@ -1,6 +1,8 @@
 package com.epmet.service.impl;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -129,6 +131,25 @@ public class LoginServiceImpl implements LoginService {
 		return wxMaJscode2SessionResult;
 	}
 
+	@Override
+	public String getResiWxPhone(ResiWxPhoneFormDTO formDTO) {
+		String phone="";
+		try {
+			WxMaService wxMaService = wxMaServiceUtils.resiWxMaService();
+			WxMaJscode2SessionResult wxMaJscode2SessionResult = wxMaService.jsCode2SessionInfo(formDTO.getWxCode());
+			WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(wxMaJscode2SessionResult.getSessionKey(),
+					formDTO.getEncryptedData(),
+					formDTO.getIv());
+			if (null != phoneNoInfo) {
+				phone= phoneNoInfo.getPurePhoneNumber();
+			}
+		} catch (WxErrorException e) {
+			e.printStackTrace();
+			log.error(String.format("获取用户微信绑定的手机号接口异常"));
+		}
+		return phone;
+	}
+
 	/**
 	 * 根据openId查询用户id
 	 *

epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java

@@ -11,6 +11,6 @@ public interface GroupConstant {
 
     String RAIL = "-";
 
-    String NULL_CHAR_STRING = "";
+    String DOT = ".";
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java

@@ -33,5 +33,5 @@ public interface TopicConstant {
 
     String RAIL = "-";
 
-    String NULL_CHAR_STRING = "";
+    String DOT = ".";
 }

epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.20
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.22
     ports:
       - "8109:8109"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          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">
 
-    <version>0.3.20</version>
+    <version>0.3.22</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java

@@ -43,7 +43,7 @@ public class GroupServiceImpl implements GroupService {
         GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId);
         if (null==result){
             GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO();
-            resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.NULL_CHAR_STRING));
+            resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.DOT));
             return resultDTO;
         }
         return result;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -57,6 +57,7 @@ public class ProjectServiceImpl implements ProjectService {
             resultDTO.setPendingRatio(percent.format(pendingRatio.doubleValue()));
             resultDTO.setClosedRatio(percent.format(resultDTO.getClosedRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue()));
         } else {
+            resultDTO = new ProjectSummaryResultDTO();
             resultDTO.setAgencyId(agencyId);
             Date date = DateUtils.getBeforeDay(new Date());
             resultDTO.setDateName(DateUtils.format(date, "yyyy.MM.dd"));

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -42,10 +42,9 @@ public class TopicServiceImpl implements TopicService {
     @Override
     public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) {
         TopicSummaryResultDTO result = new TopicSummaryResultDTO();
-        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.NULL_CHAR_STRING));
+        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.DOT));
         String agencyId = this.getLoginUserDetails(tokenDto);
         List<TopicStatusResultDTO> topicStatus = topicDao.getTopicStatus(agencyId);
-        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString());
         if (topicStatus.size() != NumConstant.ZERO){
             topicStatus.forEach(topic -> {
                 if (topic.getTopicStatus().equals(TopicConstant.DISCUSSING)){

epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml

@@ -10,7 +10,7 @@
             group_total_count AS groupTotalCount,
             group_member_avg_count AS groupPeopleAvg,
             group_median AS groupPeopleMedian,
-            DATE_FORMAT( date_id, '%Y-%m-%d' ) AS deadline
+            DATE_FORMAT( date_id, '%Y.%m.%d' ) AS deadline
         FROM fact_group_agency_daily
         WHERE del_flag = '0'
         AND agency_id = #{agencyId}

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

@@ -362,16 +362,18 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Transactional(rollbackFor = Exception.class)
     public void closeIssue(CloseIssueFormDTO formDTO) {
 		//公开回复内容审核
-		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		if (StringUtils.isNotBlank(formDTO.getCloseReason())) {
-		TextTaskDTO taskDTO = new TextTaskDTO();
+			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-		taskDTO.setContent(formDTO.getCloseReason());
+			TextTaskDTO taskDTO = new TextTaskDTO();
-		textScanParamDTO.getTasks().add(taskDTO);
+			taskDTO.setContent(formDTO.getCloseReason());
-		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+			textScanParamDTO.getTasks().add(taskDTO);
-		if (!textSyncScanResult.success()){
+			Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+			if (!textSyncScanResult.success()){
-		} else {
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-			if (!textSyncScanResult.getData().isAllPass()) {
+			} else {
-				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				if (!textSyncScanResult.getData().isAllPass()) {
+					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				}
 			}
 		}
 
@@ -504,16 +506,18 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 	@Transactional(rollbackFor = Exception.class)
 	public void shiftProject(ShiftProjectFormDTO formDTO) {
 		//公开回复内容审核
-		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		if (StringUtils.isNotBlank(formDTO.getPublicReply())) {
-		TextTaskDTO taskDTO = new TextTaskDTO();
+			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-		taskDTO.setContent(formDTO.getPublicReply());
+			TextTaskDTO taskDTO = new TextTaskDTO();
-		textScanParamDTO.getTasks().add(taskDTO);
+			taskDTO.setContent(formDTO.getPublicReply());
-		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+			textScanParamDTO.getTasks().add(taskDTO);
-		if (!textSyncScanResult.success()){
+			Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+			if (!textSyncScanResult.success()) {
-		} else {
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-			if (!textSyncScanResult.getData().isAllPass()) {
+			} else {
-				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				if (!textSyncScanResult.getData().isAllPass()) {
+					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				}
 			}
 		}
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -187,16 +187,18 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     @Transactional(rollbackFor = Exception.class)
     public void transfer(TransferFormDTO formDTO) {
         //公开回复内容审核
-        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+        if (StringUtils.isNotBlank(formDTO.getPublicReply())) {
-        TextTaskDTO taskDTO = new TextTaskDTO();
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-        taskDTO.setContent(formDTO.getPublicReply());
+            TextTaskDTO taskDTO = new TextTaskDTO();
-        textScanParamDTO.getTasks().add(taskDTO);
+            taskDTO.setContent(formDTO.getPublicReply());
-        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            textScanParamDTO.getTasks().add(taskDTO);
-        if (!textSyncScanResult.success()){
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            if (!textSyncScanResult.success()) {
-        } else {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-            if (!textSyncScanResult.getData().isAllPass()) {
+            } else {
-                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                }
             }
         }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -300,16 +300,18 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void closed(ProjectClosedFromDTO fromDTO) {
 		//公开回复内容审核
-		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		if (StringUtils.isNotBlank(fromDTO.getPublicReply())) {
-		TextTaskDTO taskDTO = new TextTaskDTO();
+			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-		taskDTO.setContent(fromDTO.getPublicReply());
+			TextTaskDTO taskDTO = new TextTaskDTO();
-		textScanParamDTO.getTasks().add(taskDTO);
+			taskDTO.setContent(fromDTO.getPublicReply());
-		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+			textScanParamDTO.getTasks().add(taskDTO);
-		if (!textSyncScanResult.success()){
+			Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+			if (!textSyncScanResult.success()) {
-		} else {
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-			if (!textSyncScanResult.getData().isAllPass()) {
+			} else {
-				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				if (!textSyncScanResult.getData().isAllPass()) {
+					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				}
 			}
 		}
 
@@ -376,16 +378,18 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void projectReturn(ReturnFromDTO fromDTO) {
 		//公开回复内容审核
-		TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+		if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(fromDTO.getPublicReply())) {
-		TextTaskDTO taskDTO = new TextTaskDTO();
+			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-		taskDTO.setContent(fromDTO.getPublicReply());
+			TextTaskDTO taskDTO = new TextTaskDTO();
-		textScanParamDTO.getTasks().add(taskDTO);
+			taskDTO.setContent(fromDTO.getPublicReply());
-		Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+			textScanParamDTO.getTasks().add(taskDTO);
-		if (!textSyncScanResult.success()){
+			Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+			if (!textSyncScanResult.success()) {
-		} else {
+				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-			if (!textSyncScanResult.getData().isAllPass()) {
+			} else {
-				throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				if (!textSyncScanResult.getData().isAllPass()) {
+					throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+				}
 			}
 		}