新增浪潮接口

lidongdong

2023-04-23 ce10955e684b01ae8b9814169ec6675be66a4010

新增浪潮接口

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -578,6 +578,16 @@
    R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 分页查询随手拍   浪潮专用
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 心愿列表
     */
    @GetMapping("pageEasyPhotoAdminLC")
    R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);

    /**
     * 随手拍详情
     *
     * @param id

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -775,6 +775,12 @@
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation(value = "分页查询随手拍  浪潮专用")
    @GetMapping("pageEasyPhotoAdminLC")
    public R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize) {
        return communityService.pageEasyPhotoAdminLC(pageNum,pageSize);
    }

    @ApiOperation(value = "城管分页查询随手拍")
    @PostMapping("pageeasyphoto/urban")
    public R pageEasyPhotoUrban(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -788,6 +788,18 @@
    }

    /**
     * 分页查询随手拍  浪潮专用
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 心愿列表
     */
    @GetMapping("pageEasyPhotoAdminLC")
    public R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize) {
        return comActEasyPhotoService.pageEasyPhotoAdminLC(pageNum,pageSize);
    }

    /**
     * 城管安排
     *
     * @param comActEasyPhotoVO

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -181,6 +181,8 @@
    IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);

    IPage<ComActEasyPhotoVO> pageEasyPhotoAdmin(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);

    IPage<ComActEasyPhotoVO> pageEasyPhotoAdminLC(Page page);
    @Select("SELECT  " +
            "p.id, " +
            "p.sponsor_id, " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java

@@ -2,6 +2,8 @@

import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
@@ -12,6 +14,7 @@
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import io.swagger.annotations.ApiModelProperty;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -29,6 +32,13 @@
     */
    R pageEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);


    /**
     *浪潮专用
     * @param page
     * @return
     */
    R pageEasyPhotoAdminLC(Long pageNum,Long pageSize);
    /**
     * 随手拍详情
     * 

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -150,6 +150,51 @@
        return R.ok(iPage);
    }

    @Override
    public R pageEasyPhotoAdminLC(Long pageNum,Long pageSize) {
        Page page = new Page<>();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoAdminLC(page);
        List<ComActEasyPhotoVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActEasyPhotoVO1 -> {
                Long id = comActEasyPhotoVO1.getId();

                if (comActEasyPhotoVO1.getActivityId() != null
                        && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.dpj)) {
                    // 查询随手拍活动
                    ComActEasyPhotoActivityDO photoActivityDO =
                            comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
                    if (photoActivityDO != null) {
                        if (comActEasyPhotoVO1.getActivityType() != null) {
                            if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)) {
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward());
                            } else if (comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.wu)) {
                                comActEasyPhotoVO1.setActivityMoney(BigDecimal.ZERO);
                            }
                        }
                    }
                }
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }


    /**
     * 随手拍详情
     *

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -631,4 +631,62 @@
        FROM `com_act_easy_photo` WHERE date_format(create_at,'%Y-%m') >= date_format(date_sub(now(), INTERVAL 9 MONTH),'%Y-%m') and del_tag = 0 GROUP BY  statistics_date, `status`
    </select>



    <!--  浪潮专用接口  -->
    <select id="pageEasyPhotoAdminLC" resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO">
        SELECT
        p.id,
        u.`name` sponsor_name,
        u.phone phone,
        count( pu.id ) giveThumbsUpNum,
        u.image_url,
        p.happen_addr,
        su.`name` handler_name,
        p.`status`,
        p.`detail`,
        p.`is_need_feed_back`,
        p.`photo_path_list`,
        p.create_at,
        p.feedback_at,
        p.is_report,
        p.is_publicity,
        p.activity_type,
        p.activity_amount,
        p.activity_id,
        p.is_report_urban,
        p.is_report_dpc,
        p.classify_id,
        ca.`name` as classifyName,
        p.examine_at,
        c.name  communityName,
        p.urban_status,
        p.transfer_reason,
        p.add_type,
        p.handle_status
        FROM
        com_act_easy_photo p
        LEFT JOIN sys_user u ON p.sponsor_id = u.user_id
        LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
        LEFT JOIN sys_user su ON p.handler_id = su.user_id
        left join com_act c on p.community_id =c.community_id
        left join com_act_easy_photo_classify ca on ca.id = p.classify_id
        WHERE
        p.del_tag = 0
        and p.add_type = 1
        AND p.`status` = 5
        GROUP BY
        p.id
        ORDER BY
        p.create_at DESC

    </select>








</mapper>

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -99,6 +99,7 @@
        boolean noToken = requestURI.contains("noToken");
        boolean listadvertisement = requestURI.contains("listadvertisement");
        boolean basicScreen = requestURI.contains("basicScreen");
        boolean pageEasyPhotoAdminLC = requestURI.contains("pageEasyPhotoAdminLC");
        // boolean bigscreen = requestURI.contains("/bigscreen/party");
        // boolean pageworkguide = !requestURI.contains("workguide/pageworkguide");
        // boolean detailworkguide = !requestURI.contains("workguide/detailworkguide");
@@ -109,7 +110,8 @@
        safeboxRequestWrapper.addHeader("appid",request.getHeader("appid"));
        if (login || doc || css || js || ui || swagger || ico || docs || error || refreshToken || useragreement || wxPay
        // ||wxCgi||isShop||listadvertisement||noToken||bigscreen) {
            || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha||uuPush||tfLogin||batteryActivityPayNotify||batteryPayNotify|| wsPush || basicScreen) {
            || wxCgi || isShop || listadvertisement || noToken||uuRepay||kaphtcha||uuPush||tfLogin||batteryActivityPayNotify
                ||batteryPayNotify|| wsPush || basicScreen||pageEasyPhotoAdminLC) {
            // 什么也不做
        } else {
            // 获取请求头中JWT的Token