zhaozhengjie
2022-09-16 7a132c734d1ed3b1018ccd6d586aa83c3c02c753
bug修改
13个文件已修改
81 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysUserDao.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysUser.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysUserMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -334,4 +334,9 @@
        R r=tokenService.tfLogin(uuLoginVO.getMobile(),"Huacheng@123","wx118de8a734d269f0");
        return r;
    }
    @ApiOperation("用户授权")
    @GetMapping("/accept")
    public R accept(){
        return userService.accept(this.getUserId());
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1274,4 +1274,9 @@
    @PostMapping("/tfLogin")
    R tfLogin(@RequestBody UuLoginVO uuLoginVO);
    @GetMapping("/accept")
     R accept(Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java
@@ -41,6 +41,9 @@
    public static final String ACID_DIRECT_ROUTING_KEY = "huacheng.acid.direct.key";
    public static final String ACID_DIRECT_EXCHANGE = "huacheng.acid.direct.exchange";
    public static final String ACID_MESSAGE_QUEUE="huacheng.acid.message.queue";
    public static final String ACID_MESSAGE_ROUTING_KEY = "huacheng.acid.message.key";
    public static final String ACID_MESSAGE_EXCHANGE = "huacheng.acid.message.exchange";
    @Bean
    public Queue preOrderQueue(){
@@ -124,6 +127,20 @@
    public Binding acidDirectBinding(){
        return BindingBuilder.bind(acidDirectQueue()).to(acidDirectExchange()).with(ACID_DIRECT_ROUTING_KEY).noargs();
    }
    @Bean
    public Queue acidMessageQueue(){
        return new Queue(ACID_MESSAGE_QUEUE,true,false,false,null);
    }
    @Bean
    public Exchange acidMessageExchange(){
        return new DirectExchange(ACID_MESSAGE_EXCHANGE,true,false);
    }
    @Bean
    public Binding acidMessageBinding(){
        return BindingBuilder.bind(acidMessageQueue()).to(acidMessageExchange()).with(ACID_MESSAGE_ROUTING_KEY).noargs();
    }
    @Bean
    public Queue mcsOrderQueue(){
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysUserDao.java
@@ -4,6 +4,8 @@
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.SysUser;
import java.util.List;
/**
 * 用户表 后台用户+小程序用户(SysUser)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
@@ -14,5 +16,5 @@
 */
@Mapper
public interface SysUserDao extends BaseMapper<SysUser> {
    List<String> selectOpenId();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysUser.java
@@ -266,4 +266,5 @@
    @ApiModelProperty(value = "绑定单位")
    private String relationName;
    private Integer isAccept;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
@@ -8,7 +8,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.SysUserDao;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
@@ -33,12 +35,15 @@
    public static final String DELAYED_QUEUE="huacheng.acid.queue";
    public static final String ACID_DANGER_QUEUE = "huacheng.acid.danger.queue";
    public static final String DIRECT_QUEUE="huacheng.acid.direct.queue";
    public static final String ACID_MESSAGE_QUEUE="huacheng.acid.message.queue";
    @Resource
    private UserService userService;
    @Resource
    private ComActAcidMemberService comActAcidMemberService;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private SysUserDao sysUserDao;
    @RabbitListener(queues=DELAYED_QUEUE)
    public void doTemplate(ComActAcidRecordVO comActAcidRecordVO) {
@@ -107,4 +112,16 @@
            }
        }
    }
    @RabbitListener(queues = ACID_MESSAGE_QUEUE)
    public void sendMessage(ComActDynVO comActDynVO){
        List<String> openIds=sysUserDao.selectOpenId();
        WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
        for(String openId:openIds){
            try {
                WxUtil.sendLongTimeTemplate(openId,wxXCXTempSend.getAccessToken("wx118de8a734d269f0"),"疫情快讯","您有新的疫情快讯待查看","/pages/community_child/community/detail?id="+comActDynVO.getId()+"&title=疫情快讯详情");
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java
@@ -93,4 +93,6 @@
     * 类型(1.社区动态 2.党务公开 3.花城资讯)
     */
    private Integer category;
    private Integer readNum;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -103,6 +103,10 @@
                comActDynVO.setCommunityName(comActDO.getName());
            }
        }
        if(comActDynDO.getCategory()==4){
            comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
            comActDynDAO.updateById(comActDynDO);
        }
        return R.ok(comActDynVO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysUserMapper.xml
@@ -44,4 +44,7 @@
        <result property="relationName" column="relation_name"/>
    </resultMap>
    <select id="selectOpenId" resultType="String">
        select openid from sys_user where type = 1 and app_id ='wx118de8a734d269f0' and is_accept = 1
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1450,4 +1450,9 @@
    public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
        return userService.tfLogin(uuLoginVO);
    }
    @GetMapping("/accept")
    public R accept(Long userId){
        return userService.accept(userId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -208,4 +208,6 @@
    private String relationName;
    private String appId;
    private Integer isAccept;
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -920,4 +920,11 @@
     * @return
     */
    R tfLogin(UuLoginVO uuLoginVO);
    /**
     * 用户授权
     * @param userId
     * @return
     */
    R accept(Long userId);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3662,6 +3662,15 @@
        return R.ok();
    }
    @Override
    public R accept(Long userId) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userId);
        sysUserDO.setIsAccept(1);
        userDao.updateById(sysUserDO);
        return R.ok();
    }
    @Override
    public R getAreaAndStreet() {