Merge remote-tracking branch 'origin/房屋tree_yzm'

epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@@ -29,6 +29,8 @@ import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Description 通用登录接口
@@ -73,6 +75,20 @@ public class LoginController {
 		}
 	}
 
+	/**
+	 * 返回文字版的验证码
+	 * 磐石大屏3.10号提出的需求
+	 * @param uuid
+	 * @throws IOException
+	 */
+	@PostMapping("captcha/{uuid}")
+	public Result captcha(@PathVariable(name = "uuid", required = true) String uuid) {
+		Map<String, String> map = new HashMap<>();
+		map.put("captcha", captchaService.getTextCaptcha(uuid));
+		return new Result().ok(map);
+
+	}
+
 	/**
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result<java.lang.String>

epmet-auth/src/main/java/com/epmet/service/CaptchaService.java

@@ -31,4 +31,11 @@ public interface CaptchaService {
      */
     boolean validate(String uuid, String code);
 
+    /**
+     * 返回文字版的验证码
+     * 磐石大屏3.10号提出的需求
+     * @param uuid
+     * @return
+     */
+    String getTextCaptcha(String uuid);
 }

epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java

@@ -52,4 +52,21 @@ public class CaptchaServiceImpl implements CaptchaService {
         //验证码是否正确
         return code.equalsIgnoreCase(captcha);
     }
+
+    /**
+     * 返回文字版的验证码
+     * 磐石大屏3.10号提出的需求
+     *
+     * @param uuid
+     * @return
+     */
+    @Override
+    public String getTextCaptcha(String uuid) {
+        // 生成验证码 //producer.createText();
+        String captcha = StringRandomUtils.getRandomStr(NumConstant.FIVE);
+        // logger.info("uuid:"+uuid+",生成的验证码:"+captcha);
+        // 保存验证码
+        captchaRedis.set(uuid, captcha);
+        return captcha;
+    }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiListFormDTO.java

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -37,8 +38,13 @@ public class StatsResiListFormDTO implements Serializable {
     /**
      * 组织id
      */
-    @NotBlank(message = "id不能为空")
+    // @NotBlank(message = "id不能为空")
 	private String id;
+    /**
+     * 目前只支持传入小区id
+     * level：neighborHood
+     */
+    private List<String> idList;
 
     @NotBlank(message = "level不能为空")
     private String level;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java

@@ -19,6 +19,8 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -34,6 +36,7 @@ import com.epmet.dto.result.IcUserWarnNoticeResultDTO;
 import com.epmet.dto.result.UserWarnNameListResultDTO;
 import com.epmet.service.IcStatsResiWarnService;
 import com.epmet.service.StatsResiWarnService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -67,7 +70,10 @@ public class StatsResiWarnController {
     public Result<List<IcStatsResiResultDTO>> list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
         String customerId = tokenDto.getCustomerId();
-        List<IcStatsResiResultDTO> icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel());
+        if (StringUtils.isBlank(formDTO.getId()) && CollectionUtils.isEmpty(formDTO.getIdList())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "id或者idList不能同时为空", "参数错误");
+        }
+        List<IcStatsResiResultDTO> icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel(),formDTO.getIdList());
         return new Result<List<IcStatsResiResultDTO>>().ok(icStatsResiResultDTOList);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -19,7 +19,6 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.IcVolunteerPolyDTO;
@@ -278,8 +277,12 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @author LiuJanJun
      * @date 2022/2/12 3:03 下午
      */
-    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName,
+    Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId,
-                                                @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level);
+                                                @Param("tableName") String tableName,
+                                                @Param("columnList") List<String> columnList,
+                                                @Param("id") String id,
+                                                @Param("level") String level,
+                                                @Param("idList")List<String> idList);
 
     List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns") List<String> columns);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java

@@ -58,7 +58,7 @@ public interface StatsResiWarnService{
 
     PageData<UserWarnNameListResultDTO> allUserWarnList(StatsResiWarnFormDTO formDTO);
 
-    List<IcStatsResiResultDTO> list(String customerId,String id, String level);
+    List<IcStatsResiResultDTO> list(String customerId,String id, String level,List<String> idList);
 
     List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java

@@ -243,7 +243,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
     }
 
     @Override
-    public List<IcStatsResiResultDTO> list(String customerId,String id, String level) {
+    public List<IcStatsResiResultDTO> list(String customerId,String id, String level,List<String> idList) {
         //获取所有配置类项 getshow
         IcResiCategoryStatsConfigFormDTO dto = new IcResiCategoryStatsConfigFormDTO();
         dto.setStatus("show");
@@ -263,7 +263,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         });
         Map<String,Map<String, BigDecimal>> tableColumnCountMap = new HashMap<>();
         paramMap.forEach((tableName,columnList) ->{
-            Map<String, BigDecimal> countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level);
+            Map<String, BigDecimal> countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level,idList);
             if (countMap  != null){
                 tableColumnCountMap.put(tableName,countMap);
             }
@@ -287,7 +287,7 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
 
     @Override
     public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
-        return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
+        return list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel(),null);
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -818,8 +818,15 @@
                 AND GRID_ID = #{id}
             </if>
             <if test="level=='neighborHood'">
+                <if test="id != null and id != ''">
                     AND VILLAGE_ID = #{id}
                 </if>
+                <if test="idList != null and idList.size() > 0">
+                    <foreach collection="idList" item="id" open="AND (" close=")" separator=" OR ">
+                        VILLAGE_ID = #{id}
+                    </foreach>
+                </if>
+            </if>
             <if test="level=='building'">
                 AND BUILD_ID = #{id}
             </if>