导入企业经济采集

src/main/java/com/skyversation/xjcy/controller/DataImportController.java

@@ -33,4 +33,13 @@ public class DataImportController {
 
         return dataImportService.importTo(file, token, DMSImport.ENTERPRISE);
     }
+    @RequestMapping("/enterpriseEconomic")
+    public String toEnterpriseEconomic(@RequestParam("file") MultipartFile file , HttpServletRequest request) throws IOException {
+        String token = request.getHeader("token");
+        if (token == null||token.isEmpty()) {
+            return MessageManage.getInstance().getResultContent(-1,"缺少token","缺少token");
+        }
+
+        return dataImportService.importTo(file, token, DMSImport.ENTERPRISE_ECONOMIC);
+    }
 }

src/main/java/com/skyversation/xjcy/dms/DMSImport.java

@@ -7,19 +7,25 @@ public enum DMSImport {
     ENTERPRISE("[{\"field\":\"c_enterprise_name\",\"nameInExcel\":\"企业名称\"},{\"field\":\"c_unified_social_credit_code\",\"nameInExcel\":\"企业统一社会信用代码\"},{\"field\":\"tags\",\"nameInExcel\":\"企业标签\"},{\"field\":\"household_unit_id\",\"nameInExcel\":\"户管单位\",\"specialParse\":\"FK\",\"foreignColumnId\":\"1573\",\"foreignField\":\"c_dept_code\",\"excelValueField\":\"c_dept_name\",\"foreignCondition\":[{\"columnId\":\"1573\",\"columnName\":\"c_dept_type\",\"condition\":\"like\",\"value\":\"%4%\"}]},{\"field\":\"c_investment_unit_id\",\"nameInExcel\":\"招商单位\",\"specialParse\":\"FK\",\"foreignColumnId\":\"1573\",\"foreignField\":\"c_dept_code\",\"excelValueField\":\"c_dept_name\",\"foreignCondition\":[{\"columnId\":\"1573\",\"columnName\":\"c_dept_type\",\"condition\":\"like\",\"value\":\"%3%\"}]},{\"field\":\"c_investment_unit_name\",\"nameInExcel\":\"招商单位\"},{\"field\":\"is_gsqy\",\"nameInExcel\":\"是否规上企业\"},{\"field\":\"c_certificate_date\",\"nameInExcel\":\"迁入徐泾日期\"},{\"field\":\"reg_type\",\"nameInExcel\":\"注册类型\"},{\"field\":\"c_industry_catalog_type\",\"nameInExcel\":\"产业结构调整指导目录类型\"},{\"field\":\"c_is_key_project_qp\",\"nameInExcel\":\"是否属于青浦区重点发展的“十四大工程”\"},{\"field\":\"c_is_eliminate_industry\",\"nameInExcel\":\"是否为淘汰类产业\"},{\"field\":\"c_is_closed_enterprise\",\"nameInExcel\":\"是否为关停并转企业\"},{\"field\":\"c_move_out_date\",\"nameInExcel\":\"迁出日期\"},{\"field\":\"c_move_reason\",\"nameInExcel\":\"迁出原因\"}]",
             DMSColumn.ENTERPRISE,
             "企业名称",
-            "企业统一社会信用代码"
-            )
-    ;
+            "企业统一社会信用代码",
+            false),
+    ENTERPRISE_ECONOMIC("[{\"field\":\"c_approved_revenue\",\"nameInExcel\":\"核定营收（元）\"},{\"field\":\"c_approved_output_value\",\"nameInExcel\":\"核定产值（元）\"},{\"field\":\"c_approved_tax\",\"nameInExcel\":\"核定税收（元）\"}]",
+            DMSColumn.ENTERPRISE_ECONOMIC,
+            null,
+            null,
+            true);
     private final String relation;
     private final DMSColumn column;
     private final String title;
     private final String content;
+    private final boolean isUpdate;
 
 
-    DMSImport(String relation,DMSColumn column, String title, String content) {
+    DMSImport(String relation, DMSColumn column, String title, String content, boolean isUpdate) {
         this.relation = relation;
         this.column = column;
         this.title = title;
         this.content = content;
+        this.isUpdate = isUpdate;
     }
 }

src/main/java/com/skyversation/xjcy/dms/DMSService.java

@@ -81,6 +81,7 @@ public class DMSService {
         params.add("parseArray",importType.getRelation());
         params.add("secretLevel",0);
         params.add("file",resource);
+        params.add("update",importType.isUpdate()?"true":"false");
         Map<String,String> headers = new HashMap<>();
         headers.put("token", token);
         return HttpUtil.requestPost(path+"/content/importBeautifiedExcel",params,headers);

src/main/java/com/skyversation/xjcy/service/DataImportService.java

@@ -17,12 +17,12 @@ public class DataImportService {
         org.springframework.core.io.Resource resource = new InputStreamResource(file.getInputStream()) {
             @Override
             public String getFilename() {
-                return file.getOriginalFilename();   // 关键！
+                return file.getOriginalFilename();
             }
 
             @Override
             public long contentLength() {
-                return file.getSize();               // 可选，让 Content-Length 正确
+                return file.getSize();
             }
         };
         return dmsService.importToDms(resource,token,importType);

src/main/resources/application.yml

@@ -21,6 +21,7 @@ logging:
 app:
   count-cache-length: ${COUNT_CACHE_LENGTH:5000}
   dms:
+#    path: http://127.0.0.1:10081/dms
     path: ${DMS_PATH:http://121.43.55.7:10081/dms}
   oauth:
     login-name: ${DMS_LOGIN_NAME:user_hj}