diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 98432996ce..933a325a13 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -67,6 +68,7 @@ public class IcUserController implements ResultDataResolver { * @return */ @PostMapping("listByPolicyRules") + @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) public Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { List resiRule = input.getRuleList().getResiRuleList(); diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/IcMonitoringFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/IcMonitoringFormDTO.java new file mode 100644 index 0000000000..f768b35f71 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/IcMonitoringFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form.yt; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * + * @description: 烟台摄像头 + * @author qushutong + * @date 2023/10/22 16:38 + * @param + * @return + * @Version1.0 + **/ +@Data +public class IcMonitoringFormDTO extends PageFormDTO { + + private static final long serialVersionUID = 1L; + /** + * 所属组织id + */ + private String staffId; + + /** + * 删选的id + */ + private String agencyId; + + +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 8cd5b6c3b9..3c4cb5950e 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -212,10 +212,10 @@ - + - epmet_gov_org_user - EpmEt-db-UsEr + root + Elink@888 0 192.168.1.140 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMonitoringDeviceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMonitoringDeviceController.java index e3664914b6..0a0d82b10d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMonitoringDeviceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcMonitoringDeviceController.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.yt.IcMonitoringFormDTO; import com.epmet.dto.result.yt.IcMonitoringDeviceDTO; import com.epmet.service.IcMonitoringDeviceService; import org.springframework.beans.factory.annotation.Autowired; @@ -46,8 +47,8 @@ public class IcMonitoringDeviceController { private IcMonitoringDeviceService icMonitoringDeviceService; @PostMapping("page") - public Result> page(@RequestBody PageFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + public Result> page(@RequestBody IcMonitoringFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, IcMonitoringFormDTO.AddUserInternalGroup.class); PageData page = icMonitoringDeviceService.page(formDTO); return new Result>().ok(page); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcMonitoringDeviceService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcMonitoringDeviceService.java index 3f454aecae..fa46ff2a48 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcMonitoringDeviceService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcMonitoringDeviceService.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.form.yt.IcMonitoringFormDTO; import com.epmet.dto.result.yt.IcMonitoringDeviceDTO; import com.epmet.entity.IcMonitoringDeviceEntity; @@ -45,7 +46,7 @@ public interface IcMonitoringDeviceService extends BaseService page(PageFormDTO formDTO); + PageData page(IcMonitoringFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMonitoringDeviceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMonitoringDeviceServiceImpl.java index 2002e5253c..8b4d1cf6fe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMonitoringDeviceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcMonitoringDeviceServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.security.user.SecurityUser; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.IcMonitoringDeviceDao; +import com.epmet.dto.form.yt.IcMonitoringFormDTO; import com.epmet.dto.result.yt.IcMonitoringDeviceDTO; import com.epmet.entity.IcMonitoringDeviceEntity; import com.epmet.service.IcMonitoringDeviceService; @@ -51,17 +52,21 @@ public class IcMonitoringDeviceServiceImpl extends BaseServiceImpl page(PageFormDTO formDTO) { - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + public PageData page(IcMonitoringFormDTO formDTO) { + QueryWrapper wrapper = new QueryWrapper<>(); - String userID = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); +// String userID = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); wrapper.eq("DEL_FLAG","0"); //1.获取当前工作人员缓存信息 - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo("1535072605621841922", userID); - wrapper.like(StringUtils.isNotBlank(SecurityUser.getDeptId().toString()), "AGENCY_PIDS", staffInfo.getAgencyId()); +// CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo("1535072605621841922", userID); + wrapper.like(StringUtils.isNotBlank(formDTO.getStaffId()), "AGENCY_PIDS", formDTO.getStaffId()); + wrapper.like(StringUtils.isNotBlank(formDTO.getAgencyId()), "AGENCY_PIDS", formDTO.getAgencyId()); + wrapper.orderByDesc("ID"); + + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List list = baseDao.selectList(wrapper); + PageInfo pageInfo = new PageInfo<>(list); List icMonitoringDeviceDTOS = ConvertUtils.sourceToTarget(list, IcMonitoringDeviceDTO.class); - PageInfo pageInfo = new PageInfo<>(icMonitoringDeviceDTOS); return new PageData<>(icMonitoringDeviceDTOS, pageInfo.getTotal()); }