Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-30 5726af81e3401c3805a4e50dbada5ffc6c34ef16

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.api;

/**
 * 攀枝花综治网格化-字段key
 *
 * @author manailin
 * @date 2021/06/16
 */
public class DictionItemConstants {

    private DictionItemConstants() {
        throw new IllegalStateException("Utility class");
    }

    /**
     * 文化层度字典编码
     */
    public static final String LC_CULTURE_LEVEL = "1156457421221564414";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java

@@ -9,6 +9,10 @@
public class LcApiConstants
{

    private LcApiConstants() {
        throw new IllegalStateException("Utility class");
    }

    /**
     * 将浪潮对接接口中所需的固定账号名称，账号和密码登陆来获取token
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/LcEventVisitingTasksListDTO.java

@@ -5,7 +5,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryItemVO.java

New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.vos;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * @author manailin
 * @date 2021/6/11 16:27
 */
@ApiModel("字典项")
@Data
public class BcDictionaryItemVO implements Serializable {

    /**
     * 字典项名
     */
    private String dictItemName;

    /**
     * 字典项值
     */
    private String dictValue;

    /**
     * 助记码
     */
    private String mnemonicCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java

@@ -123,6 +123,9 @@
    private String nativePlace;

    @ApiModelProperty("民族")
    private String nationCode;

    @ApiModelProperty("民族")
    private String nation;

    @ApiModelProperty("小区名字")
@@ -156,6 +159,11 @@
    @ApiModelProperty("户口所在地")
    private String censusRegister;

    /**
     * 居住地址
     */
    private String address;

    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java

@@ -2,46 +2,49 @@

import com.panzhihua.common.model.dtos.api.EventFile;
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
 *
 * @author manailin
 * desc  主要是提供给浪潮服务器上传事件
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 * @since 1.0
 */
@FeignClient(name = "serviceApi")
public interface ApiServiceFeign {


    /**
     * description 生成或更新redis里面的对接浪潮所需的token信息
     * @param name 账号
     *
     * @param name     账号
     * @param password 密码
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @GetMapping("get/token")
    void getToken(@RequestParam("name") String name,@RequestParam("password") String password);
    void getToken(@RequestParam("name") String name, @RequestParam("password") String password);

    /**
     * description 向浪潮服务器提交网格事件登记     *
     *
     * @param eventInfo 事件信息对象
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("lc/event/upload")
    void automationUpload(@RequestBody EventInfo eventInfo);

    /**
     * description 提交事件登记关联的文件或者图片信息
     *
     * @param eventFile 文件对象
     * @return R 上传结果
     * @author manailin

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

@@ -9,7 +9,6 @@
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
@@ -22,18 +21,13 @@
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -46,16 +40,14 @@
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.List;

/**
@@ -279,7 +271,8 @@

    /**
     * 查询随手拍是否有活动
     * @return  活动详情
     *
     * @return 活动详情
     */
    @PostMapping("getEasyPhotoActivity")
    R getEasyPhotoActivity(@RequestParam("communityId") Long communityId);
@@ -481,7 +474,7 @@
     * @return 增加结果
     */
    @GetMapping("getVolunteerById")
    R getVolunteerById(@RequestParam("id")Long id);
    R getVolunteerById(@RequestParam("id") Long id);

    /**
     * 增加志愿者
@@ -1384,7 +1377,7 @@
     * @param list 便民服务集合
     */
    @PostMapping("/convenient/serve/import")
    R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId);
    R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId", required = false) Long communityId);

    /**
     * 导出房屋信息
@@ -1672,9 +1665,10 @@

    /**
     * 确认导入实有人口（有则更新，无则新建）
     * @param list  用户信息
     * @param communityId   社区id
     * @return  导入结果
     *
     * @param list        用户信息
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/import/confirm")
    R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
@@ -1695,12 +1689,13 @@
     * @return 实有人口详细信息
     */
    @PostMapping("/common/data/population/detail")
    R detailPopulation(@RequestParam(value = "populationId") Long populationId);
    R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId);

    /**
     * 根据id查询实有人口电子档案信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     *
     * @param populationId 实有人口id
     * @return 实有人口电子档信息
     */
    @PostMapping("/common/data/population/electronicArchives")
    R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);
@@ -1768,7 +1763,7 @@
     * @return
     */
    @PostMapping("/questnaire/editquestnaire")
    R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) ;
    R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);


    /**
@@ -1787,7 +1782,7 @@
     * @return
     */
    @PostMapping("/questnaire/deletequestnaire")
    R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
    R editQuestnaireDO(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId);

    /**
     * 问卷答题结果
@@ -1800,6 +1795,7 @@

    /**
     * 问卷调查详细
     *
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
@@ -1808,7 +1804,8 @@

    /**
     * 用户问卷调查详细
     * @param userId 用户ID
     *
     * @param userId  用户ID
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
@@ -1817,6 +1814,7 @@

    /**
     * 查看用户问卷调查统计信息
     *
     * @param questId 问卷ID
     * @return 用户问卷调查统计信息
     */
@@ -1835,6 +1833,7 @@

    /**
     * 社区问卷分页
     *
     * @param pageQuestnaireAnswerDTO 社区问卷分页参数
     * @return 分页数据
     */
@@ -1844,6 +1843,7 @@

    /**
     * 居民填写问卷调查问卷
     *
     * @param usersAnswerQuestnaireVO 填写情况
     */
    @PostMapping("/questnaire/usersanswequestnaire")
@@ -1851,6 +1851,7 @@

    /**
     * 店铺列表-分页查询
     *
     * @param pageComShopStoreDTO 分页条件
     */
    @PostMapping("/shop/pageShopStore")
@@ -1858,6 +1859,7 @@

    /**
     * 保存店铺
     *
     * @param storeVO 数据
     */
    @PostMapping("/shop/saveStore")
@@ -1865,22 +1867,25 @@

    /**
     * 新增店铺
     * @param storeVO   店铺信息
     * @return  新增结果
     *
     * @param storeVO 店铺信息
     * @return 新增结果
     */
    @PostMapping("/shop/addStore")
    R addStore(@RequestBody ShopStoreVO storeVO);

    /**
     * 编辑店铺、启用、禁用
     *
     * @param storeVO 数据
     * @param id 商铺id
     * @param id      商铺id
     */
    @PostMapping("/shop/editStore/{id}")
    R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);

    /**
     * 删除店铺
     *
     * @param id 商铺id
     */
    @PostMapping("/shop/deleteStore")
@@ -1888,14 +1893,16 @@

    /**
     * 获取详情
     *
     * @param id 商铺id
     */
    @GetMapping("/shop/getStoreInfo")
    R getStoreInfo(@RequestParam("id")Long id);
    R getStoreInfo(@RequestParam("id") Long id);


    /**
     * 商品列表-分页查询
     *
     * @param pageComShopGoodsDTO 添加数据
     */
    @PostMapping("/shop/pageGoods")
@@ -1903,6 +1910,7 @@

    /**
     * 新增商品
     *
     * @param addShopGoodsVO
     * @return
     */
@@ -1911,29 +1919,35 @@

    /**
     * 编辑商品
     *
     * @param id
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shop/editShopGoods/{id}")
    R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO);
    R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO);

    /**
     * 删除商品
     *
     * @param id
     * @return
     */
    @PostMapping("/shop/deleteShopGoods")
    R deleteShopGoods(@RequestBody Long[] id);

    /**
     * 修改商品状态
     *
     * @param id
     * @return
     */
    @GetMapping("/shop/changeShopGoodsStatus")
    R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
    R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 结果
     *
     * @param shopOperlog 商城后台操作日志
     */
    @PostMapping("/shop/addShopOperLog")
@@ -1941,6 +1955,7 @@

    /**
     * 分页查询 商家后台操作日志
     *
     * @param pageDTO 分页数据
     * @return 分页日志
     */
@@ -1949,181 +1964,205 @@

    /**
     * 订单分页查询
     *
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 订单分页查询
     */
    @PostMapping("/shop/order/page")
    R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

    /**
     * 分页查询店铺列表
     * @param comShopStoreDTO   请求参数
     * @return  店铺列表
     *
     * @param comShopStoreDTO 请求参数
     * @return 店铺列表
     */
    @PostMapping("/shop/pageShopStore")
    R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO);

    /**
     * 根据id查询店铺详情
     * @param comShopStoreDTO   请求参数
     * @return  店铺详情
     *
     * @param comShopStoreDTO 请求参数
     * @return 店铺详情
     */
    @PostMapping("/shop/shopStoreDetail")
    R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO);

    /**
     * 分页查询商品列表
     * @param comShopGoodsDTO   请求参数
     * @return  商品列表
     *
     * @param comShopGoodsDTO 请求参数
     * @return 商品列表
     */
    @PostMapping("/shop/pageShopGoods")
    R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO);

    /**
     * 根据商品id查询商品信息
     * @param goodsId   商品id
     * @return  商品信息
     *
     * @param goodsId 商品id
     * @return 商品信息
     */
    @PostMapping("/shop/shopGoodsDetail")
    R shopGoodsDetail(@RequestParam("goodsId") Long goodsId);

    /**
     * 查询用户购物车列表
     * @param userId    用户id
     * @return  购物车列表
     *
     * @param userId 用户id
     * @return 购物车列表
     */
    @PostMapping("/shop/shopCartList")
    R shopCartList(@RequestParam("userId") Long userId);

    /**
     * 查询用户购物车数量
     * @param userId    用户id
     * @return  用户购物车商品数量
     *
     * @param userId 用户id
     * @return 用户购物车商品数量
     */
    @PostMapping("/shop/shopCartUserTotal")
    R shopCartUserTotal(@RequestParam("userId") Long userId);

    /**
     * 购物车添加
     * @param comShopCartDTO    请求参数
     * @return  购物车列表
     *
     * @param comShopCartDTO 请求参数
     * @return 购物车列表
     */
    @PostMapping("/shop/shopAddCart")
    R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO);

    /**
     * 购物车内商品数量修改
     * @param shopEditNubCartDTO    请求参数
     * @return  修改结果
     *
     * @param shopEditNubCartDTO 请求参数
     * @return 修改结果
     */
    @PostMapping("/shop/shopEditNubCart")
    R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO);

    /**
     * 删除购物车记录
     * @param Ids   购物车id集合
     * @return  删除结果
     *
     * @param Ids 购物车id集合
     * @return 删除结果
     */
    @PostMapping("/shop/shopDelCart")
    R shopDelCart(@RequestBody List<Long> Ids);

    /**
     * 分页查询用户收货地址列表
     * @param comShopAddressDTO    请求参数
     * @return  用户收货地址列表
     *
     * @param comShopAddressDTO 请求参数
     * @return 用户收货地址列表
     */
    @PostMapping("/shop/shopUserAddressList")
    R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

    /**
     * 用户添加收货地址
     *
     * @param comShopAddressDTO 请求参数
     * @return  添加结果
     * @return 添加结果
     */
    @PostMapping("/shop/shopAddUserAddress")
    R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO 请求参数
     * @return  修改结果
     * @return 修改结果
     */
    @PostMapping("/shop/shopEditUserAddress")
    R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户删除收货地址
     *
     * @param addressId 收货地址id
     * @return  删除结果
     * @return 删除结果
     */
    @PostMapping("/shop/shopDelUserAddress")
    R shopDelUserAddress(@RequestParam("addressId") Long addressId);

    /**
     * 订单预览
     * @param orderPreviewDTO   请求参数
     * @return  订单预览数据
     *
     * @param orderPreviewDTO 请求参数
     * @return 订单预览数据
     */
    @PostMapping("/shop/orderPreview")
    R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

    /**
     * 创建订单
     * @param orderCreateDTO    创建订单请求参数
     * @return  创建结果
     *
     * @param orderCreateDTO 创建订单请求参数
     * @return 创建结果
     */
    @PostMapping("/shop/orderCreate")
    R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

    /**
     * 分页查询用户订单列表
     * @param comOrderListDTO   请求参数
     * @return  查询结果
     *
     * @param comOrderListDTO 请求参数
     * @return 查询结果
     */
    @PostMapping("/shop/pageOrderList")
    R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO);

    /**
     * 根据订单id查询订单详情
     * @param orderId   订单id
     * @return  订单详情
     *
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("/shop/orderDetail")
    R orderDetail(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id取消订单
     * @param comShopOrderQueryDTO   请求参数
     * @return  取消结果
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 取消结果
     */
    @PostMapping("/shop/orderCancel")
    R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单
     * @param orderId   订单id
     * @return  删除结果
     *
     * @param orderId 订单id
     * @return 删除结果
     */
    @PostMapping("/shop/orderDelete")
    R orderDelete(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id确认收货
     * @param comShopOrderQueryDTO   请求参数
     * @return  确认结果
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 确认结果
     */
    @PostMapping("/shop/orderConfirm")
    R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 统计用户订单数量
     * @param userId    用户id
     * @return  统计结果
     *
     * @param userId 用户id
     * @return 统计结果
     */
    @PostMapping("/shop/orderStatistics")
    R orderStatistics(@RequestParam("userId") Long userId);

    /**
     * 商家资金的订单详情
     *
     * @param id
     * @return
     */
@@ -2133,30 +2172,34 @@

    /**
     * 订单发货
     *
     * @param orderShipDTO 商城订单发货信息
     * @return  发货结果
     * @return 发货结果
     */
    @PostMapping("/shop/shipOrder")
    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单信息
     * @return  配送结果
     * @return 配送结果
     */
    @PostMapping("/shop/deliverOrder")
    R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 订单完成配送
     *
     * @param deliverDTO 订单信息
     * @return  配送完成结果
     * @return 配送完成结果
     */
    @PostMapping("/shop/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 获取用户商户详情
     *
     * @param userId 用户ID
     */
    @GetMapping("/shop/getUserStoreInfo")
@@ -2164,6 +2207,7 @@

    /**
     * 获取用户商户详情
     *
     * @param account 用户账号
     */
    @GetMapping("/shop/getUserStoreInfoByAccount")
@@ -2171,53 +2215,60 @@

    /**
     * 订单导出信息
     *
     * @param comShopOrderExportDTO 订单导出信息
     * @return  订单导出信息
     * @return 订单导出信息
     */
    @PostMapping("/shop/shopOrderExportData")
    R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO);

    /**
     * 资金管理导出信息
     *
     * @param comShopFundsExportDTO 资金管理导出信息
     * @return  资金管理导出信息
     * @return 资金管理导出信息
     */
    @PostMapping("/shop/shopOrderFundsExportData")
    R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO );
    R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO);

    /**
     * 店铺资金统计信息
     *
     * @param userId 用户ID
     * @return  店铺资金统计信息
     * @return 店铺资金统计信息
     */
    @GetMapping("/shop/getFundsStat")
    R getFundsStat(@RequestParam("userId") Long userId);

    /**
     * 店铺资金统计信息
     *
     * @param pageComShopFundsSearchDTO 店铺资金
     * @return  店铺资金统计信息
     * @return 店铺资金统计信息
     */
    @PostMapping("/shop/pageShopFunds")
    R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);

    /**
     * 微信支付订单回调
     * @param wxPayNotifyOrderDTO   订单支付回调参数
     *
     * @param wxPayNotifyOrderDTO 订单支付回调参数
     */
    @PostMapping("/shop/wxOrderPayNotify")
    void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);

    /**
     * 点击去支付订单
     * @param orderPayDTO   请求参数
     * @return  支付对象
     *
     * @param orderPayDTO 请求参数
     * @return 支付对象
     */
    @PostMapping("/shop/wxPay")
    R wxPay(@RequestBody OrderPayDTO orderPayDTO);

    /**
     * 编辑实有人口
     *
     * @param populationEditDTO
     * @return
     */
@@ -2226,13 +2277,15 @@

    /**
     * 微心愿删除
     *
     * @param id 微心愿id
     */
    @PostMapping("deletemicrowish")
    R deletemicrowish(@RequestParam("id")Long id);
    R deletemicrowish(@RequestParam("id") Long id);

    /**
     * 基础数据》特殊群体》分页查询
     *
     * @param pageInputUserDTO
     * @return
     */
@@ -2241,8 +2294,9 @@

    /**
     * 删除特殊群体人员
     * @param id    特殊群体id
     * @return  删除结果
     *
     * @param id 特殊群体id
     * @return 删除结果
     */
    @PostMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
@@ -2250,29 +2304,34 @@

    /**
     * 办事指南_新增
     *
     * @param workGuideVO 新增信息
     * @return 新增结果
     */
    @PostMapping("/addworkguide")
    R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);
    R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId);

    /**
     * 办事指南_编辑
     *
     * @param workGuideVO
     * @return 编辑结果
     */
    @PostMapping("/editworkguide")
    R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);
    R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId);

    /**
     * 办事指南_详情
     *
     * @param workGuideId
     * @return 详情
     */
    @GetMapping("/detailworkguide")
    R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId);
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId);

    /**
     * 办事指南_分页
     *
     * @param pageActWorkGuideDTO 查询参数
     * @return 分页集合
     */
@@ -2281,6 +2340,7 @@

    /**
     * 办事指南_删除
     *
     * @param workGuideId 办事指南id
     * @return 删除结果
     */
@@ -2289,32 +2349,36 @@

    /**
     * 分页查询邻里圈
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     *
     * @param neighborCircleAppDTO 请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByApp")
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 用户发布邻里圈审核
     * @param addNeighborCircleAppDTO   邻里圈请求参数
     * @return  发布结果
     *
     * @param addNeighborCircleAppDTO 邻里圈请求参数
     * @return 发布结果
     */
    @PostMapping("/neighbor/addNeighborByApp")
    R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);

    /**
     * 用户查看邻里圈详情
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈详情
     *
     * @param neighborCircleAppDTO 请求参数
     * @return 邻里圈详情
     */
    @PostMapping("/neighbor/neighborDetailByApp")
    R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表
     *
     * @param comActNeighborCircleAdminDTO 请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByAdmin")
    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
@@ -2322,7 +2386,8 @@

    /**
     * 后台修改邻里圈
     * @param editNeighborCircleAdminVO  请求参数
     *
     * @param editNeighborCircleAdminVO 请求参数
     */
    @PostMapping("/neighbor/changeStatusByAdmin")
    R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
@@ -2330,22 +2395,25 @@

    /**
     * 邻里圈_后台删除
     * @param id  邻里圈id
     * @return  邻里圈列表
     *
     * @param id 邻里圈id
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/deleteByAdmin")
    R deleteByAdmin(@RequestParam("id")Long id);
    R deleteByAdmin(@RequestParam("id") Long id);

    /**
     * 查看邻里圈基础_详情
     * @param id  邻里圈id
     * @return  邻里圈列表
     *
     * @param id 邻里圈id
     * @return 邻里圈列表
     */
    @GetMapping("/neighbor/detailNeighborByAdmin")
    R detailNeighborByAdmin(@RequestParam("id")Long id);
    R detailNeighborByAdmin(@RequestParam("id") Long id);

    /**
     * 邻里圈的所有评论_分页
     *
     * @param dto 请求参数
     * @return 评论列表
     */
@@ -2354,6 +2422,7 @@

    /**
     * 评论的状态_修改
     *
     * @param vo 请求参数
     */
    @PostMapping("/neighbor/changeCommentStatusByAdmin")
@@ -2361,6 +2430,7 @@

    /**
     * 邻里圈评论_详情
     *
     * @param id 评论id
     */
    @GetMapping("/neighbor/detailNeighborCommentByAdmin")
@@ -2369,53 +2439,60 @@

    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     *
     * @param neighborCircleAppDTO 请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/neighborExamineByApp")
    R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 邻里圈点赞
     * @param fabulousAppDTO    请求参数
     * @return  点赞结果
     *
     * @param fabulousAppDTO 请求参数
     * @return 点赞结果
     */
    @PostMapping("/neighbor/neighborFabulousByApp")
    R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);

    /**
     * 邻里圈转发
     *
     * @param forwardAppDTO 请求参数
     * @return  转发结果
     * @return 转发结果
     */
    @PostMapping("/neighbor/neighborForwardByApp")
    R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);

    /**
     * 邻里圈评论
     *
     * @param commentAppDTO 请求参数
     * @return  评论结果
     * @return 评论结果
     */
    @PostMapping("/neighbor/neighborCommentByApp")
    R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);

    /**
     * 邻里圈回复
     * @param replyAppDTO   请求参数
     * @return  回复结果
     *
     * @param replyAppDTO 请求参数
     * @return 回复结果
     */
    @PostMapping("/neighbor/neighborReplyByApp")
    R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);

    /**
     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
     * @return  执行结果
     *
     * @return 执行结果
     */
    @PostMapping("/neighbor/timeTaskCircleFlow")
    R timedTaskNeighborCircleRecord();

    /**
     * 邻里圈评论回复_分页
     *
     * @param dto 参数
     */
    @PostMapping("/neighbor/detailNeighborCommentAllReply")
@@ -2423,6 +2500,7 @@

    /**
     * 邻里圈评论回复_基本详情
     *
     * @param id 参数
     */
    @GetMapping("/neighbor/detailNeighborCommentReply")
@@ -2430,22 +2508,26 @@

    /**
     * 评论回复状态_修改
     *
     * @param changeStatusReplyVO 参数
     */
    @PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
    R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);

    /**
     * 邻里圈取消点赞
     * @param fabulousAppDTO    请求参数
     * @return  取消点赞结果
     *
     * @param fabulousAppDTO 请求参数
     * @return 取消点赞结果
     */
    @PostMapping("/neighbor/neighborFabulousCancelByApp")
    R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);

    /**
     * 添加邻里圈浏览记录
     * @param addBrowseAppDTO   请求参数
     * @return  返回参数
     *
     * @param addBrowseAppDTO 请求参数
     * @return 返回参数
     */
    @PostMapping("/neighbor/neighborAddBrowseByApp")
    R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
@@ -2453,6 +2535,7 @@

    /**
     * 邻里圈_添加
     *
     * @param addNeighborCircleAdminVO 参数
     */
    @PostMapping("/neighbor/addNeighborByAdmin")
@@ -2460,23 +2543,26 @@

    /**
     * 分页查询评论下所有回复
     * @param commentReplyAppDTO    请求参数
     * @return  回复列表
     *
     * @param commentReplyAppDTO 请求参数
     * @return 回复列表
     */
    @PostMapping("/neighbor/neighborCommentReplyByApp")
    R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);

    /**
     * 实有房屋_编辑
     * @param villageId 实有房屋id
     *
     * @param villageId       实有房屋id
     * @param comMngVillageVO 请求参数
     * @return
     */
    @PostMapping("/editvillage/{villageId}")
    R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO);
    R editvillage(@PathVariable("villageId") Long villageId, @RequestBody ComMngVillageVO comMngVillageVO);

    /**
     * 商城系统配置
     *
     * @param comShopSysConfDTO
     * @return
     */
@@ -2485,6 +2571,7 @@

    /**
     * 商城系统配置查询
     *
     * @param pageComShopSysConfDTO
     * @return
     */
@@ -2493,6 +2580,7 @@

    /**
     * 编辑实有人口_电子档案
     *
     * @param userElectronicFileVO
     * @return
     */
@@ -2501,86 +2589,97 @@

    /**
     * 实有人口统计
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @PostMapping("/common/data/population/statistics")
    R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 查询房屋级联菜单
     * @param cascadeHouseDTO   请求参数
     * @return  菜单列表
     *
     * @param cascadeHouseDTO 请求参数
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/cascade/list")
    R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 分页查询房屋列表
     * @param populationHouseAdminDTO   请求参数
     * @return  房屋列表
     *
     * @param populationHouseAdminDTO 请求参数
     * @return 房屋列表
     */
    @PostMapping("/common/data/population/page/house")
    R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);

    /**
     * 根据id查询实有房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     *
     * @param houseId 房屋id
     * @return 房屋信息
     */
    @PostMapping("/common/data/population/house/detail")
    R getHouseDetail(@RequestParam(value = "houseId") Long houseId);

    /**
     * 编辑实有房屋信息
     *
     * @param houseEditAdminDTO 请求参数
     * @return  编辑结果
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/edit")
    R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);

    /**
     * 根据房屋id列表删除房屋信息
     * @param Ids   请求参数
     * @return  删除结果
     *
     * @param Ids 请求参数
     * @return 删除结果
     */
    @PostMapping("/common/data/population/house/delete")
    R deleteHouses(@RequestBody List<Long> Ids);

    /**
     * 实有房屋统计
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @PostMapping("/common/data/population/house/statistics")
    R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 根据社区id查询社区所有省市区
     * @param communityId   社区id
     * @return  社区所在省市区
     *
     * @param communityId 社区id
     * @return 社区所在省市区
     */
    @PostMapping("/common/data/village/getRegion")
    R getRegion(@RequestParam("communityId") Long communityId);

    /**
     * 统计社区内小区数量
     * @param communityId   社区id
     * @return  统计小区数量
     *
     * @param communityId 社区id
     * @return 统计小区数量
     */
    @PostMapping("/common/data/village/statistics")
    R villageStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 小区详情
     *
     * @param villageId 小区id
     * @return  小区详情
     * @return 小区详情
     */
    @PostMapping("/village/getVillage")
    R getVillage(@RequestParam("villageId") Long villageId);

    /**
     * 新增高龄认证
     *
     * @param eldersAuthAddDTO
     * @return 新增结果
     */
@@ -2589,6 +2688,7 @@

    /**
     * 修改高龄认证
     *
     * @param eldersAuthEditDTO
     * @return 维护结果
     */
@@ -2597,6 +2697,7 @@

    /**
     * 分页查找高龄认证
     *
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
@@ -2605,6 +2706,7 @@

    /**
     * 删除高龄认证
     *
     * @param eldersAuthDeleteDTO
     * @return 平台用户信息
     */
@@ -2613,6 +2715,7 @@

    /**
     * 查询高龄认证详细信息
     *
     * @param id 高龄认证 id
     * @return 查找结果
     */
@@ -2621,6 +2724,7 @@

    /**
     * 获取用户家庭成员
     *
     * @param userId 用户ID
     * @return
     */
@@ -2629,6 +2733,7 @@

    /**
     * 查询导出高龄老人
     *
     * @param pageEldersAuthDTO
     * @return
     */
@@ -2637,6 +2742,7 @@

    /**
     * 通过家庭成员ID添加
     *
     * @param eldersAuthAddByFamilyDTO 添加信息
     * @return
     */
@@ -2646,6 +2752,7 @@

    /**
     * 添加高龄认证反馈
     *
     * @param eldersAuthFeedbackAddDTO
     * @return
     */
@@ -2654,107 +2761,121 @@

    /**
     * 小程序-查询疫苗分类列表
     * @return  疫苗分类列表
     *
     * @return 疫苗分类列表
     */
    @PostMapping("/vaccines/app/list")
    R getVaccinesListByApp();

    /**
     * 小程序-疫苗类型对应家庭成员接种列表
     * @return  疫苗类型对应家庭成员接种列表
     *
     * @return 疫苗类型对应家庭成员接种列表
     */
    @PostMapping("/vaccines/app/user/list")
    R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO);

    /**
     * 小程序-报名疫苗
     * @param enrollByAppDTO    请求参数
     * @return  报名结果
     *
     * @param enrollByAppDTO 请求参数
     * @return 报名结果
     */
    @PostMapping("/vaccines/app/enroll")
    R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO);

    /**
     * 小程序-查询用户家庭成员接种记录
     * @param userId    用户id
     * @return  用户家庭成员接种记录
     *
     * @param userId 用户id
     * @return 用户家庭成员接种记录
     */
    @PostMapping("/vaccines/app/user/inoculation/list")
    R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId);

    /**
     * 后台管理-查询疫苗分类列表
     * @param vaccinesByAdminDTO    请求参数
     * @return  疫苗分类列表
     *
     * @param vaccinesByAdminDTO 请求参数
     * @return 疫苗分类列表
     */
    @PostMapping("/vaccines/admin/list")
    R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 修改疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  修改结果
     *
     * @param vaccinesByAdminDTO 请求参数
     * @return 修改结果
     */
    @PostMapping("/vaccines/admin/edit")
    R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 新增疫苗分类信息
     * @param vaccinesByAdminDTO    请求参数
     * @return  新增结果
     *
     * @param vaccinesByAdminDTO 请求参数
     * @return 新增结果
     */
    @PostMapping("/vaccines/admin/add")
    R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);

    /**
     * 查询疫苗登记列表
     *
     * @param vaccinesByAdminDTO 请求参数
     * @return  登记列表
     * @return 登记列表
     */
    @PostMapping("/vaccines/admin/enroll/list")
    R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

    /**
     * 删除疫苗分类信息
     * @param id    疫苗分类id
     * @return      删除结果
     *
     * @param id 疫苗分类id
     * @return 删除结果
     */
    @PostMapping("/vaccines/admin/enroll/delete")
    R deleteVaccinesByAdmin(@RequestParam("id") Long id);

    /**
     * 根据条件导出登记列表
     * @param vaccinesByAdminDTO    请求参数
     * @return  登记列表
     *
     * @param vaccinesByAdminDTO 请求参数
     * @return 登记列表
     */
    @PostMapping("/vaccines/admin/enroll/export")
    R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

    /**
     * 查询接种记录列表
     * @param inoculationByAdminDTO     请求参数
     * @return  接种记录列表
     *
     * @param inoculationByAdminDTO 请求参数
     * @return 接种记录列表
     */
    @PostMapping("/vaccines/admin/inoculation/list")
    R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);

    /**
     * 接种记录信息导出
     * @param inoculationByAdminDTO     请求参数
     * @return  导出结果
     *
     * @param inoculationByAdminDTO 请求参数
     * @return 导出结果
     */
    @PostMapping("/vaccines/admin/inoculation/export")
    R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);

    /**
     * 查询疫苗分类列表
     * @return  疫苗分类列表
     *
     * @return 疫苗分类列表
     */
    @PostMapping("/vaccines/admin/enroll/type/list")
    R getEnrollTypeListByAdmin();

    /**
     * 查询老龄认证记录
     *
     * @param pageComEldersRecordsDTO
     * @return
     */
@@ -2763,6 +2884,7 @@

    /**
     * 查询老龄认证记录详细
     *
     * @param id
     * @return
     */
@@ -2771,6 +2893,7 @@

    /**
     * 查询老龄认证社区认证方式
     *
     * @param eldersAuthTypeQueryDTO
     * @return
     */
@@ -2779,6 +2902,7 @@

    /**
     * 分页查询高领老人列表
     *
     * @param pageEldersAuthElderlyDTO
     * @return
     */
@@ -2787,31 +2911,47 @@

    /**
     * 批量保存高龄老人
     *
     * @param newVoList
     * @param communityId
     * @return
     */
    @PostMapping("/eldersauthelderly/batchSave")
    R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy);
    R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList, @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);

    /**
         *  批量保存楼栋
    /**
     * 批量保存楼栋
     *
     * @param newVoList
     * @param communityId
     * @return
     */
    @PostMapping("/building/batchSave")
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId);
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);

    /**
     * 根据字典key查询字典项
     *
     * @param key
     * @return
     */
    @GetMapping("/dictionary/listDictionaryByKey")
    R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);

    /**
     * description 根据字典code查询自典项
     *
     * @param code 入参参数
     * @return BcDictionaryVO 字典
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @GetMapping("/dictionary/getByCode")
    BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code") String code);

    /**
     * 查看高龄老人详情
     *
     * @param id
     * @return
     */
@@ -2820,6 +2960,7 @@

    /**
     * 修改高龄老人信息
     *
     * @param eldersAuthElderlyDTO
     * @return
     */
@@ -2828,6 +2969,7 @@

    /**
     * 删除高领老人
     *
     * @param id
     * @return
     */
@@ -2836,40 +2978,45 @@

    /**
     * 通过老人用户id获取老人信息
     * @param authUserId    老人用户id
     * @return  老人信息
     *
     * @param authUserId 老人用户id
     * @return 老人信息
     */
    @PostMapping("/elders/getAuth")
    R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);

    /**
     * 人脸核验新增高龄认证记录
     * @param authGetResultDTO  请求参数
     * @return  新增结果
     *
     * @param authGetResultDTO 请求参数
     * @return 新增结果
     */
    @PostMapping("/elders/add/auth")
    R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);

    /**
     * 高龄认证分页接口
     * @param authPageDTO   请求参数
     * @return  查询结果
     *
     * @param authPageDTO 请求参数
     * @return 查询结果
     */
    @PostMapping("/elders/page/auth")
    R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);

    /**
     * 添加高龄老人接口
     *
     * @param authUserAddAppDTO 请求参数
     * @return  添加结果
     * @return 添加结果
     */
    @PostMapping("/elders/add")
    R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);

    /**
     * 修改高龄老人接口
     *
     * @param authUserAddAppDTO 请求参数
     * @return  修改结果
     * @return 修改结果
     */
    @PostMapping("/elders/edit")
    R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
@@ -2877,11 +3024,13 @@

    /**
     * 分页查询生存认证记录
     *
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/elders/records/page")
    R pageQueryEldersAuthRecord(@RequestBody  PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
    R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);

    /**
     * description 批量保存重点人群人员信息
     *
@@ -2890,20 +3039,19 @@
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/key_person/batch/save")
    @PostMapping("/key_person/batch/save")
    R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);

    @GetMapping("/screen/population/statistic")
    R statistic(@RequestParam("communityId")Long communityId);
    @GetMapping("/screen/population/statistic")
    R statistic(@RequestParam("communityId") Long communityId);

    /**
     *
     * @param communityId
     * @param type
     * @return
     */
    @PostMapping("/elders/setCommunityAuthType")
    R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type);
    R setCommunityAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

    @PostMapping("/elders/getAuthHistoryList")
    R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
@@ -2911,26 +3059,29 @@
    @PostMapping("/elders/getAuthHistoryExport")
    R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);

    @GetMapping("/screen/work/neighborCircle")
    @GetMapping("/screen/work/neighborCircle")
    R statisticNeighborCircle(@RequestParam("communityId") Long communityId);


    /**
     * 党员党支部统计信息
     *
     * @return
     */
    @PostMapping("/bigscreen/party/orgmembers")
    R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

    /**
     *  党员年龄占比、男女占比
     * 党员年龄占比、男女占比
     *
     * @return
     */
    @PostMapping("/bigscreen/party/ageGender")
    R<BigScreenStatisticAgeGender> ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);

    /**
     *  党建数据概览
     * 党建数据概览
     *
     * @return
     */
    @PostMapping("/bigscreen/party/partybuild/{communityId}")
@@ -2938,6 +3089,7 @@

    /**
     * 党员活动参加用户排行榜-TOP3
     *
     * @return
     */
    @PostMapping("/bigscreen/party/activitytopuser/{communityId}")
@@ -2945,6 +3097,7 @@

    /**
     * 党员活动
     *
     * @return
     */
    @PostMapping("/bigscreen/party/bigscreenPartyactivity")
@@ -2952,29 +3105,32 @@

    /**
     * 首页大屏统计接口
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenIndex")
    R getScreenIndex(@RequestParam("communityId")Long communityId);
    R getScreenIndex(@RequestParam("communityId") Long communityId);

    /**
     * 事件大屏统计接口
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestParam("communityId")Long communityId);
    R getScreenEvent(@RequestParam("communityId") Long communityId);

    /**
     * 民生大屏统计接口
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenCivil")
    R getScreenCivil(@RequestParam("communityId")Long communityId);
    R getScreenCivil(@RequestParam("communityId") Long communityId);

    /**
    /**
     * 大屏统计邻里圈
     */
    @GetMapping("/screen/work/wish")
@@ -2982,6 +3138,7 @@

    /**
     * 大屏统计社区-活动
     *
     * @param communityId
     * @return
     */
@@ -2990,6 +3147,7 @@

    /**
     * 大屏统计一起议
     *
     * @param communityId
     * @return
     */
@@ -2998,30 +3156,33 @@

    /**
     * 大屏统计党建工作
     *
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/pbWork")
    R pbWork(@RequestParam("communityId")Long communityId);
    R pbWork(@RequestParam("communityId") Long communityId);


    /**
     * 大屏统计随手拍
     *
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/easyPhoto")
    R easyPhoto(@RequestParam("communityId")Long communityId);
    R easyPhoto(@RequestParam("communityId") Long communityId);

    /**
     *  大屏统计工作情况
     * 大屏统计工作情况
     *
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/workCount")
    R workCount(@RequestParam("communityId")Long communityId);
    R workCount(@RequestParam("communityId") Long communityId);

    /**
    /**
     * description 批量保存残疾人人员信息
     *
     * @param list 疾人信息列表
@@ -3034,70 +3195,79 @@

    /**
     * 获取社区网格
     * @param communityId   社区id
     * @return  网格数据
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    @GetMapping("/screen/getScreenGirds")
    R getScreenGirds(@RequestParam("communityId")Long communityId);
    R getScreenGirds(@RequestParam("communityId") Long communityId);

    /**
     * 事件大屏查询事件详情
     * @param eventDetailDTO    请求参数
     * @return  事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    @PostMapping("/screen/getScreenEventDetail")
    R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);

    /**
     * 工作大屏-一起议列表
     * @param discussListDTO    请求参数
     * @return  一起议列表
     *
     * @param discussListDTO 请求参数
     * @return 一起议列表
     */
    @PostMapping("/screen/work/getScreenDiscussList")
    R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);

    /**
     * 工作大屏-社区活动列表
     * @param actActivityListDTO    请求参数
     * @return  活动列表
     *
     * @param actActivityListDTO 请求参数
     * @return 活动列表
     */
    @PostMapping("/screen/work/getScreenActActivityList")
    R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);

    /**
     * 工作大屏-社区活动报名人员列表
     *
     * @param activityPeopleListDTO 请求参数
     * @return  社区活动报名人员列表
     * @return 社区活动报名人员列表
     */
    @PostMapping("/screen/work/getActActivityPeopleList")
    R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);

    /**
     * 工作大屏-微心愿列表
     * @param microListDTO  请求参数
     * @return  微心愿列表
     *
     * @param microListDTO 请求参数
     * @return 微心愿列表
     */
    @PostMapping("/screen/work/getScreenMicroList")
    R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);

    /**
     * 获取系统参数接口
     * @param code  参数code
     * @return  系统参数
     *
     * @param code 参数code
     * @return 系统参数
     */
    @GetMapping("/sys/conf/get")
    R getConf(@RequestParam("code") String code);

    /**
     * 根据社区id获取社区下人口数据信息
     * @param populationListDTO    请求参数
     * @return  人口数据
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
     */
    @PostMapping("/population/list/app")
    R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO);

    /**
     * 根据人口id获取人口详情
     *
     * @param populationId
     * @return
     */
@@ -3106,39 +3276,44 @@

    /**
     * 修复人口加密问题
     * @return  修复结果
     *
     * @return 修复结果
     */
    @GetMapping("/population/repair")
    R getPopulationRepairByApp();

    /**
     * 工作大屏-社区动态模块数据统计
     * @param communityId   社区id
     * @return  社区动态数据统计
     *
     * @param communityId 社区id
     * @return 社区动态数据统计
     */
    @GetMapping("/screen/work/dynamic")
    R dynamicWork(@RequestParam("communityId")Long communityId);
    R dynamicWork(@RequestParam("communityId") Long communityId);

    /**
     * 查询用户钱包信息
     * @param walletDetailDTO   请求参数
     * @return  用户钱包信息
     *
     * @param walletDetailDTO 请求参数
     * @return 用户钱包信息
     */
    @PostMapping("/wallet/get/my")
    R getUserWalletDetail(@RequestBody ComActWalletDetailDTO walletDetailDTO);

    /**
     * 查询用户收支记录列表
     * @param walletTradeDTO    请求参数
     * @return  收支记录
     *
     * @param walletTradeDTO 请求参数
     * @return 收支记录
     */
    @PostMapping("/wallet/get/trade")
    R getUserWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO);

    /**
     * 查询用户绑定的社区收益排行榜
     * @param walletTradeDTO   请求参数
     * @return  社区收益排行榜
     *
     * @param walletTradeDTO 请求参数
     * @return 社区收益排行榜
     */
    @PostMapping("/wallet/get/ranking")
    R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);

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

@@ -3,7 +3,6 @@
import com.alibaba.excel.EasyExcel;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
@@ -11,8 +10,6 @@
import com.panzhihua.common.utlis.ExcelUtil;
import com.panzhihua.community_backstage.biz.KeyPersonBizServiceImpl;
import com.panzhihua.community_backstage.listen.DisablePersonExcelListen;
import com.panzhihua.community_backstage.listen.KeyPersonInfoExcelListen;
import com.panzhihua.community_backstage.model.dto.KeyPersonExcelExportDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java

@@ -7,27 +7,25 @@
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.panzhihua.common.api.LcApiConstants;
import com.panzhihua.common.api.LcRequestEnum;
import com.panzhihua.common.api.LcReturnObject;
import com.panzhihua.common.api.LcVisitRecordKeyPersonLabelEnum;
import com.panzhihua.common.api.*;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.enums.LocalEventToLangChaoEventTypeEnum;
import com.panzhihua.common.model.dtos.api.EventFile;
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.serviceapi.biz.LcApiService;
import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO;
import com.panzhihua.serviceapi.model.dto.LcGridData;
import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO;
import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
import com.panzhihua.serviceapi.model.dto.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -116,7 +114,7 @@
            log.info("方法submitEventRegister发生错误：{}", e.getMessage());
        }
        HttpResponse result = request.execute();
        log.info("submit上传浪潮事件信息：{}", result.body());
        log.info("submitEventRegister上传浪潮事件信息：{}", result.body());
        return result.body();
    }

@@ -137,7 +135,7 @@
            file.delete();
            return R.ok(result.body());
        } catch (Exception e) {
            log.info("方法submitEventRelationFile发生错误：{}", e.getMessage());
            log.info("方法submitEventOrVisitRecordRelationFile发生错误：{}", e.getMessage());
        }
        return R.fail();
    }
@@ -249,7 +247,7 @@
            log.info("方法uploadFlowPersonVisitRecord发生错误：{}", e.getMessage());
        }
        HttpResponse result = request.execute();
        log.info("submit上传浪潮事件信息：{}", result.body());
        log.info("uploadFlowPersonVisitRecord上传浪潮事件信息：{}", result.body());
        return result.body();
    }

@@ -266,7 +264,7 @@
            log.info("方法uploadKeyPersonVisitRecord发生错误：{}", e.getMessage());
        }
        HttpResponse result = request.execute();
        log.info("submit上传浪潮事件信息：{}", result.body());
        log.info("uploadKeyPersonVisitRecord上传浪潮事件信息：{}", result.body());
        return result.body();
    }

@@ -292,19 +290,25 @@
            String lcGrid = gridService.getLcGridIdByLocal(lcEventVisitingTasksListDTO.getGridId());
            String lcGridUserId = gridService.getLcUserIdByLocalUserId(lcEventVisitingTasksListDTO.getGridMember().toString());
            R populationDetail = communityService.detailPopulation(lcEventVisitingTasksListDTO.getVisiterId());
            ComMngPopulationVO comMngPopulationVO = (ComMngPopulationVO) populationDetail.getData();
            BcDictionaryItemVO diction = communityService.getByCode(DictionItemConstants.LC_CULTURE_LEVEL, comMngPopulationVO.getCultureLevel().toString());
            ComMngPopulationDTO comMngPopulationDTO = CopyUtil.copyProperties(comMngPopulationVO, ComMngPopulationDTO.class);
            if (diction != null) {
                comMngPopulationDTO.setCultureLevel(diction.getDictItemName());
            }
            R grid = gridService.eventGridDataDetails(lcEventVisitingTasksListDTO.getGridId());
            EventGridDataDetailsVO gridData = (EventGridDataDetailsVO) grid.getData();
            String[] data = lcEventVisitingTasksListDTO.getHappentLatLng().split(",");
            if (lcEventVisitingTasksListDTO.getVisiterType() != null) {
                log.info("上传数据导重点人口走访记录表");
                LcReturnObject lcReturnObject = requestLcKeyPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, populationDetail.getData(), gridData.getGridName(), data);
                LcReturnObject lcReturnObject = requestLcKeyPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, comMngPopulationDTO, gridData.getGridName(), data);
                if (LcRequestEnum.SUCCESS.getCode().equals(lcReturnObject.getCode())) {
                    uploadVisitRecord(lcEventVisitingTasksListDTO);
                    gridService.updateLcUploadFlagVisitingTask(lcEventVisitingTasksListDTO.getId());
                }
            } else {
                log.info("上传数据导流动人口走访记录表");
                LcReturnObject lcReturnObject = requestLcFlowPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, populationDetail.getData(), gridData.getGridName(), data);
                LcReturnObject lcReturnObject = requestLcFlowPersonVisitRecord(lcEventVisitingTasksListDTO, lcGrid, lcGridUserId, comMngPopulationDTO, gridData.getGridName(), data);
                if (LcRequestEnum.SUCCESS.getCode().equals(lcReturnObject.getCode())) {
                    uploadVisitRecord(lcEventVisitingTasksListDTO);
                    gridService.updateLcUploadFlagVisitingTask(lcEventVisitingTasksListDTO.getId());
@@ -369,10 +373,10 @@
        lcFlowPersonVisitRecordDTO.setIsAbnormal(lcEventVisitingTasksListDTO.getException().toString());
        lcFlowPersonVisitRecordDTO.setAbnormalSituation(lcEventVisitingTasksListDTO.getTableContentJson());
        lcFlowPersonVisitRecordDTO.setRemark(lcEventVisitingTasksListDTO.getEventDes());
        log.info("事件请求数据：{}", JSONObject.toJSONString(lcFlowPersonVisitRecordDTO));
        log.info("requestLcFlowPersonVisitRecord事件请求数据：{}", JSONObject.toJSONString(lcFlowPersonVisitRecordDTO));
        String flowPersonData = uploadFlowPersonVisitRecord(lcFlowPersonVisitRecordDTO);
        LcReturnObject lcReturnObject = JSONObject.parseObject(flowPersonData, LcReturnObject.class);
        log.info("提交浪潮服务器，接口返回结果为：{}", lcReturnObject);
        log.info("requestLcFlowPersonVisitRecord提交浪潮服务器，接口返回结果为：{}", lcReturnObject);
        return lcReturnObject;
    }

@@ -397,10 +401,10 @@
        keyPersonVisitRecordDTO.setAbnormalDes(lcEventVisitingTasksListDTO.getTableContentJson());
        keyPersonVisitRecordDTO.setRemark(lcEventVisitingTasksListDTO.getEventDes());
        keyPersonVisitRecordDTO.setType(LcVisitRecordKeyPersonLabelEnum.getCnDescByName(lcEventVisitingTasksListDTO.getVisiterType()));
        log.info("事件请求数据：{}", JSONObject.toJSONString(keyPersonVisitRecordDTO));
        log.info("requestLcKeyPersonVisitRecord事件请求数据：{}", JSONObject.toJSONString(keyPersonVisitRecordDTO));
        String remoteData = uploadKeyPersonVisitRecord(keyPersonVisitRecordDTO);
        LcReturnObject lcReturnObject = JSONObject.parseObject(remoteData, LcReturnObject.class);
        log.info("提交浪潮服务器，接口返回结果为：{}", remoteData);
        log.info("requestLcKeyPersonVisitRecord提交浪潮服务器，接口返回结果为：{}", remoteData);
        return lcReturnObject;
    }


 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/ComMngPopulationDTO.java

@@ -116,6 +116,10 @@
     */
    private String nativePlace;
    /**
     * 民族code
     */
    private String nativeCode;
    /**
     * 民族
     */
    private String nation;
@@ -132,7 +136,7 @@
    /**
     * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
     */
    private Integer cultureLevel;
    private String cultureLevel;

    /**
     * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.BcDictionaryService;
@@ -31,4 +32,17 @@

        return bcDictionaryService.getDictionaryByKey(key);
    }

    /**
     * description 根据字典code查询自典项
     *
     * @param code 入参参数
     * @return BcDictionaryVO 字典
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @GetMapping("/getByCode")
    BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code")String code){
        return bcDictionaryService.getByCode(dictId,code);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java

@@ -123,6 +123,10 @@
    /**
     * 民族
     */
    private String nationCode;
    /**
     * 民族
     */
    private String nation;
    /**
     * 是否租住(0.否 1.是)

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

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.BcDictionaryItemDO;
@@ -19,4 +20,14 @@
     * @return
     */
    R<List<BcDictionaryVO>> getDictionaryByKey(String key);
    /**
     * description 根据字典code查询自典项
     *
     * @param dictId 字典类型
     * @param code 入参参数
     * @return BcDictionaryVO 字典
     * @author manailin
     * @date 2021/6/10 17:00
     */
    BcDictionaryItemVO getByCode(String dictId, String code);
}

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

@@ -1,12 +1,14 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.service_community.dao.BcDictionaryItemDAO;
import com.panzhihua.service_community.model.dos.BcDictionaryItemDO;
import com.panzhihua.service_community.service.BcDictionaryService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
@@ -24,7 +26,7 @@
    public R<List<BcDictionaryVO>> getDictionaryByKey(String key) {
        List<BcDictionaryItemDO> list = baseMapper.getDictionaryByKey(key);
        List<BcDictionaryVO> listVO = new ArrayList<>();
        for (BcDictionaryItemDO dictionaryItemDO:list){
        for (BcDictionaryItemDO dictionaryItemDO : list) {
            BcDictionaryVO bcDictionaryVO = new BcDictionaryVO();
            bcDictionaryVO.setCode(dictionaryItemDO.getMnemonicCode());
            bcDictionaryVO.setDictName(dictionaryItemDO.getDictItemName());
@@ -33,4 +35,17 @@
        }
        return R.ok(listVO);
    }

    @Override
    public BcDictionaryItemVO getByCode(String dictId, String code) {
        BcDictionaryItemDO dictionaryItemDO = baseMapper.selectOne(
                new QueryWrapper<BcDictionaryItemDO>()
                        .eq("dict_id", dictId)
                        .eq("dict_value", code)
        );
        if (dictionaryItemDO != null) {
            return CopyUtil.copyProperties(dictionaryItemDO, BcDictionaryItemVO.class);
        }
        return null;
    }
}

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

@@ -21,7 +21,6 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -64,7 +63,7 @@
            BeanUtils.copyProperties(comStreetDO1, comStreetVO);
            return R.ok(comStreetVO);
        }
        return R.fail(500,"");
        return R.fail(500, "");
    }


@@ -126,10 +125,10 @@
        Long pageNum = pageComStreetDTO.getPageNum();
        Long pageSize = pageComStreetDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
@@ -163,6 +162,5 @@
        }
        return R.fail();
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java

@@ -1,24 +1,21 @@
package com.panzhihua.service_grid.api;


import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @author manailin
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 * @since 1.0
 */
@Slf4j
@RestController
@RequestMapping("/lc_compare")
@@ -30,26 +27,26 @@
    /**
     * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
     *
     * @param  id 本地网格ID
     * @param id 本地网格ID
     * @return String 浪潮市平台对应的ID
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @GetMapping("/{id}")
    String getLcGridIdByLocal(@PathVariable("id") Long id){
    String getLcGridIdByLocal(@PathVariable("id") Long id) {
        return lcCompareCodeService.getLcGridIdByLocal(id);
    }

    /**
     * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
     *
     * @param  localUserId 本地网格员ID
     * @param localUserId 本地网格员ID
     * @return String 浪潮市平台对应的ID
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @GetMapping("/getLcUserId")
    String getLcUserIdByLocalUserId(String localUserId){
    String getLcUserIdByLocalUserId(String localUserId) {
        return lcCompareCodeService.getLcUserIdByLocal(localUserId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapper.java

@@ -4,8 +4,6 @@
import com.panzhihua.service_grid.model.dos.ApplicationAppRelease;
import org.apache.ibatis.annotations.Param;

import java.math.BigInteger;

/**
 * 应用APP版本控制表Mapper
 * ClassName  ApplicationAppReleaseMapper

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -14,7 +14,6 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
@@ -22,15 +21,14 @@
import com.panzhihua.common.model.vos.screen.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.ExcelSelectListUtil;
import com.panzhihua.common.utlis.LngLatUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.service_grid.dao.LcCompareCodeMapper;
import com.panzhihua.service_grid.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
@@ -24,13 +23,13 @@
@Service
public class LcCompareCodeServiceImpl extends ServiceImpl<LcCompareCodeMapper, LcCompareCodeDO> implements LcCompareCodeService {

   @Resource
   private LcCompareMemberCodeMapper compareMemberCodeMapper;
    @Resource
    private LcCompareMemberCodeMapper compareMemberCodeMapper;

    @Override
    public String getLcGridIdByLocal(Long id) {
        try {
           return baseMapper.selectOne(
            return baseMapper.selectOne(
                    new QueryWrapper<LcCompareCodeDO>()
                            .eq("local_grid_id", id)
            ).getLcGridId();