数据分析大屏

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListForScreenFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class StyleShowListForScreenFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "agencyId不能为空", groups = AddUserInternalGroup.class)
+    private String agencyId;
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+}

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -333,7 +333,7 @@
                 <!-- redis配置 -->
                 <spring.redis.index>5</spring.redis.index>
                 <spring.redis.host>192.168.203.30</spring.redis.host>
-                <spring.redis.port>10052</spring.redis.port>
+                <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>Elink833066</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -36,6 +36,7 @@ import com.epmet.modules.partymember.excel.IcPartymemberStyleExcel;
 import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListForScreenFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -179,6 +180,20 @@ public class IcPartymemberStyleController {
         return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.showList(formDTO));
     }
 
+
+    /**
+     * 数据分析-党员风采列表查询 for 大屏
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("screen/showlist")
+    public Result<PageData<IcPartymemberStyleDTO>> showListForScreen(@RequestBody StyleShowListForScreenFormDTO formDTO) {
+        formDTO.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
+        ValidatorUtils.validateEntity(formDTO, StyleShowListFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.showListForScreen(formDTO));
+    }
+
     /**
      * 党员风采列表
      *

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListForScreenFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
 
@@ -129,4 +130,6 @@ public interface IcPartymemberStyleService extends BaseService<IcPartymemberStyl
      * @date 2022/5/9/0009 14:22
      */
     PageData<IcPartymemberStyleDTO> showListByAgency(StyleShowListResiFormDTO formDto);
+
+    PageData<IcPartymemberStyleDTO> showListForScreen(StyleShowListForScreenFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -59,6 +59,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleImageService;
 import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListForScreenFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
 import com.github.pagehelper.PageHelper;
@@ -464,6 +465,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId());
     }
 
+    @Override
+    public PageData<IcPartymemberStyleDTO> showListForScreen(StyleShowListForScreenFormDTO formDTO) {
+        String customerId = formDTO.getCustomerId();
+        return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getAgencyId(), customerId);
+    }
+
     private PageData<IcPartymemberStyleDTO> showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) {
         PageInfo<IcPartymemberStyleDTO> pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId));
         if (CollectionUtils.isNotEmpty(pageInfo.getList())) {