瀏覽代碼

IM回调推送模版消息接口

huangwenjie 5 年之前
父節點
當前提交
08107fa817

+ 8 - 6
common/common-util/src/main/java/com/yihu/jw/util/common/FileUtil.java

@ -5,6 +5,7 @@ import com.yihu.fastdfs.FastDFSUtil;
import it.sauronsoftware.jave.*;
import it.sauronsoftware.jave.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.File;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileInputStream;
@ -15,10 +16,11 @@ import java.io.InputStream;
 * 文件处理工具类
 * 文件处理工具类
 * @author huangwenjie
 * @author huangwenjie
 */
 */
@Component
public class FileUtil {
public class FileUtil {
	
	
	@Autowired
	@Autowired
	private FastDFSUtil fastDFSHelper;
	public FastDFSUtil fastDFSHelper;
	
	
	public void changeToMp3(String sourcePath, String targetPath) {
	public void changeToMp3(String sourcePath, String targetPath) {
		File source = new File(sourcePath);
		File source = new File(sourcePath);
@ -49,15 +51,16 @@ public class FileUtil {
	 */
	 */
	
	
	
	
	public String copyTempVoice(String voices_Path,String fastdfs_file_url) throws Exception {
	public  String copyTempVoice(String voices_Path,String fastdfs_file_url) throws Exception {
		// 文件保存的临时路径
		// 文件保存的临时路径
		FastDFSUtil fastDFSUtil = new FastDFSUtil();
		String fileUrls = "";
		String fileUrls = "";
		File f = new File(voices_Path);
		File f = new File(voices_Path);
		if (f.exists()) {
		if (f.exists()) {
			String fileName = f.getName();
			String fileName = f.getName();
			InputStream in = new FileInputStream(f);
			InputStream in = new FileInputStream(f);
			ObjectNode result = fastDFSUtil.upload(in, fileName.substring(fileName.lastIndexOf(".") + 1), "");
			//得到文件类型
			String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
			ObjectNode result = fastDFSHelper.upload(in, fileType, "");
			in.close();
			in.close();
			if (result != null) {
			if (result != null) {
				fileUrls += (StringUtils.isEmpty(fileUrls) ? "" : ",") + fastdfs_file_url
				fileUrls += (StringUtils.isEmpty(fileUrls) ? "" : ",") + fastdfs_file_url
@ -79,7 +82,6 @@ public class FileUtil {
	public String copyTempImage(String files,String tempPath) throws Exception {
	public String copyTempImage(String files,String tempPath) throws Exception {
		// 文件保存的临时路径
		// 文件保存的临时路径
		String[] fileArray = files.split(",");
		String[] fileArray = files.split(",");
		FastDFSUtil fastDFSUtil = new FastDFSUtil();
		String fileUrls = "";
		String fileUrls = "";
		for (String file : fileArray) {
		for (String file : fileArray) {
			File f = new File(tempPath + file);
			File f = new File(tempPath + file);
@ -87,7 +89,7 @@ public class FileUtil {
			if (f.exists()) {
			if (f.exists()) {
				String fileName = f.getName();
				String fileName = f.getName();
				InputStream in = new FileInputStream(f);
				InputStream in = new FileInputStream(f);
				ObjectNode result = fastDFSUtil.upload(in, fileName.substring(fileName.lastIndexOf(".") + 1), "");
				ObjectNode result = fastDFSHelper.upload(in, fileName.substring(fileName.lastIndexOf(".") + 1), "");
				in.close();
				in.close();
				if (result != null) {
				if (result != null) {
					//1.3.7去掉前缀
					//1.3.7去掉前缀

+ 3 - 5
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@ -16,17 +16,14 @@ import com.yihu.jw.im.service.ImService;
import com.yihu.jw.order.BusinessOrderService;
import com.yihu.jw.order.BusinessOrderService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.restmodel.im.ConsultVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.enterprise.EnterpriseService;
import com.yihu.jw.wechat.enterprise.EnterpriseService;
import com.yihu.jw.wechat.service.WechatInfoService;
import com.yihu.jw.wechat.service.WechatInfoService;
@ -92,8 +89,6 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@Autowired
	@Autowired
	private BusinessOrderService businessOrderService;
	private BusinessOrderService businessOrderService;
	
	
	public FileUtil fileUtil;
	
	@Value("${fastDFS.fastdfs_file_url}")
	@Value("${fastDFS.fastdfs_file_url}")
	private String fastdfs_file_url;
	private String fastdfs_file_url;
	
	
@ -109,6 +104,9 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@Value("${wechat.id}")
	@Value("${wechat.id}")
	private String wxId;
	private String wxId;
	
	
	@Autowired
	private FileUtil fileUtil;
	
	@GetMapping(value = BaseHospitalRequestMapping.PatientIM.records)
	@GetMapping(value = BaseHospitalRequestMapping.PatientIM.records)
	@ApiOperation(value = "患者咨询记录查询")
	@ApiOperation(value = "患者咨询记录查询")
	public Envelop records(
	public Envelop records(