设备列表添加筛选字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTableDataExportController.java

@@ -263,7 +263,7 @@ public class JgTableDataExportController extends BaseController {
     @GetMapping(value = "/enterpriseInformationExport")
     @ApiOperation(httpMethod = "GET", value = "基础设置-企业信息列表数据导出", notes = "基础设置-企业信息列表数据导出")
     public ResponseModel<String> managePipe(@RequestParam(value = "ids", required = false) String ids,
-                                            @RequestParam Map<String, String> map) {
+                                            @RequestParam Map<String, Object> map) {
         String uuid = UUID.randomUUID().toString();
         iJgTableDataExportService.startDownLoadMsg("企业信息列表", uuid);
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
@@ -279,7 +279,7 @@ public class JgTableDataExportController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "基础设置-企业-人员信息列表数据导出", notes = "基础设置-企业-人员信息列表数据导出")
     public ResponseModel<String> userInfoExport(@RequestParam(value = "ids", required = false) String ids,
                                                 @RequestParam(value = "sort", required = false) String sort,
-                                                @RequestParam Map<String, String> map) {
+                                                @RequestParam Map<String, Object> map) {
         String uuid = UUID.randomUUID().toString();
         iJgTableDataExportService.startDownLoadMsg("人员信息列表", uuid);
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/JczsServiceFeignClient.java

@@ -21,6 +21,6 @@ public interface JczsServiceFeignClient {
     ResponseModel<Page<Map<String, String>>> page(@RequestParam("current") int current,
                                                   @RequestParam("size") int size,
                                                   @RequestParam("keyword") String keyword,
-                                                  @RequestParam Map<String, String> map);
+                                                  @RequestParam Map<String, Object> map);
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TcmServiceFeignClient.java

@@ -20,13 +20,13 @@ public interface TcmServiceFeignClient {
     ResponseModel<Page<Map<String, String>>> page(@RequestParam(value = "current") String current,
                                                   @RequestParam(value = "size") String size,
                                                   @RequestParam(value = "sort", required = false) String sort,
-                                                  @RequestParam Map<String, String> dto);
+                                                  @RequestParam Map<String, Object> dto);
 
     @RequestMapping(value = "/userInfo/permission-page", method = RequestMethod.POST)
     ResponseModel<Page<Map<String, String>>> getUserByPermission(@RequestParam(value = "current") long current,
                                                                  @RequestParam(value = "size") long size,
                                                                  @RequestParam(value = "sort", required = false) String sort,
                                                                  @RequestParam(required = false, defaultValue = "all") String type,
-                                                                 @RequestBody Map<String, String> map);
+                                                                 @RequestBody Map<String, Object> map);
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IJgTableDataExportService.java

@@ -59,9 +59,9 @@ public interface IJgTableDataExportService {
 
     void unregulatedPipe(String uuid, Map<String, String> params, String sort, ReginParams reginParams);
 
-    void enterpriseInformationExport(String uuid, String ids, Map<String, String> map);
+    void enterpriseInformationExport(String uuid, String ids, Map<String, Object> map);
 
-    void userInfoExport(String uuid, String ids, Map<String, String> map);
+    void userInfoExport(String uuid, String ids, Map<String, Object> map);
 
     void userInfoExportWithAdmin(String uuid, String ids, Map<String, String> map);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -147,6 +147,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String EQU_CATEGORY_CODE = "EQU_CATEGORY_CODE";
     public static final String EQU_LIST_CODE = "EQU_LIST_CODE";
     public static final String PROJECT_CONTRAPTION = "PROJECT_CONTRAPTION";// 工程装置名称
+    public static final String CREATE_DATE_RANGE = "CREATE_DATE_RANGE";// 创建时间范围查询
+    public static final String CREATE_DATE = "CREATE_DATE";// 创建时间范围查询
     /**
      * 业务类型 0：单个新增 1:批量导入
      */
@@ -2396,7 +2398,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
             return new Page<>();
         }
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Integer pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number");
         Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
         Page<JSONObject> result = new Page<>(pageNumber, size);
@@ -2768,6 +2770,37 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
             }
         }
+        // 创建时间范围查询
+        if (!ObjectUtils.isEmpty(map.getString(CREATE_DATE_RANGE))) {
+
+            String createDateRangeObj = map.getString(CREATE_DATE_RANGE);
+            String[] split = createDateRangeObj.replace("[", "").replace("]", "").split(",");
+            String startDateStr = split[0];
+            String endDateStr = split[1];
+            try {
+
+                Date startDate = sdf.parse(startDateStr);
+                Date endDate = sdf.parse(endDateStr);
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(endDate);
+                calendar.set(Calendar.HOUR_OF_DAY, 23);
+                calendar.set(Calendar.MINUTE, 59);
+                calendar.set(Calendar.SECOND, 59);
+                calendar.set(Calendar.MILLISECOND, 999);
+                endDate = calendar.getTime();
+                long startDateMillis = startDate.getTime();
+                long endDateMillis = endDate.getTime();
+                BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+                pBuilder.must(QueryBuilders.rangeQuery("CREATE_DATE")
+                        .gte(startDateMillis)  // 大于等于开始日期的时间戳
+                        .lte(endDateMillis)    // 小于等于结束日期的时间戳
+                );
+                boolMust.must(pBuilder);
+            } catch (Exception e) {
+                log.error("日期转化异常：{}", e.getMessage());
+                e.printStackTrace();
+            }
+        }
         // 字段排序
         if (!ObjectUtils.isEmpty(map.get("sort"))){
             String[] sorts = Objects.toString(map.get("sort")).split(",");
@@ -2855,6 +2888,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     item.put("REC_DATE", Instant.ofEpochMilli(Long.parseLong(item.getString("REC_DATE")))
                             .atZone(ZoneId.systemDefault())
                             .toLocalDate());
+                    if (!ValidationUtil.isEmpty(item.getString(CREATE_DATE))){
+                        item.put(CREATE_DATE, Instant.ofEpochMilli(Long.parseLong(item.getString(CREATE_DATE)))
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDate());
+                    }
                     String fullAddress = equAddressMap.get(item.getString(SEQUENCE_NBR));
                     item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : "");
                     item.put("CAN_EDIT", this.checkEquipIsCanEdit(item.getString(SEQUENCE_NBR)));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTableDataExportServiceImpl.java

@@ -757,7 +757,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
                 .fluentPut("time", new Date().getTime()));
     }
 
-    private List<String> getEnterSeqs(String ids, Map<String, String> map) {
+    private List<String> getEnterSeqs(String ids, Map<String, Object> map) {
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
         List<String> idsList = new ArrayList<>();
         if (StringUtils.isEmpty(ids)) {
@@ -803,7 +803,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
      * @param ids
      */
     @Override
-    public void enterpriseInformationExport(String uuid, String ids, Map<String, String> map) {
+    public void enterpriseInformationExport(String uuid, String ids, Map<String, Object> map) {
         ObjectMapper objectMapper = new ObjectMapper();
         List<String> enterSeqs = getEnterSeqs(ids, map);
         List<Map<String, String>> enterInfoWithExport = tzBaseEnterpriseInfoMapper.getEnterInfoWithExport(enterSeqs);
@@ -835,7 +835,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
                 .fluentPut("time", new Date().getTime()));
     }
 
-    private List<String> getUserInfoSeqs(boolean isAdmin, String ids, Map<String, String> map) {
+    private List<String> getUserInfoSeqs(boolean isAdmin, String ids, Map<String, Object> map) {
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
         List<String> idsList = new ArrayList<>();
         if (StringUtils.isEmpty(ids)) {
@@ -881,7 +881,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
 
 
     @Override
-    public void userInfoExport(String uuid, String ids, Map<String, String> map) {
+    public void userInfoExport(String uuid, String ids, Map<String, Object> map) {
         List<String> userInfoSeqs = getUserInfoSeqs(false, ids, map);
         List<Map<String, String>> enterInfoWithExport = tzsUserInfoMapper.getUserInfoWithExport(userInfoSeqs);
         List<UserInfoVo> exportData = JSON.parseArray(JSON.toJSONString(enterInfoWithExport), UserInfoVo.class);