添加应用白名单接口

fill-manager/db/module.sql

@@ -220,26 +220,39 @@ CREATE TABLE mortals_xhx_matter_datum(
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
 
 
-
 -- ----------------------------
 -- 打印提交表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_matter_datum_print`;
-CREATE TABLE mortals_xhx_matter_datum_print
-(
-    `id`           bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
-    `siteId`       bigint(20) COMMENT '站点id',
-    `orderId`      varchar(64) COMMENT '打印订单',
-    `materialId`   bigint(20) COMMENT '材料Id',
-    `materialName` varchar(1024) NOT NULL COMMENT '材料名',
-    `page`         int(8) COMMENT '材料页数',
-    `type`         tinyint(2) COMMENT '打印类型(1.本地打印,2.在线打印)',
-    `docPath`      varchar(255) COMMENT '合成doc后地址',
-    `formContent`  mediumtext COMMENT '提交的表单',
-    `createTime`   datetime COMMENT '创建时间',
-    `createUserId` bigint(20) COMMENT '创建用户',
-    `updateTime`   datetime COMMENT '修改时间',
-    PRIMARY KEY (`id`)
+CREATE TABLE mortals_xhx_matter_datum_print(
+       `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
+       `siteId` bigint(20)      COMMENT '站点id',
+       `orderId` varchar(64)      COMMENT '打印订单',
+       `materialId` bigint(20)      COMMENT '材料Id',
+       `materialName` varchar(1024) NOT NULL     COMMENT '材料名',
+       `page` int(8)      COMMENT '材料页数',
+       `type` tinyint(2)    DEFAULT '1'  COMMENT '打印类型(1.本地打印,2.在线打印)',
+       `docPath` varchar(255)      COMMENT '合成doc后地址',
+       `formContent` mediumtext      COMMENT '提交的表单',
+       `createTime` datetime      COMMENT '创建时间',
+       `createUserId` bigint(20)      COMMENT '创建用户',
+       `updateTime` datetime      COMMENT '修改时间',
+       `idCard` varchar(64)      COMMENT '身份证号',
+       `idName` varchar(64)      COMMENT '身份证名称',
+       `mobile` varchar(32)      COMMENT '手机号码',
+       `matterId` bigint(20)      COMMENT '事项id',
+       `matterName` varchar(2048)      COMMENT '事项名称',
+       `matterCode` varchar(255)      COMMENT '事项编码',
+       `deviceCode` varchar(255)      COMMENT '设备编码',
+       `deviceName` varchar(255)      COMMENT '设备名称',
+       PRIMARY KEY  (`id`)
+    ,KEY `siteId` (`siteId`) USING BTREE
+    ,KEY `orderId` (`orderId`) USING BTREE
+    ,KEY `materialId` (`materialId`) USING BTREE
+    ,KEY `type` (`type`) USING BTREE
+    ,KEY `docPath` (`docPath`) USING BTREE
+    ,KEY `mobile` (`mobile`) USING BTREE
+    ,KEY `matterId` (`matterId`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='打印提交';
 
 
@@ -254,3 +267,4 @@ CREATE TABLE mortals_xhx_matter_datum_print
 
 
 
+

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumPrintEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumPrintVo;
  * 打印提交实体对象
  *
  * @author zxfei
- * @date 2022-12-09
+ * @date 2023-02-23
  */
 
 public class MatterDatumPrintEntity extends MatterDatumPrintVo {
@@ -48,6 +48,38 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
      * 提交的表单
      */
     private String formContent;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 身份证名称
+     */
+    private String idName;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+    /**
+     * 事项id
+     */
+    private Long matterId;
+    /**
+     * 事项名称
+     */
+    private String matterName;
+    /**
+     * 事项编码
+     */
+    private String matterCode;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
 
 
 
@@ -164,6 +196,118 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
     public void setFormContent(String formContent){
         this.formContent = formContent;
     }
+    /**
+     * 获取 身份证号
+     * @return String
+     */
+    public String getIdCard(){
+        return idCard;
+    }
+    /**
+     * 设置 身份证号
+     * @param idCard
+     */
+    public void setIdCard(String idCard){
+        this.idCard = idCard;
+    }
+    /**
+     * 获取 身份证名称
+     * @return String
+     */
+    public String getIdName(){
+        return idName;
+    }
+    /**
+     * 设置 身份证名称
+     * @param idName
+     */
+    public void setIdName(String idName){
+        this.idName = idName;
+    }
+    /**
+     * 获取 手机号码
+     * @return String
+     */
+    public String getMobile(){
+        return mobile;
+    }
+    /**
+     * 设置 手机号码
+     * @param mobile
+     */
+    public void setMobile(String mobile){
+        this.mobile = mobile;
+    }
+    /**
+     * 获取 事项id
+     * @return Long
+     */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+     * 设置 事项id
+     * @param matterId
+     */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+     * 获取 事项名称
+     * @return String
+     */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+     * 设置 事项名称
+     * @param matterName
+     */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+     * 获取 事项编码
+     * @return String
+     */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+     * 设置 事项编码
+     * @param matterCode
+     */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+     * 获取 设备编码
+     * @return String
+     */
+    public String getDeviceCode(){
+        return deviceCode;
+    }
+    /**
+     * 设置 设备编码
+     * @param deviceCode
+     */
+    public void setDeviceCode(String deviceCode){
+        this.deviceCode = deviceCode;
+    }
+    /**
+     * 获取 设备名称
+     * @return String
+     */
+    public String getDeviceName(){
+        return deviceName;
+    }
+    /**
+     * 设置 设备名称
+     * @param deviceName
+     */
+    public void setDeviceName(String deviceName){
+        this.deviceName = deviceName;
+    }
 
 
 
@@ -194,6 +338,14 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
         sb.append(",type:").append(getType());
         sb.append(",docPath:").append(getDocPath());
         sb.append(",formContent:").append(getFormContent());
+        sb.append(",idCard:").append(getIdCard());
+        sb.append(",idName:").append(getIdName());
+        sb.append(",mobile:").append(getMobile());
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",deviceCode:").append(getDeviceCode());
+        sb.append(",deviceName:").append(getDeviceName());
         return sb.toString();
     }
 
@@ -207,12 +359,28 @@ public class MatterDatumPrintEntity extends MatterDatumPrintVo {
 
         this.materialName = null;
 
-        this.page = 0;
+        this.page = null;
 
         this.type = 1;
 
-        this.docPath = "";
+        this.docPath = null;
+
+        this.formContent = null;
+
+        this.idCard = "";
+
+        this.idName = "";
+
+        this.mobile = "";
+
+        this.matterId = null;
+
+        this.matterName = "";
+
+        this.matterCode = "";
+
+        this.deviceCode = "";
 
-        this.formContent = "";
+        this.deviceName = "";
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.matter.service.impl;
+
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.utils.WordUtil;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -12,28 +14,41 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.matter.dao.MatterDatumPrintDao;
 import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
+import org.springframework.util.ObjectUtils;
+
 /**
-* MatterDatumPrintService
-* 打印提交 service实现
-*
-* @author zxfei
-* @date 2022-12-09
-*/
+ * MatterDatumPrintService
+ * 打印提交 service实现
+ *
+ * @author zxfei
+ * @date 2022-12-09
+ */
 @Service("matterDatumPrintService")
 public class MatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MatterDatumPrintDao, MatterDatumPrintEntity, Long> implements MatterDatumPrintService {
 
     @Autowired
     private UploadService uploadService;
+    @Autowired
+    private MatterService matterService;
+    @Autowired
+    private MatterDatumService matterDatumService;
 
     @Value("${upload.path}")
     private String filePath;
+
     @Override
     protected void saveBefore(MatterDatumPrintEntity entity, Context context) throws AppException {
-       // MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+        // MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+        if (!ObjectUtils.isEmpty(entity.getMaterialId())) {
+            MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
+            if (!ObjectUtils.isEmpty(matterDatumEntity)) {
+                entity.setMatterId(matterDatumEntity.getMatterId());
+                entity.setMatterName(matterDatumEntity.getMatterName());
+            }
+        }
 
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
-
-        Integer pageByDoc = WordUtil.getPageByDoc(rootPath+entity.getDocPath());
+        Integer pageByDoc = WordUtil.getPageByDoc(rootPath + entity.getDocPath());
         entity.setPage(pageByDoc);
         super.saveBefore(entity, context);
     }