Merge remote-tracking branch 'origin/master'

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/dao/CertificateChildDao.java

+package com.mortals.xhx.module.certificate.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import java.util.List;
+/**
+* 目录子证Dao
+* 目录子证 DAO接口
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+
+public interface  CertificateChildDao extends ICRUDDao<CertificateChildEntity,Long>{
+
+
+}

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/dao/ibatis/CertificateChildDaoImpl.java

+package com.mortals.xhx.module.certificate.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.certificate.dao.CertificateChildDao;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 目录子证DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Repository("certificateChildDao")
+public class CertificateChildDaoImpl extends BaseCRUDDaoMybatis<CertificateChildEntity,Long> implements CertificateChildDao {
+
+
+
+}

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateChildEntity.java

+package com.mortals.xhx.module.certificate.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.certificate.model.vo.CertificateChildVo;
+import lombok.Data;
+/**
+* 目录子证实体对象
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Data
+public class CertificateChildEntity extends CertificateChildVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点id
+    */
+    private Long siteId;
+    /**
+    * 证照目录id
+    */
+    private Long catalogId;
+    /**
+    * 子证id
+    */
+    private Long documentId;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof CertificateChildEntity) {
+            CertificateChildEntity tmp = (CertificateChildEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.siteId = null;
+            this.catalogId = null;
+            this.documentId = null;
+    }
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateDocumentEntity.java

@@ -10,38 +10,46 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.certificate.model.vo.CertificateDocumentVo;
 import lombok.Data;
 /**
-* 子证配置实体对象
-*
-* @author zxfei
-* @date 2024-07-27
-*/
+ * 子证配置实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-28
+ */
 @Data
 public class CertificateDocumentEntity extends CertificateDocumentVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点id
-    */
+     * 站点id
+     */
     private Long siteId;
     /**
-    * 部门id
-    */
+     * 部门id
+     */
     private Long deptId;
     /**
-    * 部门名称
-    */
+     * 部门名称
+     */
     private String deptName;
     /**
-    * 子证名称
-    */
+     * 子证名称
+     */
     private String documentName;
     /**
-    * 状态，0：禁用1：启用
-    */
+     * 状态，0：禁用1：启用
+     */
     private Integer status;
+    /**
+     * 照面内容模板
+     */
+    private String templateContent;
+    /**
+     * 内容表单
+     */
+    private String formContent;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -49,17 +57,19 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
         if (obj instanceof CertificateDocumentEntity) {
             CertificateDocumentEntity tmp = (CertificateDocumentEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.siteId = null;
-            this.deptId = null;
-            this.deptName = "";
-            this.documentName = "";
-            this.status = 1;
+        this.siteId = null;
+        this.deptId = null;
+        this.deptName = "";
+        this.documentName = "";
+        this.status = 1;
+        this.templateContent = "";
+        this.formContent = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/vo/CertificateChildVo.java

+package com.mortals.xhx.module.certificate.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 目录子证视图对象
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Data
+public class CertificateChildVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/CertificateChildService.java

+package com.mortals.xhx.module.certificate.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import com.mortals.xhx.module.certificate.dao.CertificateChildDao;
+/**
+* CertificateChildService
+*
+* 目录子证 service接口
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+public interface CertificateChildService extends ICRUDService<CertificateChildEntity,Long>{
+
+    CertificateChildDao getDao();
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateChildServiceImpl.java

+package com.mortals.xhx.module.certificate.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.certificate.dao.CertificateChildDao;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import com.mortals.xhx.module.certificate.service.CertificateChildService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* CertificateChildService
+* 目录子证 service实现
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Service("certificateChildService")
+@Slf4j
+public class CertificateChildServiceImpl extends AbstractCRUDServiceImpl<CertificateChildDao, CertificateChildEntity, Long> implements CertificateChildService {
+    
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateChildController.java

+package com.mortals.xhx.module.certificate.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import com.mortals.xhx.module.certificate.service.CertificateChildService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 目录子证
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@RestController
+@RequestMapping("certificate/child")
+public class CertificateChildController extends BaseCRUDJsonBodyMappingController<CertificateChildService,CertificateChildEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public CertificateChildController(){
+        super.setModuleDesc( "目录子证");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file