Преглед на файлове

导入接口修改,适配新需求与dms导入接口改造

ximinghao преди 2 месеца
родител
ревизия
176673a809
променени са 2 файла, в които са добавени 14 реда и са изтрити 7 реда
  1. 11 6
      src/main/java/com/skyversation/xjcy/dms/DMSImport.java
  2. 3 1
      src/main/java/com/skyversation/xjcy/dms/DMSService.java

+ 11 - 6
src/main/java/com/skyversation/xjcy/dms/DMSImport.java

@@ -5,27 +5,32 @@ import lombok.Getter;
 @Getter
 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\":\"迁出原因\"}]",
+            null,
             DMSColumn.ENTERPRISE,
             "企业名称",
             "企业统一社会信用代码",
-            false),
+            false, true),
     ENTERPRISE_ECONOMIC("[{\"field\":\"c_approved_revenue\",\"nameInExcel\":\"核定营收(元)\"},{\"field\":\"c_approved_output_value\",\"nameInExcel\":\"核定产值(元)\"},{\"field\":\"c_approved_tax\",\"nameInExcel\":\"核定税收(元)\"}]",
+            "[{\"field\":\"c_enterprise_id\",\"nameInExcel\":\"企业统一信用代码\"},{\"field\":\"c_year_month\",\"nameInExcel\":\"年月\"}]",
             DMSColumn.ENTERPRISE_ECONOMIC,
             null,
             null,
-            true);
+            true, true);
     private final String relation;
+    private final String mainKey;
     private final DMSColumn column;
     private final String title;
     private final String content;
-    private final boolean isUpdate;
-
+    private final boolean updatable;
+    private final boolean insertable;
 
-    DMSImport(String relation, DMSColumn column, String title, String content, boolean isUpdate) {
+    DMSImport(String relation, String mainKey, DMSColumn column, String title, String content, boolean isUpdate, boolean insertable) {
         this.relation = relation;
+        this.mainKey = mainKey;
         this.column = column;
         this.title = title;
         this.content = content;
-        this.isUpdate = isUpdate;
+        this.updatable = isUpdate;
+        this.insertable = insertable;
     }
 }

+ 3 - 1
src/main/java/com/skyversation/xjcy/dms/DMSService.java

@@ -189,9 +189,11 @@ public class DMSService {
         params.add("contentParam", importType.getContent());
         params.add("titleParam", importType.getTitle());
         params.add("parseArray", importType.getRelation());
+        params.add("mainKey", importType.getMainKey());
         params.add("secretLevel", 0);
         params.add("file", resource);
-        params.add("update", importType.isUpdate() ? "true" : "false");
+        params.add("update", importType.isUpdatable() ? "true" : "false");
+        params.add("insert", importType.isInsertable() ? "true" : "false");
         Map<String, String> headers = new HashMap<>();
         headers.put("token", token);
         return HttpUtil.requestPost(path + "/content/importBeautifiedExcel", params, headers);