Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -144,6 +144,9 @@ public class WechatController extends BaseController {
 		Collections.sort(params);
 		String tokenStr = StringUtils.join(params,"");
 		tokenStr = DigestUtils.sha1Hex(tokenStr);
+		System.out.println("=============回调get消息start=============");
+		System.out.println(echostr);
+		System.out.println("=============回调get消息end=============");
 		if(tokenStr.equals(signature)) {
 			return echostr;
 		} else {
@@ -227,6 +230,9 @@ public class WechatController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "获取微信传回的post信息", notes = "获取微信传回的post信息")
 	public String getWechatInfoPost(@RequestBody String xml, HttpServletResponse resp) {
 		Map<String, String> requtstMap = xmlToMap(xml);
+		System.out.println("=============回调post消息start=============");
+		System.out.println(xml);
+		System.out.println("=============回调post消息end=============");
 		return "1";
 	}
 
@@ -365,9 +371,11 @@ public class WechatController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据微信code获取openId和手机号接口", notes = "根据微信code获取openId和手机号接口")
 	public ResponseModel<WechatAccessDto> getOpenIdTel(@PathVariable String code) {
 		logger.info("公众号登录"+code);
+		System.out.println("公众号登录"+code);
 		WechatAccessDto wechatAccessDto = new WechatAccessDto();
 		String openId = wechatService.getOpenId(code);
 		logger.info("公众号登录openId"+openId);
+		System.out.println("公众号登录openId"+openId);
 		if(StringUtils.isNotEmpty(openId)) {
 			JSONObject userInfo = wechatService.getUserInfo(openId);
 			wechatAccessDto.setOpenId(openId);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

@@ -147,9 +147,9 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				userModel.setOrgRoleSeqs(roleSeqMap);
 				FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
 				String[] userIds = { userResult.getResult().getUserId() };
-				if (groupSeq != null) {
-					Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
-				}
+//				if (groupSeq != null) {
+//					Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+//				}
 			}
 		}
 	}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/CarcylUnitInspectMqTtlListener.java

@@ -105,9 +105,9 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 			userModel.setOrgRoleSeqs(orgRoles);
 			FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
 			String[] userIds = {userResult.getResult().getUserId()};
-			if (groupSeq != null) {
-				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
-			}
+//			if (groupSeq != null) {
+//				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+//			}
 		}
 	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -606,11 +606,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             temp.setTemplateId(TS_TEMPID);
             temp.setUrl(TS_URL+ "?id=" + dispatchTaskDto.getSequenceNbr());
             data.put("first","投诉建议任务已派遣，请尽快前往救援!");
-            data.put("keyword1","投诉建议");
-            data.put("keyword2", "投诉建议");
-            data.put("keyword3", alertCalled.getEmergencyPerson());
-            data.put("keyword4", alertCalled.getEmergencyCall());
-            data.put("keyword5", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
+            //data.put("keyword1","投诉建议");
+            //data.put("keyword2", "投诉建议");
+            data.put("keyword1", alertCalled.getEmergencyPerson());
+            //data.put("keyword4", alertCalled.getEmergencyCall());
+            data.put("keyword2", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
             data.put("remark", "任务已派遣，请尽快前往处置！");
             temp.setData(data);
         }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/WechatServiceImpl.java

@@ -159,6 +159,7 @@ public class WechatServiceImpl implements IWechatService {
         try {
             response = JSONObject.parseObject(responseStr);
         } catch (Exception e) {
+        	e.printStackTrace();
             throw  new BadRequest("发送模板消息出错：" + e.getMessage());
         }
         return response;

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -496,9 +496,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			org.setAmosOrgId(companyInfo.getSequenceNbr() + "");
 			org.setAmosOrgCode(companyInfo.getOrgCode());
 			iOrgUsrService.save(org);
-			if (groupSeq != null) {
-				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
-			}
+//			if (groupSeq != null) {
+//				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+//			}
 		} catch (Exception e) {
 			// 删除已经创建的 企业信息
 			if (companyInfo != null && companyInfo.getSequenceNbr() != null) {