重构部分功能模块

fill-manager/src/main/java/com/mortals/xhx/common/code/ComponentEnum.java

@@ -18,6 +18,7 @@ public enum ComponentEnum {
     DATE("date", "日期选择栏"),
     AREA("area", "区域选择栏"),
     IMAGE("@image", "图片选择"),
+    LIST("list", "横向单列表"),
     DYNAMIC_TABLE("dt", "动态表格"),;
 
     private String value;

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/DesignComponent.java

@@ -30,12 +30,14 @@ public abstract class DesignComponent  {
             return new DesignCheckboxComponent(type);
         } else if (type.equals(ComponentEnum.RADIO.getValue())) {
             return new DesignRadioComponent(type);
-        }else if (type.equals(ComponentEnum.BUTTON.getValue())) {
+        } else if (type.equals(ComponentEnum.BUTTON.getValue())) {
             return new DesignButtonComponent(type);
         } else if (type.equals(ComponentEnum.DATE.getValue())) {
             return new DesignDateComponent(type);
         } else if (type.equals(ComponentEnum.IMAGE.getValue())) {
             return new DesignImageComponent(type);
+        } else if (type.equals(ComponentEnum.LIST.getValue())) {
+            return new DesignListComponent(type);
         } else if (type.equals(ComponentEnum.DYNAMIC_TABLE.getValue())) {
             return new DesignDynamicTableComponent(type);
         }

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignListComponent.java

+package com.mortals.xhx.common.formdesign.component;
+
+import com.google.common.collect.Lists;
+import com.mortals.xhx.common.code.ComponentEnum;
+import com.mortals.xhx.common.formdesign.DesignComponent;
+import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
+
+/**
+ * 输入框组件
+ *
+ * @author: zxfei
+ * @date: 2021/10/26 10:35
+ * @description:
+ **/
+public class DesignListComponent extends DesignComponent {
+
+    public DesignListComponent(String type) {
+        super(type);
+    }
+
+    @Override
+    public ListItem buildDefaultComponent(ComponentCons cons) {
+        ListItem columnsItem = new ListItem();
+        columnsItem.setId(cons.getVal());
+        columnsItem.set_id(cons.getVal());
+        columnsItem.setCompType("input");
+        columnsItem.setCompName(cons.getLabel());
+        columnsItem.setCompIcon("input");
+        columnsItem.setEle("el-input");
+        columnsItem.setViewType("text");
+        columnsItem.setConfig(true);
+        columnsItem.setShowLabel(true);
+        columnsItem.setLabel(cons.getLabel());
+        columnsItem.setLabelWidth(120);
+        columnsItem.setPlaceholder("请输入"+cons.getLabel());
+        columnsItem.setRequired(false);
+        columnsItem.setMaxLength(50);
+        columnsItem.setGutter(15);
+        columnsItem.setSpan(12);
+        columnsItem.setWidth("100%");
+        columnsItem.setClearable(true);
+        columnsItem.setDisabled(false);
+        columnsItem.setReadonly(false);
+        columnsItem.setStatus("normal");
+        columnsItem.setPrefixIcon("");
+        columnsItem.setRules(Lists.newArrayList());
+        columnsItem.setRulesType("default");
+        columnsItem.setAppend("");
+        columnsItem.setPrepend("");
+        columnsItem.setLayout("colItem");
+        return columnsItem;
+    }
+
+    @Override
+    public String getType() {
+        return ComponentEnum.INPUT.getValue();
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.matter.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.text.StrSplitter;
+import cn.hutool.core.text.finder.LengthFinder;
+import cn.hutool.core.text.split.SplitIter;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
@@ -13,6 +15,7 @@ import com.deepoove.poi.config.ConfigureBuilder;
 import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.data.PictureType;
 import com.deepoove.poi.data.Pictures;
+import com.deepoove.poi.plugin.table.LoopColumnTableRenderPolicy;
 import com.deepoove.poi.plugin.table.MultipleRowTableRenderPolicy;
 import com.deepoove.poi.template.MetaTemplate;
 import com.deepoove.poi.util.RegexUtils;
@@ -21,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
@@ -95,7 +99,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Override
     protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
-        statDatumCount(entity,context);
+        statDatumCount(entity, context);
         addPubdatum(entity, context);
         super.saveAfter(entity, context);
     }
@@ -124,7 +128,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         }
     }
 
-    private void statDatumCount( MatterDatumEntity matterDatumEntity,Context context) {
+    private void statDatumCount(MatterDatumEntity matterDatumEntity, Context context) {
         int count = this.count(new MatterDatumQuery().matterId(matterDatumEntity.getMatterId()), context);
         MatterEntity matterEntity = matterService.get(matterDatumEntity.getMatterId(), context);
         if (!ObjectUtils.isEmpty(matterEntity)) {
@@ -173,20 +177,21 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         MatterDatumEntity matterDatumEntity = this.get(id, context);
         int iRet = this.dao.delete(id);
         this.removeAfter(id, context, iRet);
-        statDatumCount(matterDatumEntity,context);
+        statDatumCount(matterDatumEntity, context);
         return iRet;
     }
 
     @Override
     public int remove(Long[] ids, Context context) throws AppException {
         this.removeBefore(ids, context);
-        if(ids==null||ids.length==0) return 0;
+        if (ids == null || ids.length == 0) return 0;
         MatterDatumEntity matterDatumEntity = this.get(ids[0], context);
         int iRet = this.dao.delete(ids);
         this.removeAfter(ids, context, iRet);
-        statDatumCount(matterDatumEntity,context);
+        statDatumCount(matterDatumEntity, context);
         return iRet;
     }
+
     private void parseDocxToJson(MatterDatumEntity entity) {
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         String filepath = rootPath + entity.getTemplatePath();
@@ -204,9 +209,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         List<ListItem> collect = new ArrayList<>();
         HashSet<String> hs = new HashSet<>(); //去除重复标签
         for (MetaTemplate item : template.getElementTemplates()) {
-            if(hs.contains(item.variable())){
+            if (hs.contains(item.variable())) {
                 continue;
-            }else {
+            } else {
                 hs.add(item.variable());
             }
             //识别简单输入
@@ -233,9 +238,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                     XWPFTemplate templateTable = XWPFTemplate.compile(filepath, builderTable.build());
 
                     for (MetaTemplate col : templateTable.getElementTemplates()) {
-                        if(dhs.contains(col.variable())){
+                        if (dhs.contains(col.variable())) {
                             continue;
-                        }else {
+                        } else {
                             dhs.add(col.variable());
                         }
                         String colVal = StrUtil.strip(col.variable(), "[", "]");
@@ -324,6 +329,35 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                 if (entry.getKey().indexOf("dt_") != -1) {
                     builder.bind(entry.getKey(), new MultipleRowTableRenderPolicy());
                 }
+                //绑定转换list  list_1_身份证_18_num
+                if (entry.getKey().indexOf("list_") != -1) {
+                    List<String> keys = StrSplitter.split(entry.getKey(), "_", true, true);
+                    Integer lens = 18;
+                    if (keys.size() > 3) {
+                        lens = DataUtil.converStr2Int(keys.get(3), 18);
+                    }
+                    String value = entry.getValue().toString();
+                    SplitIter splitIter = new SplitIter(value, new LengthFinder(1), -1, false);
+                    List<String> valueList = splitIter.toList(true);
+                    if (valueList.size() < lens) {
+                        int sub = lens - valueList.size();
+                        for (int i = 0; i < sub; i++) {
+                            valueList.add("");
+                        }
+                    }
+                    //StrUtil
+                    List<Map<String, String>> colList = valueList.stream().map(item -> {
+                        Map<String, String> map = new HashMap<>();
+                        String colName = "col";
+                        if (keys.size() > 3) {
+                            colName = keys.get(4);
+                        }
+                        map.put(colName, item);
+                        return map;
+                    }).collect(Collectors.toList());
+                    builder.bind(entry.getKey(), new LoopColumnTableRenderPolicy());
+                    data.put(entry.getKey(), colList);
+                }
             });
             if (addMap.size() > 0) {
                 data.putAll(addMap);
@@ -349,7 +383,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                     //转换预览图片
                     String fileName = RandomUtil.randomNumbers(12) + ".jpg";
                     String preView = rootPath + "file/preview/" + fileName;
-                    log.info(String.format("mergedoc:%s,preViewPath:%s", mergedoc,preView));
+                    log.info(String.format("mergedoc:%s,preViewPath:%s", mergedoc, preView));
                     WordUtil.convertWordToJPEG(mergedoc, preView);
                     log.info("preView:" + mergedocPath);
                     //下载地址拼装
@@ -423,6 +457,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         }
         return null;
     }
+
     @Override
     public Rest<String> recommend(Long id, Long siteId, Context context) {
         MatterDatumEntity matterDatumEntity = this.get(id, context);
@@ -451,9 +486,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Override
     protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
-        list.stream().forEach(entity->{
+        list.stream().forEach(entity -> {
             MatterEntity matterEntity = matterService.get(entity.getMatterId(), context);
-            if(!ObjectUtils.isEmpty(matterEntity)){
+            if (!ObjectUtils.isEmpty(matterEntity)) {
                 entity.setMatterNo(matterEntity.getMatterNo());
                 entity.setMatterName(matterEntity.getMatterName());
             }
@@ -462,12 +497,25 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     }
 
     public static void main(String[] args) {
-        String colVal="i_1_变更登记事项";
+        String colVal = "i_1_变更登记事项";
         List<String> colKeys = StrSplitter.split(colVal, "_", true, true);
 
         System.out.println(colKeys.size());
         System.out.println(colKeys.get(0));
 
+        colVal = "13808095770";
+        SplitIter splitIter = new SplitIter(colVal, new LengthFinder(1), -1, false);
+
+        List<String> strings1 = splitIter.toList(true);
+        strings1.forEach(item -> {
+            System.out.println(item);
+        });
+
+//        String[] strings = StrSplitter.splitByLength(colVal, 1);
+//        for (int i = 0; i <strings.length ; i++) {
+//            System.out.println(strings[i]);
+//        }
+
 
     }