Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/third/gateway/controller/doctor/GcMessageController.java

@@ -25,7 +25,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2017/8/17.
@@ -46,7 +48,7 @@ public class GcMessageController {
    private SMSService smsService;
    @Autowired
    private DoctorDao doctorDao;
    @Value("${wechat.message.template_doctor_survey}")
    @Value("${wechat.message.template_consult_notice}")
    private String templateId;
    @Value("${server.server_url}")
    private String server_url;
@@ -115,8 +117,8 @@ public class GcMessageController {
    /**
     * 客服系统发送消息接口
     *
     * @param openIds      微信openid
     * @param content     消息内容限制字数70
     * @param openIds 微信openid
     * @param content 消息内容限制字数70
     * @return
     */
    @RequestMapping(value = "/sendWechatMessage", method = RequestMethod.POST)
@@ -133,9 +135,12 @@ public class GcMessageController {
            for (String openId : codeArr) {
                try {
                    JSONObject sendJson = weiXinTempMsgSendUtils.packageTemplate("消息头", "备注", content, "2017年9月16日 18:00");
                    weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, sendJson);
                    Boolean flag = weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, sendJson);
                    logger.info("send wechat message param : " + openId+" =======> "+content);
                    logger.info("send wechat message retuen : " + openId+" =======> "+flag);
                    success++;
                } catch (Exception e) {
                    e.printStackTrace();
                    logger.error("openids " + openIds + " send Template error:" + e.getMessage());
                    error++;
                    errorLiust.add(openIds);
@@ -149,32 +154,40 @@ public class GcMessageController {
    }
    /**
     * 客服系统发送消息接口 居民没有有openID只发手机短信 有openID发微信模板消息、手机短信
     * 客服系统发送消息接口 居民没有有openID只发手机短信 有openID发微信模板消息、手机短信 没有IP次数限制
     *
     * @param mobiles     手机号.多个用逗号分隔
     * @param mobiles 手机号.多个用逗号分隔
     * @param content
     * @return
     */
    @RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
    @ApiOperation("客服系统发送消息接口")
    @ApiOperation("客服系统发送短信接口")
    public ResultBatchModel sendMessage(
            @ApiParam(name = "mobiles", value = "医生code(批量逗号分割)", required = true) @RequestParam(value = "mobiles", required = true) String mobiles,
            @ApiParam(name = "mobiles", value = "手机号(批量逗号分割)", required = true) @RequestParam(value = "mobiles", required = true) String mobiles,
            @ApiParam(name = "content", value = "消息内容", required = true) @RequestParam(value = "content", required = true) String content) {
        Integer success = 0;
        Integer error = 0;
        List<String> errorLiust = new ArrayList<>();
        String[] codeArr = mobiles.split(",");
        for (String mobile : codeArr) {
            try {
                smsService.sendMsg(mobile, content);
                success++;
            } catch (Exception e) {
                logger.error("mobile " + mobile + " send message error:" + e.getMessage());
                error++;
                errorLiust.add(mobile);
        try {
            String[] codeArr = mobiles.split(",");
            for (String mobile : codeArr) {
                try {
                    JSONObject result = smsService.sendMsg(mobile, content);
                    logger.info("send mobile message param : "+mobile+" ====> "+content);
                    logger.info("send mobile message return : "+result);
                    success++;
                } catch (Exception e) {
                    e.printStackTrace();
                    logger.error("mobile " + mobile + " send message error:" + e.getMessage());
                    error++;
                    errorLiust.add(mobile);
                }
            }
            return new ResultBatchModel(success, error, errorLiust);
        } catch (Exception e) {
            e.printStackTrace();
            return new ResultBatchModel(-1, "发送失败！", success, error, errorLiust);
        }
        return new ResultBatchModel(success, error, errorLiust);
    }
}