同步宜宾版本功能，增加食品经营许可证同时生成正副本

certificate-manager/src/main/java/com/mortals/xhx/module/api/CatalogVO.java

@@ -17,6 +17,14 @@ public class CatalogVO {
      * 目录编号
      */
     private String catalogCode;
+    /**
+     * 证照目录模板ID
+     */
+    private Long templateId;
+    /**
+     * 证照模板名称
+     */
+    private String templateName;
     /**
      * 证照模板表单内容
      */

certificate-manager/src/main/java/com/mortals/xhx/module/api/CertificateApi.java

@@ -9,10 +9,13 @@ import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 import com.mortals.xhx.module.certificate.model.CertificateCatalogQuery;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateQuery;
 import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
 import com.mortals.xhx.module.certificate.pdu.PrintListPdu;
 import com.mortals.xhx.module.certificate.pdu.PrintLogPdu;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
+import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
 import com.mortals.xhx.module.print.model.PrintCatalogEntity;
 import com.mortals.xhx.module.print.model.PrintCatalogQuery;
 import com.mortals.xhx.module.print.model.PrintServiceEntity;
@@ -45,6 +48,8 @@ public class CertificateApi extends BaseJsonBodyController {
     private PrintCatalogService printCatalogService;
     @Autowired
     private PrintWaitQueueService printWaitQueueService;
+    @Autowired
+    private CertificateCatalogTemplateService certificateCatalogTemplateService;
 
     @PostMapping({"catalog/list"})
     @UnAuth
@@ -60,17 +65,27 @@ public class CertificateApi extends BaseJsonBodyController {
             if(CollectionUtils.isNotEmpty(list)){
                 List<CatalogVO> catalogList = new ArrayList<>();
                 for(CertificateCatalogEntity entity:list){
-                    CatalogVO catalogVO = new CatalogVO(entity.getId(),entity.getCatalogName(),entity.getCatalogCode());
-                    JSONObject formContent = JSONObject.parseObject(entity.getFormContent());
-                    JSONArray formList = formContent.getJSONArray("list");
-                    JSONObject json = new JSONObject();
-                    for (int j = 0; j < formList.size(); j++) {
-                        JSONObject jsonObject = formList.getJSONObject(j);
-                        json.put(jsonObject.getString("id"),"");
+
+                    List<CertificateCatalogTemplateEntity> templateEntityList = certificateCatalogTemplateService.find(new CertificateCatalogTemplateQuery().catalogId(entity.getId()));
+                    if(CollectionUtils.isNotEmpty(templateEntityList)){
+
+                        for (CertificateCatalogTemplateEntity item:templateEntityList){
+                            CatalogVO catalogVO = new CatalogVO(entity.getId(),entity.getCatalogName(),entity.getCatalogCode());
+                            catalogVO.setTemplateId(item.getId());
+                            catalogVO.setTemplateName(item.getTemplateName());
+                            JSONObject formContent = JSONObject.parseObject(item.getFormContent());
+                            JSONArray formList = formContent.getJSONArray("list");
+                            JSONObject json = new JSONObject();
+                            for (int j = 0; j < formList.size(); j++) {
+                                JSONObject jsonObject = formList.getJSONObject(j);
+                                json.put(jsonObject.getString("id"),"");
+                            }
+                            catalogVO.setFormContent(json.toJSONString());
+
+                            catalogList.add(catalogVO);
+                        }
                     }
-                    catalogVO.setFormContent(json.toJSONString());
 
-                    catalogList.add(catalogVO);
                 }
                 model.put("message_info", "获取证照目录成功");
                 ret.put("data", catalogList);
@@ -207,11 +222,13 @@ public class CertificateApi extends BaseJsonBodyController {
             if(CollectionUtils.isNotEmpty(list)){
                 List<PrintWaitQueueVO> waitQueueVOList = new ArrayList<>();
                 for(PrintWaitQueueEntity printWaitQueueEntity:list){
-                    PrintCatalogEntity printCatalogEntity = printCatalogService.getPrintCatalogByService(pdu.getServiceId(),printWaitQueueEntity.getCatalogId());
+                    PrintCatalogEntity printCatalogEntity = printCatalogService.getPrintCatalogByService(pdu.getServiceId(),printWaitQueueEntity.getCatalogId(),printWaitQueueEntity.getTemplateId());
                     PrintWaitQueueVO printWaitQueueVO = new PrintWaitQueueVO();
                     printWaitQueueVO.setCatalogId(printWaitQueueEntity.getCatalogId());
                     printWaitQueueVO.setCatalogCode(printWaitQueueEntity.getCatalogCode());
                     printWaitQueueVO.setCatalogName(printWaitQueueEntity.getCatalogName());
+                    printWaitQueueVO.setTemplateId(printWaitQueueEntity.getTemplateId());
+                    printWaitQueueVO.setTemplateName(printWaitQueueEntity.getTemplateName());
                     printWaitQueueVO.setWaitQueueId(printWaitQueueEntity.getId());
                     printWaitQueueVO.setCertificateCode(printWaitQueueEntity.getCertificateCode());
                     printWaitQueueVO.setCertificateName(printWaitQueueEntity.getCertificateName());
@@ -226,6 +243,7 @@ public class CertificateApi extends BaseJsonBodyController {
                     printWaitQueueVO.setPrinterIp(printCatalogEntity.getPrinterIp());
                     printWaitQueueVO.setPrinterName(printCatalogEntity.getPrinterName());
                     printWaitQueueVO.setPaperSource(printCatalogEntity.getPaperSource());
+                    printWaitQueueVO.setMobile(printWaitQueueEntity.getMobile());
                     waitQueueVOList.add(printWaitQueueVO);
                 }
                 model.put("data", waitQueueVOList);

certificate-manager/src/main/java/com/mortals/xhx/module/api/PrintWaitQueueVO.java

@@ -18,6 +18,14 @@ public class PrintWaitQueueVO {
      * 目录名称
      */
     private String catalogName;
+    /**
+     * 证照目录模板ID
+     */
+    private Long templateId;
+    /**
+     * 证照模板名称
+     */
+    private String templateName;
     /**
      * 证照名称
      */
@@ -70,4 +78,9 @@ public class PrintWaitQueueVO {
      * 打印机纸盒
      */
     private String paperSource;
+
+    /**
+     * 手机号码
+     */
+    private String mobile;
 }

certificate-manager/src/main/java/com/mortals/xhx/module/business/model/BusinessLicenseEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.business.model.vo.BusinessLicenseVo;
  * 营业执照信息实体对象
  *
  * @author zxfei
- * @date 2022-12-13
+ * @date 2023-05-14
  */
 
 public class BusinessLicenseEntity extends BusinessLicenseVo {
@@ -92,6 +92,10 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
      * 处理状态0未处理1已处理
      */
     private Integer status;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -362,6 +366,20 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
     public void setStatus(Integer status){
         this.status = status;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -403,6 +421,7 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
         sb.append(",dyZb:").append(getDyZb());
         sb.append(",dyFb:").append(getDyFb());
         sb.append(",status:").append(getStatus());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -440,10 +459,12 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
 
         this.EndDate = "";
 
-        this.dyZb = 2;
+        this.dyZb = null;
+
+        this.dyFb = null;
 
-        this.dyFb = 2;
+        this.status = null;
 
-        this.status = 0;
+        this.siteId = null;
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessLicenseController.java

@@ -61,7 +61,7 @@ public class BusinessLicenseController extends BaseCRUDJsonBodyMappingController
         String busiDesc = "API接口存入营业执照信息";
         int code = 200;
         try {
-            service.apiSave(businessLicense);
+            service.doConversion(businessLicense);
             model.put("message_info", "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         }catch (Exception e){

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

+package com.mortals.xhx.module.certificate.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
+import java.util.List;
+/**
+* 证照目录模板Dao
+* 证照目录模板 DAO接口
+*
+* @author zxfei
+* @date 2023-05-23
+*/
+
+public interface  CertificateCatalogTemplateDao extends ICRUDDao<CertificateCatalogTemplateEntity,Long>{
+
+
+}

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

+package com.mortals.xhx.module.certificate.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity;
+import java.util.List;
+/**
+* 证照分类设备配置Dao
+* 证照分类设备配置 DAO接口
+*
+* @author zxfei
+* @date 2023-05-09
+*/
+
+public interface  DeviceClassifyDao extends ICRUDDao<DeviceClassifyEntity,Long>{
+
+
+}

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

+package com.mortals.xhx.module.certificate.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.certificate.dao.CertificateCatalogTemplateDao;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 证照目录模板DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-05-23
+*/
+@Repository("certificateCatalogTemplateDao")
+public class CertificateCatalogTemplateDaoImpl extends BaseCRUDDaoMybatis<CertificateCatalogTemplateEntity,Long> implements CertificateCatalogTemplateDao {
+
+
+
+}

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

+package com.mortals.xhx.module.certificate.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.certificate.dao.DeviceClassifyDao;
+import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 证照分类设备配置DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-05-09
+*/
+@Repository("deviceClassifyDao")
+public class DeviceClassifyDaoImpl extends BaseCRUDDaoMybatis<DeviceClassifyEntity,Long> implements DeviceClassifyDao {
+
+
+
+}

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

 package com.mortals.xhx.module.certificate.model;
-
 import java.util.List;
 import java.util.ArrayList;
 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.CertificateCatalogVo;
+import lombok.Data;
 /**
  * 证照目录实体对象
  *
  * @author zxfei
- * @date 2022-11-08
+ * @date 2023-05-24
  */
-
+@Data
 public class CertificateCatalogEntity extends CertificateCatalogVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 站点id
+     */
+    private Long siteId;
     /**
      * 目录名称
      */
@@ -48,313 +52,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
      * 是否需要年检，0：否1：是
      */
     private Integer inspect;
-    /**
-     * 证照模板文件名称
-     */
-    private String templateName;
-    /**
-     * 证照模板文件地址
-     */
-    private String templateUrl;
-    /**
-     * 证照模板表单内容
-     */
-    private String formContent;
-    /**
-     * 证照示例图地址
-     */
-    private String exampleUrl;
     /**
      * 证照状态，0：禁用1：启用
      */
     private Integer status;
-    /**
-     * 打印机名称
-     */
-    private String printerName;
-    /**
-     * 打印机网络地址
-     */
-    private String printerIp;
-    /**
-     * 打印机纸盒
-     */
-    private String paperSource;
-    /**
-     * 打印设备Id
-     */
-    private Long deviceId;
-    /**
-     * 批量导入模板文件地址
-     */
-    private String excelFile;
-
-    private Integer isPdf;
-
-
-
-    public CertificateCatalogEntity(){}
-    /**
-     * 获取 目录名称
-     * @return String
-     */
-    public String getCatalogName(){
-        return catalogName;
-    }
-    /**
-     * 设置 目录名称
-     * @param catalogName
-     */
-    public void setCatalogName(String catalogName){
-        this.catalogName = catalogName;
-    }
-    /**
-     * 获取 目录编号
-     * @return String
-     */
-    public String getCatalogCode(){
-        return catalogCode;
-    }
-    /**
-     * 设置 目录编号
-     * @param catalogCode
-     */
-    public void setCatalogCode(String catalogCode){
-        this.catalogCode = catalogCode;
-    }
-    /**
-     * 获取 持有者类型，1：自然人；2：法人；3：自然人，法人
-     * @return Integer
-     */
-    public Integer getHolderType(){
-        return holderType;
-    }
-    /**
-     * 设置 持有者类型，1：自然人；2：法人；3：自然人，法人
-     * @param holderType
-     */
-    public void setHolderType(Integer holderType){
-        this.holderType = holderType;
-    }
-    /**
-     * 获取 所属行业
-     * @return Long
-     */
-    public Long getIndustryId(){
-        return industryId;
-    }
-    /**
-     * 设置 所属行业
-     * @param industryId
-     */
-    public void setIndustryId(Long industryId){
-        this.industryId = industryId;
-    }
-    /**
-     * 获取 所属分类
-     * @return Long
-     */
-    public Long getClassifyId(){
-        return classifyId;
-    }
-    /**
-     * 设置 所属分类
-     * @param classifyId
-     */
-    public void setClassifyId(Long classifyId){
-        this.classifyId = classifyId;
-    }
-    /**
-     * 获取 横向尺寸(单位mm)
-     * @return Integer
-     */
-    public Integer getTransverse(){
-        return transverse;
-    }
-    /**
-     * 设置 横向尺寸(单位mm)
-     * @param transverse
-     */
-    public void setTransverse(Integer transverse){
-        this.transverse = transverse;
-    }
-    /**
-     * 获取 纵向尺寸(单位mm)
-     * @return Integer
-     */
-    public Integer getPortrait(){
-        return portrait;
-    }
-    /**
-     * 设置 纵向尺寸(单位mm)
-     * @param portrait
-     */
-    public void setPortrait(Integer portrait){
-        this.portrait = portrait;
-    }
-    /**
-     * 获取 是否需要年检，0：否1：是
-     * @return Integer
-     */
-    public Integer getInspect(){
-        return inspect;
-    }
-    /**
-     * 设置 是否需要年检，0：否1：是
-     * @param inspect
-     */
-    public void setInspect(Integer inspect){
-        this.inspect = inspect;
-    }
-    /**
-     * 获取 证照模板文件名称
-     * @return String
-     */
-    public String getTemplateName(){
-        return templateName;
-    }
-    /**
-     * 设置 证照模板文件名称
-     * @param templateName
-     */
-    public void setTemplateName(String templateName){
-        this.templateName = templateName;
-    }
-    /**
-     * 获取 证照模板文件地址
-     * @return String
-     */
-    public String getTemplateUrl(){
-        return templateUrl;
-    }
-    /**
-     * 设置 证照模板文件地址
-     * @param templateUrl
-     */
-    public void setTemplateUrl(String templateUrl){
-        this.templateUrl = templateUrl;
-    }
-    /**
-     * 获取 证照模板表单内容
-     * @return String
-     */
-    public String getFormContent(){
-        return formContent;
-    }
-    /**
-     * 设置 证照模板表单内容
-     * @param formContent
-     */
-    public void setFormContent(String formContent){
-        this.formContent = formContent;
-    }
-    /**
-     * 获取 证照示例图地址
-     * @return String
-     */
-    public String getExampleUrl(){
-        return exampleUrl;
-    }
-    /**
-     * 设置 证照示例图地址
-     * @param exampleUrl
-     */
-    public void setExampleUrl(String exampleUrl){
-        this.exampleUrl = exampleUrl;
-    }
-    /**
-     * 获取 证照状态，0：禁用1：启用
-     * @return Integer
-     */
-    public Integer getStatus(){
-        return status;
-    }
-    /**
-     * 设置 证照状态，0：禁用1：启用
-     * @param status
-     */
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-    /**
-     * 获取 打印机名称
-     * @return String
-     */
-    public String getPrinterName(){
-        return printerName;
-    }
-    /**
-     * 设置 打印机名称
-     * @param printerName
-     */
-    public void setPrinterName(String printerName){
-        this.printerName = printerName;
-    }
-    /**
-     * 获取 打印机网络地址
-     * @return String
-     */
-    public String getPrinterIp(){
-        return printerIp;
-    }
-    /**
-     * 设置 打印机网络地址
-     * @param printerIp
-     */
-    public void setPrinterIp(String printerIp){
-        this.printerIp = printerIp;
-    }
-    /**
-     * 获取 打印机纸盒
-     * @return String
-     */
-    public String getPaperSource(){
-        return paperSource;
-    }
-    /**
-     * 设置 打印机纸盒
-     * @param paperSource
-     */
-    public void setPaperSource(String paperSource){
-        this.paperSource = paperSource;
-    }
-    /**
-     * 获取 打印设备Id
-     * @return Long
-     */
-    public Long getDeviceId(){
-        return deviceId;
-    }
-    /**
-     * 设置 打印设备Id
-     * @param deviceId
-     */
-    public void setDeviceId(Long deviceId){
-        this.deviceId = deviceId;
-    }
-    /**
-     * 获取 批量导入模板文件地址
-     * @return String
-     */
-    public String getExcelFile(){
-        return excelFile;
-    }
-    /**
-     * 设置 批量导入模板文件地址
-     * @param excelFile
-     */
-    public void setExcelFile(String excelFile){
-        this.excelFile = excelFile;
-    }
-
-    public Integer getIsPdf() {
-        return isPdf;
-    }
-
-    public void setIsPdf(Integer isPdf) {
-        this.isPdf = isPdf;
-    }
-
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -371,40 +72,19 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",catalogName:").append(getCatalogName());
-        sb.append(",catalogCode:").append(getCatalogCode());
-        sb.append(",holderType:").append(getHolderType());
-        sb.append(",industryId:").append(getIndustryId());
-        sb.append(",classifyId:").append(getClassifyId());
-        sb.append(",transverse:").append(getTransverse());
-        sb.append(",portrait:").append(getPortrait());
-        sb.append(",inspect:").append(getInspect());
-        sb.append(",templateName:").append(getTemplateName());
-        sb.append(",templateUrl:").append(getTemplateUrl());
-        sb.append(",formContent:").append(getFormContent());
-        sb.append(",exampleUrl:").append(getExampleUrl());
-        sb.append(",status:").append(getStatus());
-        sb.append(",printerName:").append(getPrinterName());
-        sb.append(",printerIp:").append(getPrinterIp());
-        sb.append(",paperSource:").append(getPaperSource());
-        sb.append(",deviceId:").append(getDeviceId());
-        sb.append(",excelFile:").append(getExcelFile());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
 
+        this.siteId = -1L;
+
         this.catalogName = "";
 
         this.catalogCode = "";
 
         this.holderType = 1;
 
-        this.industryId = null;
+        this.industryId = -1L;
 
-        this.classifyId = null;
+        this.classifyId = -1L;
 
         this.transverse = 0;
 
@@ -412,24 +92,6 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
 
         this.inspect = 0;
 
-        this.templateName = "";
-
-        this.templateUrl = "";
-
-        this.formContent = "";
-
-        this.exampleUrl = "";
-
         this.status = 1;
-
-        this.printerName = "";
-
-        this.printerIp = "";
-
-        this.paperSource = "";
-
-        this.deviceId = null;
-
-        this.excelFile = "";
     }
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.certificate.model;
+import java.util.List;
+import java.util.ArrayList;
+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.CertificateCatalogTemplateVo;
+import lombok.Data;
+/**
+ * 证照目录模板实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-24
+ */
+@Data
+public class CertificateCatalogTemplateEntity extends CertificateCatalogTemplateVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 站点id
+     */
+    private Long siteId;
+    /**
+     * 目录id
+     */
+    private Long catalogId;
+    /**
+     * 证照模板名称
+     */
+    private String templateName;
+    /**
+     * 模板类型1普通2正本3副本
+     */
+    private Integer templateType;
+    /**
+     * 证照模板文件名称
+     */
+    private String templateFileName;
+    /**
+     * 证照模板文件地址
+     */
+    private String templateFileUrl;
+    /**
+     * 证照模板表单内容
+     */
+    private String formContent;
+    /**
+     * 证照示例图地址
+     */
+    private String exampleFileUrl;
+    /**
+     * 证照状态，0：禁用1：启用
+     */
+    private Integer status;
+    /**
+     * 批量导入模板文件地址
+     */
+    private String excelFile;
+    /**
+     * 是否生成PDF，0：否1：是
+     */
+    private Integer isPdf;
+    /**
+     * 打印设备Id
+     */
+    private Long deviceId;
+    /**
+     * 打印机名称
+     */
+    private String printerName;
+    /**
+     * 打印机网络地址
+     */
+    private String printerIp;
+    /**
+     * 打印机纸盒
+     */
+    private String paperSource;
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof CertificateCatalogTemplateEntity) {
+            CertificateCatalogTemplateEntity tmp = (CertificateCatalogTemplateEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+        this.siteId = -1L;
+
+        this.catalogId = -1L;
+
+        this.templateName = "";
+
+        this.templateType = 0;
+
+        this.templateFileName = "";
+
+        this.templateFileUrl = "";
+
+        this.formContent = "";
+
+        this.exampleFileUrl = "";
+
+        this.status = 1;
+
+        this.excelFile = "";
+
+        this.isPdf = 0;
+
+        this.deviceId = -1L;
+
+        this.printerName = "";
+
+        this.printerIp = "";
+
+        this.paperSource = "";
+    }
+}
\ No newline at end of file

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

@@ -7,116 +7,134 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo;
 /**
-* 证照分类实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照分类实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class CertificateClassifyEntity extends CertificateClassifyVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 分类名称
-    */
+     * 分类名称
+     */
     private String classifyName;
     /**
-    * 排序号
-    */
+     * 排序号
+     */
     private Integer sort;
     /**
-    * 打印次数
-    */
+     * 打印次数
+     */
     private Integer total;
     /**
-    * 是否首页展示0：否1是
-    */
+     * 是否首页展示0：否1是
+     */
     private Integer showFront;
     /**
-    * 证照类型，1：普通，2：正副本
-    */
+     * 证照类型，1：普通，2：正副本
+     */
     private Integer classifyType;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
     public CertificateClassifyEntity(){}
     /**
-    * 获取 分类名称
-    * @return String
-    */
+     * 获取 分类名称
+     * @return String
+     */
     public String getClassifyName(){
         return classifyName;
     }
     /**
-    * 设置 分类名称
-    * @param classifyName
-    */
+     * 设置 分类名称
+     * @param classifyName
+     */
     public void setClassifyName(String classifyName){
         this.classifyName = classifyName;
     }
     /**
-    * 获取 排序号
-    * @return Integer
-    */
+     * 获取 排序号
+     * @return Integer
+     */
     public Integer getSort(){
         return sort;
     }
     /**
-    * 设置 排序号
-    * @param sort
-    */
+     * 设置 排序号
+     * @param sort
+     */
     public void setSort(Integer sort){
         this.sort = sort;
     }
     /**
-    * 获取 打印次数
-    * @return Integer
-    */
+     * 获取 打印次数
+     * @return Integer
+     */
     public Integer getTotal(){
         return total;
     }
     /**
-    * 设置 打印次数
-    * @param total
-    */
+     * 设置 打印次数
+     * @param total
+     */
     public void setTotal(Integer total){
         this.total = total;
     }
     /**
-    * 获取 是否首页展示0：否1是
-    * @return Integer
-    */
+     * 获取 是否首页展示0：否1是
+     * @return Integer
+     */
     public Integer getShowFront(){
         return showFront;
     }
     /**
-    * 设置 是否首页展示0：否1是
-    * @param showFront
-    */
+     * 设置 是否首页展示0：否1是
+     * @param showFront
+     */
     public void setShowFront(Integer showFront){
         this.showFront = showFront;
     }
     /**
-    * 获取 证照类型，1：普通，2：正副本
-    * @return Integer
-    */
+     * 获取 证照类型，1：普通，2：正副本
+     * @return Integer
+     */
     public Integer getClassifyType(){
         return classifyType;
     }
     /**
-    * 设置 证照类型，1：普通，2：正副本
-    * @param classifyType
-    */
+     * 设置 证照类型，1：普通，2：正副本
+     * @param classifyType
+     */
     public void setClassifyType(Integer classifyType){
         this.classifyType = classifyType;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -124,7 +142,7 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
         if (obj instanceof CertificateClassifyEntity) {
             CertificateClassifyEntity tmp = (CertificateClassifyEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -137,19 +155,22 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
         sb.append(",total:").append(getTotal());
         sb.append(",showFront:").append(getShowFront());
         sb.append(",classifyType:").append(getClassifyType());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-            this.classifyName = "";
+        this.classifyName = "";
+
+        this.sort = 0;
 
-            this.sort = 0;
+        this.total = 0;
 
-            this.total = 0;
+        this.showFront = 0;
 
-            this.showFront = 0;
+        this.classifyType = 1;
 
-            this.classifyType = 1;
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -7,62 +7,80 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo;
 /**
-* 行业目录实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 行业目录实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class CertificateIndustryEntity extends CertificateIndustryVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 父级id
-    */
+     * 父级id
+     */
     private Long parentId;
     /**
-    * 行业名称
-    */
+     * 行业名称
+     */
     private String industryName;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
     public CertificateIndustryEntity(){}
     /**
-    * 获取 父级id
-    * @return Long
-    */
+     * 获取 父级id
+     * @return Long
+     */
     public Long getParentId(){
         return parentId;
     }
     /**
-    * 设置 父级id
-    * @param parentId
-    */
+     * 设置 父级id
+     * @param parentId
+     */
     public void setParentId(Long parentId){
         this.parentId = parentId;
     }
     /**
-    * 获取 行业名称
-    * @return String
-    */
+     * 获取 行业名称
+     * @return String
+     */
     public String getIndustryName(){
         return industryName;
     }
     /**
-    * 设置 行业名称
-    * @param industryName
-    */
+     * 设置 行业名称
+     * @param industryName
+     */
     public void setIndustryName(String industryName){
         this.industryName = industryName;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -70,7 +88,7 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
         if (obj instanceof CertificateIndustryEntity) {
             CertificateIndustryEntity tmp = (CertificateIndustryEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -80,13 +98,16 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
         StringBuilder sb = new StringBuilder("");
         sb.append(",parentId:").append(getParentId());
         sb.append(",industryName:").append(getIndustryName());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-            this.parentId = null;
+        this.parentId = null;
+
+        this.industryName = "";
 
-            this.industryName = "";
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.certificate.model;
+
+import java.util.List;
+import java.util.ArrayList;
+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.DeviceClassifyVo;
+/**
+ * 证照分类设备配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
+
+public class DeviceClassifyEntity extends DeviceClassifyVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 设备允许显示的分类
+     */
+    private String classifyIds;
+    /**
+     * 站点id
+     */
+    private Long siteId;
+
+
+
+    public DeviceClassifyEntity(){}
+    /**
+     * 获取 设备编码
+     * @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;
+    }
+    /**
+     * 获取 设备允许显示的分类
+     * @return String
+     */
+    public String getClassifyIds(){
+        return classifyIds;
+    }
+    /**
+     * 设置 设备允许显示的分类
+     * @param classifyIds
+     */
+    public void setClassifyIds(String classifyIds){
+        this.classifyIds = classifyIds;
+    }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DeviceClassifyEntity) {
+            DeviceClassifyEntity tmp = (DeviceClassifyEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceCode:").append(getDeviceCode());
+        sb.append(",deviceName:").append(getDeviceName());
+        sb.append(",classifyIds:").append(getClassifyIds());
+        sb.append(",siteId:").append(getSiteId());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.deviceCode = "";
+
+        this.deviceName = "";
+
+        this.classifyIds = "";
+
+        this.siteId = null;
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.certificate.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
+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 2023-05-23
+*/
+@Data
+public class CertificateCatalogTemplateVo extends BaseEntityLong {
+
+
+
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.certificate.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 证照分类设备配置视图对象
+*
+* @author zxfei
+* @date 2023-05-09
+*/
+@Data
+public class DeviceClassifyVo extends BaseEntityLong {
+
+    private String classifyNames;
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/ApplyLogPdu.java

@@ -10,6 +10,8 @@ public class ApplyLogPdu {
      * 证照目录ID
      */
     private Long catalogId;
+    /** 目录模板ID **/
+    private Long templateId;
     /**
      * 证件编号
      */
@@ -58,4 +60,6 @@ public class ApplyLogPdu {
      * 证照模板正本表单内容
      */
     private String formContent;
+    /** 站点id */
+    private Long siteId;
 }

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintListPdu.java

@@ -11,4 +11,6 @@ public class PrintListPdu {
     /** 打印服务ID */
     private Long serviceId;
 
+    private Long siteId;
+
 }

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintSettingPdu.java

@@ -12,4 +12,6 @@ public class PrintSettingPdu {
     private List<Long> hideList;
     /** 允许打印最高次数 */
     private Integer printMax;
+
+    private Long siteId;
 }

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

+package com.mortals.xhx.module.certificate.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
+import com.mortals.xhx.module.certificate.dao.CertificateCatalogTemplateDao;
+/**
+* CertificateCatalogTemplateService
+*
+* 证照目录模板 service接口
+*
+* @author zxfei
+* @date 2023-05-23
+*/
+public interface CertificateCatalogTemplateService extends ICRUDService<CertificateCatalogTemplateEntity,Long>{
+
+    CertificateCatalogTemplateDao getDao();
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.certificate.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity;
+
+import java.util.List;
+
+/**
+* DeviceClassifyService
+*
+* 证照分类设备配置 service接口
+*
+* @author zxfei
+* @date 2023-05-09
+*/
+public interface DeviceClassifyService extends ICRUDService<DeviceClassifyEntity,Long>{
+
+    /**
+     * 获取设备允许打印目录分类
+     * @param deviceNum
+     * @return
+     */
+    List<Long> getClassifyByDevice(String deviceNum);
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/DeviceClassifyController.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.DeviceClassifyEntity;
+import com.mortals.xhx.module.certificate.service.DeviceClassifyService;
+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.*;
+/**
+*
+* 证照分类设备配置
+*
+* @author zxfei
+* @date 2023-05-09
+*/
+@RestController
+@RequestMapping("device/classify")
+public class DeviceClassifyController extends BaseCRUDJsonBodyMappingController<DeviceClassifyService,DeviceClassifyEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DeviceClassifyController(){
+        super.setModuleDesc( "证照分类设备配置");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file