Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -253,6 +253,7 @@ public class BaseRequestMapping {
        public static final String findImg ="/findImg";
        public static final String findGraphicMessageSingle ="/findGraphicMessageSingle";
        public static final String saveImgGroup ="/saveImgGroup";
        public static final String deleteImgGroupRelation ="/deleteImgGroupRelation";
        public static final String saveWxReplyScene ="/saveWxReplyScene";
        public static final String findWxReplyScene ="/findWxReplyScene";

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxGraphicSceneGroupDao.java

@@ -12,4 +12,6 @@ import java.util.List;
public interface WxGraphicSceneGroupDao extends PagingAndSortingRepository<WxGraphicSceneGroupDO, String>, JpaSpecificationExecutor<WxGraphicSceneGroupDO> {
    List<WxGraphicSceneGroupDO> findByWechatIdAndScene(String wechatId, String scene);
    WxGraphicSceneGroupDO findByWechatIdAndSceneAndGraphicId(String wechatId, String scene,String graphicId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WechatController.java

@@ -173,13 +173,24 @@ public class WechatController extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.WeChat.saveImgGroup)
    @ApiOperation(value = "分组图文素材", notes = "分组图文素材")
    public Envelop saveImgGroup(@ApiParam(name = "groups", value = "微信id")
    public Envelop saveImgGroup(@ApiParam(name = "groups", value = "图文消息关系json")
                                @RequestParam(value = "groups", required = true)String groups) {
        List<WxGraphicSceneGroupDO> list = (List<WxGraphicSceneGroupDO>) JSONArray.parseArray(groups, WxGraphicSceneGroupDO.class);
        return wechatService.saveImgGroup(list);
    }
    @PostMapping(value = BaseRequestMapping.WeChat.saveWxReplyScene)
    @PostMapping(value = BaseRequestMapping.WeChat.deleteImgGroupRelation)
    @ApiOperation(value = "分组图文素材", notes = "分组图文素材")
    public Envelop deleteImgGroupRelation(@ApiParam(name = "wechatId", value = "微信id")
                                          @RequestParam(value = "wechatId", required = true)String wechatId,
                                          @ApiParam(name = "scene", value = "图文分组名称（场景值）")
                                          @RequestParam(value = "scene", required = true)String scene,
                                          @ApiParam(name = "imgId", value = "图文id")
                                          @RequestParam(value = "imgId", required = true)String imgId) {
        return wechatService.deleteImgGroupRelation(wechatId,scene,imgId);
    }
        @PostMapping(value = BaseRequestMapping.WeChat.saveWxReplyScene)
    @ApiOperation(value = "事件配置场景", notes = "事件配置场景")
    public Envelop saveWxReplyScene(@ApiParam(name = "wxReplySceneJson", value = "事件配置json")
                                    @RequestParam(value = "wxReplySceneJson", required = true)String wxReplySceneJson) throws Exception{

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WeChatQrcodeService.java

@@ -48,15 +48,17 @@ public class WeChatQrcodeService {
                connection.connect();
                inputStream = connection.getInputStream();
                String pathFile = request.getSession().getServletContext().getRealPath("/")
                        + File.separator + "qrcode" + File.separator + wechatId+"_"+scene+".png";
                File file = new File(pathFile);
                if(!file.exists()){
                    file.mkdir();
//                String pathFile = request.getSession().getServletContext().getRealPath("/")
//                        + File.separator + "qrcode" + File.separator + wechatId+"_"+scene+".png";
                String path = WeChatQrcodeService.class.getResource("/").getPath().replace("/WEB-INF/classes/", "")
                        + File.separator + "qrcode" ;
                File dir = new File(path);
                if(!dir.exists()){
                    dir.mkdir();
                }
                path+= File.separator + wechatId+"_"+scene+".png";
                File file = new File(path);
                // 保存文件
                FileOutputStream outputStream = new FileOutputStream(file);
@@ -71,8 +73,10 @@ public class WeChatQrcodeService {
                ObjectNode objectNode = fastDFSHelper.upload(input,"png","");
                if(file.exists()){
                    file.delete();
                File del = new File(path);
                if(del.exists()&&del.isFile()){
                    del.delete();
                }
                if (outputStream != null) {

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -303,7 +303,7 @@ public class WechatService {
            sql += " AND m.title LIKE '%"+title+"%' " ;
        }
        if(StringUtils.isNotBlank(scene)){
            sql+= " AND g.scene = '"+scene+"'";
            sql+= " AND g.scene = '"+scene+"' ORDER BY g.scene ASC ";
        }
        sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
        List<WxGraphicMessageVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WxGraphicMessageVO.class));
@@ -323,6 +323,12 @@ public class WechatService {
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
    }
    public Envelop deleteImgGroupRelation(String wechatId,String scene,String imgId){
        WxGraphicSceneGroupDO wxGraphicSceneGroupDO = wxGraphicSceneGroupDao.findByWechatIdAndSceneAndGraphicId(wechatId,scene,imgId);
        wxGraphicSceneGroupDao.delete(wxGraphicSceneGroupDO);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);
    }
    public Envelop saveWxReplyScene(WxReplySceneDO wxReplySceneDO){
        wxReplySceneDao.save(wxReplySceneDO);
        return Envelop.getSuccess(BaseRequestMapping.WeChat.api_success);