补充

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<PageData<ResiByPolicyInfoResultDTO>> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) {
 
         List<ResisByPolicyRulesFormDTO.ResiRule> resiRule = input.getRuleList().getResiRuleList();

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;
+
+
+}

epmet-module/gov-org/gov-org-server/pom.xml

@@ -212,10 +212,10 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.92.53:3306/one?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.password>Elink@888</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>

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<PageData<IcMonitoringDeviceDTO>> page(@RequestBody PageFormDTO formDTO){
+    public Result<PageData<IcMonitoringDeviceDTO>> page(@RequestBody IcMonitoringFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcMonitoringFormDTO.AddUserInternalGroup.class);
         PageData<IcMonitoringDeviceDTO> page = icMonitoringDeviceService.page(formDTO);
         return new Result<PageData<IcMonitoringDeviceDTO>>().ok(page);
     }

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<IcMonitoringDevic
      * @author generator
      * @date 2023-10-18
      */
-    PageData<IcMonitoringDeviceDTO> page(PageFormDTO formDTO);
+    PageData<IcMonitoringDeviceDTO> page(IcMonitoringFormDTO formDTO);
 
 
 }

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<IcMonitoringD
 
 
     @Override
-    public PageData<IcMonitoringDeviceDTO> page(PageFormDTO formDTO) {
+    public PageData<IcMonitoringDeviceDTO> page(IcMonitoringFormDTO formDTO) {
-        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+
         QueryWrapper<IcMonitoringDeviceEntity> 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);
+//        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo("1535072605621841922", userID);
-        wrapper.like(StringUtils.isNotBlank(SecurityUser.getDeptId().toString()), "AGENCY_PIDS", staffInfo.getAgencyId());
+        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<IcMonitoringDeviceEntity> list = baseDao.selectList(wrapper);
+        PageInfo<IcMonitoringDeviceEntity> pageInfo = new PageInfo<>(list);
         List<IcMonitoringDeviceDTO> icMonitoringDeviceDTOS = ConvertUtils.sourceToTarget(list, IcMonitoringDeviceDTO.class);
-        PageInfo<IcMonitoringDeviceDTO> pageInfo = new PageInfo<>(icMonitoringDeviceDTOS);
         return new PageData<>(icMonitoringDeviceDTOS, pageInfo.getTotal());
     }