批量生成房屋编码及url

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -485,6 +485,7 @@ public class HouseController implements ResultDataResolver {
      * @date 2022/5/31 17:58
      * @params [loginUser, formDTO, response]
      */
+    @NoRepeatSubmit
     @PostMapping(value = "/downloadZip")
     public void downloadZip(@LoginUser TokenDto loginUser, @RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
         //效验数据
@@ -517,9 +518,10 @@ public class HouseController implements ResultDataResolver {
     * @params []
     * @return java.lang.String
     */
+    @NoRepeatSubmit
     @PostMapping("createBatchHouseCodeAndUrl")
-    public Result createBatchHouseCodeAndUrl() {
+    public Result createBatchHouseCodeAndUrl(@LoginUser TokenDto loginUser) {
-        return houseService.createBatchHouseCodeAndUrl( );
+        return houseService.createBatchHouseCodeAndUrl(loginUser);
 
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -127,5 +127,5 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     * @params []
     * @return java.util.List<com.epmet.dto.result.CreateHouseCodeAndUrlDTO>
     */
-    List<CreateHouseCodeAndUrlDTO> selectBatchHouseCodeAndUrl();
+    List<CreateHouseCodeAndUrlDTO> selectBatchHouseCodeAndUrl(@Param("customerId") String customerId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -162,5 +162,5 @@ public interface HouseService {
     * @params []
     * @return com.epmet.commons.tools.utils.Result
     */
-    Result createBatchHouseCodeAndUrl();
+    Result createBatchHouseCodeAndUrl(TokenDto loginUser);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -983,8 +983,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
 
     @Override
-    public Result createBatchHouseCodeAndUrl() {
+    public Result createBatchHouseCodeAndUrl(TokenDto loginUser) {
-        List<CreateHouseCodeAndUrlDTO> houseList =  icHouseDao.selectBatchHouseCodeAndUrl();
+        List<CreateHouseCodeAndUrlDTO> houseList =  icHouseDao.selectBatchHouseCodeAndUrl(loginUser.getCustomerId());
         houseList.forEach(house->{
             IcHouseEntity entity = icHouseDao.selectById(house.getHouseId());
             if(StringUtils.isNotBlank(house.getAreaCode())){

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -411,6 +411,7 @@
         left join ic_neighbor_hood n on h.NEIGHBOR_HOOD_ID=n.id
         left join customer_agency b ON n.agency_Id = b.ID
         where h.DEL_FLAG='0'
+              and h.CUSTOMER_ID = #{customerId}
               and(h.HOUSE_CODE is null or h.HOUSE_CODE = '')
         order by h.CREATED_TIME desc
     </select>