提交管理模块java代码

dataCenter-manager/src/main/java/com/mortals/xhx/ManagerApplication.java

@@ -6,12 +6,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ImportResource;
-//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@EnableFeignClients
 @SpringBootApplication(scanBasePackages = {"com.mortals"})
 @ServletComponentScan("com.mortals")
 @ImportResource(locations = {"classpath:config/spring-config.xml"})
+@EnableFeignClients
 public class ManagerApplication extends BaseWebApplication {
 
     public static void main(String[] args) {

dataCenter-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java

@@ -73,6 +73,7 @@ public class AreaController extends BaseCRUDJsonMappingController<AreaService, A
             if(StringUtils.isEmpty(form.getQuery().getName())){
                 form.getQuery().setLevel(AreaLevelEnum.PROVINCE.getValue());
             }
+            form.getPageInfo().setPrePageResult(999);
             return super.list(request, response, form);
         }catch(Exception e){
             log.error("查询区域信息列表错误",e);

dataCenter-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -6,9 +6,11 @@ import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.code.UploadFileType;
 
+import com.mortals.xhx.tools.uid.ISeqGeneratorService;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +34,9 @@ public class UploadServiceImpl implements UploadService {
     @Value("${upload.path}")
     private String filePath;
 
+    @Autowired
+    private ISeqGeneratorService seqGeneratorService;
+
     @Override
     public String saveFileUpload(MultipartFile tempFile, String prePath, IUser user) {
         if (tempFile == null || tempFile.getSize() == 0) {
@@ -54,7 +59,10 @@ public class UploadServiceImpl implements UploadService {
         if (!pathDir.exists()) {
             pathDir.mkdirs();
         }
-        String newName = System.currentTimeMillis() + "." + extension;
+        //采用分布式id作为文件名
+        String newName =  seqGeneratorService.nextOrderId(1020) + "." + extension;
+        //废弃
+//        String newName = System.currentTimeMillis() + "." + extension;
         String filePathAll = filePath + newName;
 
         File uploadFile = new File(filePathAll);

dataCenter-manager/src/main/java/com/mortals/xhx/common/utils/DateByAffairUtils.java

@@ -10,7 +10,7 @@ import java.util.Date;
 import java.util.Random;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/2-10:01
  * @Description:
  */

dataCenter-manager/src/main/java/com/mortals/xhx/modules/data/web/DataAreaController.java

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -40,4 +42,9 @@ public class DataAreaController extends BaseCRUDJsonMappingController<DataAreaSe
         return cityList;
     }
 
+    @Override
+    public String list(HttpServletRequest request, HttpServletResponse response, DataAreaForm form) {
+        form.getPageInfo().setPrePageResult(999);
+        return super.list(request, response, form);
+    }
 }
\ No newline at end of file

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ApplyAndAcceptInformationTaskImpl.java

@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/3-16:28
  * @Description:办件数据推送省一体化平台(申请并受理)
  */

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/CreateTableTaskImpl.java

@@ -17,7 +17,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/4-16:19
  * @Description:
  */

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/DecideInformationTaskImpl.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/3-16:28
  * @Description:办件数据推送省一体化平台（决定）
  */

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ReviewInformationTaskImpl.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/3-16:28
  * @Description:办件数据推送省一体化平台（审查）
  */

dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/web/InformationController.java

@@ -7,8 +7,10 @@ import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonController;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.ElasticsearchClient;
 import com.mortals.xhx.modules.information.model.InformationEntity;
 import com.mortals.xhx.modules.information.service.InformationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.alibaba.fastjson.JSONObject;
 
@@ -27,6 +29,9 @@ import java.util.Map;
 @RequestMapping("/information")
 public class InformationController extends BaseCRUDJsonController<InformationService, InformationForm, InformationEntity,Long> {
 
+    @Autowired
+    private ElasticsearchClient elasticsearchClient;
+
 
     public InformationController(){
         super.setFormClass(InformationForm.class);
@@ -47,7 +52,10 @@ public class InformationController extends BaseCRUDJsonController<InformationSer
     @PostMapping(value="list")
     public String list(HttpServletRequest request, HttpServletResponse response, InformationForm form) {
     try{
-        return super.list(request, response, form);
+        //数据量过大时，查询效率低下
+//        return super.list(request, response, form);
+        //调用es查询接口(目前分页方式为浅分页，分页量超过1W条时，建议使用深分页，但深分页不支持跳页查询)
+        return  elasticsearchClient.queryEla(form.getPageInfo().getCurrPage(),form.getPageInfo().getPrePageResult()).toString();
     }catch(Exception e){
         log.error("查询办件信息列表错误",e);
         JSONObject ret = new JSONObject();

dataCenter-manager/src/main/java/com/mortals/xhx/modules/service/QueryInformationServiceImpl.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.modules.service;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.code.MenuLinkType;
 import com.mortals.xhx.common.utils.DateByAffairUtils;
 import com.mortals.xhx.modules.information.model.InformationEntity;
 import com.mortals.xhx.modules.information.model.InformationQuery;
@@ -79,4 +80,7 @@ public class QueryInformationServiceImpl {
         //表示上个月已全部处理完
         return informationService.find(informationQuery, pageInfo, null).getList();
     }
+
+
+
 }

dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/listener/InformationDataConversionListener.java

@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-07-2021/7/30-15:06
  * @Description:
  */

dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/task/SupplementTaskImpl.java

@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/2-10:44
  * @Description:数据清洗
  */
@@ -170,12 +170,12 @@ public class SupplementTaskImpl implements ITaskExcuteService {
     }
 
     private List<SupplementEntity> queryDataThatHasNotBeenPushed(String excuteParam) {
-        List<SupplementEntity> supplementEntities = new ArrayList<>();
+        List<SupplementEntity> supplementEntities;
         SupplementQuery supplementQuery = new SupplementQuery();
         supplementQuery.setIsExecute("0");
         supplementQuery.setIsSuccess("0");
         PageInfo pageInfo = new PageInfo();
-        pageInfo.setPrePageResult(Integer.valueOf(excuteParam));
+        pageInfo.setPrePageResult(Integer.parseInt(excuteParam));
         //TODO： 条数限制
         //本月第一天
         String theFirstDayOfTheMonth = new SimpleDateFormat("yyyy-MM-dd").format(DateByAffairUtils.getMonthFirstDate(new Date()));
@@ -215,8 +215,7 @@ public class SupplementTaskImpl implements ITaskExcuteService {
         //获取当前时间
         supplementQuery.setCreateDateEnd(
                 DateUtils.convertTime2Str(new Date().getTime(), DateUtils.P_yyyy_MM_dd_HH_mm_ss));
-        List<SupplementEntity> list = supplementService.find(supplementQuery, pageInfo,null).getList();
-        return list;
+        return supplementService.find(supplementQuery, pageInfo,null).getList();
     }
 
 }

dataCenter-manager/src/main/java/com/mortals/xhx/test0002/teeee.java

@@ -13,7 +13,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/6-14:10
  * @Description:
  */

dataCenter-manager/src/main/java/com/mortals/xhx/test0002/testModel.java

@@ -3,7 +3,7 @@ package com.mortals.xhx.test0002;
 import lombok.Data;
 
 /**
- * @author Wz
+ * @author liaoxin
  * @Date: 2021-08-2021/8/6-15:16
  * @Description:
  */