新增查询未绑定网格接口

lidongdong

2023-10-30 2b1a2bbe4240deb8a56f3fadbced0cbb4fa87137

新增查询未绑定网格接口

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java

@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -201,6 +202,16 @@
    }



    @ApiOperation(value = "便民服务商家入驻")
    @PostMapping("/merchant/addData")
    public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item)
    {
        item.setAuditType("1");
        item.setCreatedBy(getUserId()+"");
        return jinhuiCommunityService.merchantAddData(item);
    }

    /***************************************************************************************************
     *
     *

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java

@@ -1002,7 +1002,12 @@
    public R expurgateReseauData(@RequestParam("id") String id);



    /**
     * 获取未绑定人员的网格
     * @return
     */
    @GetMapping("/jinhuiReseau/getReseauBoxList")
    public R getReseauBoxList();

    /********************************************************************************************************
     *

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

@@ -1436,7 +1436,6 @@
     * @param
     * @return
     */

    @ApiOperation(value = "金汇慈善公益列表",response = JinhuiCharityVO.class)
    @GetMapping("/getCharityList")
    public R getCharityList(@RequestParam("pageNum") int pageNum,
@@ -1449,6 +1448,18 @@
    }

    /**
     * 获取未绑定人员的网格
     * @return
     */
    @ApiOperation(value = "获取未绑定人员的网格列表",response = JinhuiCharityVO.class)
    @GetMapping("/getReseauBoxList")
    public R getReseauBoxList()
    {
        return jinhuiCommunityService.getReseauBoxList();
    }


    /**
     * 获取详情
     * @param id
     * @return

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiReseauPeopleApi.java

@@ -50,6 +50,15 @@
        return reseauService.getList(pageNum, pageSize);
    }

    /**
     * 获取未绑定人员的网格
     * @return
     */
    @GetMapping("/getReseauBoxList")
    public R getReseauBoxList() {
        return R.ok(reseauService.getBoxList());
    }


    @GetMapping("/getReseauDetails")
    public R getReseauDetails(@RequestParam("id") String id)
@@ -165,7 +174,7 @@
    }


    





 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiReseauDao.java

@@ -8,6 +8,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface JinhuiReseauDao extends BaseMapper<JinhuiReseau>
{
@@ -18,6 +20,9 @@
     */
    IPage<JinhuiReseau> getList(Page page);


    List<JinhuiReseau> getBoxList();

    /**
     * 详情
     * @param id

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiReseauService.java

@@ -5,6 +5,8 @@
import com.panzhihua.common.model.vos.jinhui.JinhuiReseauVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiReseau;

import java.util.List;

public interface JinhuiReseauService extends IService<JinhuiReseau>
{
    /**
@@ -14,6 +16,8 @@
     */
    R getList(int pageNum,int pageSize);

    List<JinhuiReseau> getBoxList();

    JinhuiReseau getDetails(String id);
    /**
     * 新增

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiReseauServiceImpl.java

@@ -10,6 +10,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.List;


@Slf4j
@Service
@@ -25,6 +27,11 @@
    }

    @Override
    public List<JinhuiReseau> getBoxList() {
        return baseMapper.getBoxList();
    }

    @Override
    public JinhuiReseau getDetails(String id) {
        return baseMapper.getDetails(id);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiReseauMapper.xml

@@ -36,6 +36,26 @@
        order by creation_time desc
    </select>

    <!--  绑定网格员下拉框  -->
    <select id="getBoxList" resultMap="itemMap">
        select
            id,
            reseau_name,
            coverage,
            acreage,
            designation,
            linellae,
            broad,
            fill,
            rail,
            reseau_id,
            creation_time,
            update_time
        from jinhui_reseau
        where reseau_id is null
        order by creation_time desc
    </select>


    <select id="getDetails" resultMap="itemMap">
        select