所有表增加站点id属性

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/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;
 /**
  * 证照目录实体对象
  *
  * @author zxfei
- * @date 2023-05-09
+ * @date 2023-05-14
  */
 
 public class CertificateCatalogEntity extends CertificateCatalogVo {
@@ -87,6 +92,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
      * 是否生成PDF，0：否1：是
      */
     private Integer isPdf;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -357,6 +366,20 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     public void setIsPdf(Integer isPdf){
         this.isPdf = isPdf;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -398,6 +421,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         sb.append(",deviceId:").append(getDeviceId());
         sb.append(",excelFile:").append(getExcelFile());
         sb.append(",isPdf:").append(getIsPdf());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -440,5 +464,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         this.excelFile = "";
 
         this.isPdf = 0;
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.certificate.model;
 
 import java.util.List;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 /**
  * 证照目录查询对象
  *
  * @author zxfei
- * @date 2023-05-09
+ * @date 2023-05-14
  */
 public class CertificateCatalogQuery extends CertificateCatalogEntity {
     /** 开始 序号，主键，自增长 */
@@ -250,6 +251,21 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
     /** 是否生成PDF，0：否1：是排除列表 */
     private List <Integer> isPdfNotList;
 
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CertificateCatalogQuery> orConditionList;
 
@@ -1614,6 +1630,87 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
     }
 
 
+    /**
+     * 获取 开始 站点id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2454,6 +2551,60 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
         return this;
     }
 
+    /**
+     * 设置  站点id
+     * @param siteId
+     */
+    public CertificateCatalogQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public CertificateCatalogQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public CertificateCatalogQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public CertificateCatalogQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public CertificateCatalogQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public CertificateCatalogQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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

@@ -7,11 +7,11 @@ 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;
@@ -36,6 +36,10 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
      * 证照类型，1：普通，2：正副本
      */
     private Integer classifyType;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -110,6 +114,20 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
     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;
+    }
 
 
 
@@ -137,6 +155,7 @@ 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();
     }
 
@@ -151,5 +170,7 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
         this.showFront = 0;
 
         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,11 +7,11 @@ 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;
@@ -24,6 +24,10 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
      * 行业名称
      */
     private String industryName;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -56,6 +60,20 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
     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;
+    }
 
 
 
@@ -80,6 +98,7 @@ 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();
     }
 
@@ -88,5 +107,7 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
         this.parentId = null;
 
         this.industryName = "";
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -7,11 +7,11 @@ 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-09
-*/
+ * 证照分类设备配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class DeviceClassifyEntity extends DeviceClassifyVo {
     private static final long serialVersionUID = 1L;
@@ -28,6 +28,10 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
      * 设备允许显示的分类
      */
     private String classifyIds;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -74,6 +78,20 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
     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;
+    }
 
 
 
@@ -99,6 +117,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
         sb.append(",deviceCode:").append(getDeviceCode());
         sb.append(",deviceName:").append(getDeviceName());
         sb.append(",classifyIds:").append(getClassifyIds());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -109,5 +128,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
         this.deviceName = "";
 
         this.classifyIds = "";
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
 import java.util.List;
 import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity;
 /**
-* 证照分类设备配置查询对象
-*
-* @author zxfei
-* @date 2023-05-09
-*/
+ * 证照分类设备配置查询对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 public class DeviceClassifyQuery extends DeviceClassifyEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -81,6 +81,21 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeviceClassifyQuery> orConditionList;
 
@@ -492,6 +507,87 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 站点id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -713,6 +809,60 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity {
     }
 
 
+    /**
+     * 设置  站点id
+     * @param siteId
+     */
+    public DeviceClassifyQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public DeviceClassifyQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public DeviceClassifyQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public DeviceClassifyQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public DeviceClassifyQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public DeviceClassifyQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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/web/CertificatePrintController.java

@@ -54,7 +54,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
     private DeviceClassifyService deviceClassifyService;
 
     @PostMapping({"setting/info"})
-    public Rest<Object> list() {
+    public Rest<Object> list(@RequestBody PrintSettingPdu settingPdu) {
         IUser user = this.getCurUser();
         if(user==null){
             throw new AppException("用户未登录");
@@ -67,6 +67,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
         try {
             CertificateClassifyEntity query = new CertificateClassifyEntity();
             query.setShowFront(YesNoEnum.YES.getValue());
+            query.setSiteId(settingPdu.getSiteId());
             List<CertificateClassifyEntity> showList = certificateClassifyService.find(query);
             query.setShowFront(YesNoEnum.NO.getValue());
             List<CertificateClassifyEntity> hideList = certificateClassifyService.find(query);
@@ -156,8 +157,10 @@ public class CertificatePrintController extends BaseJsonBodyController {
             PrintWaitQueueQuery query = new PrintWaitQueueQuery();
             query.setPrintStatus(YesNoEnum.NO.getValue());
             query.setPickerIDCardNo(pdu.getIdCard());
+            query.setSiteId(pdu.getSiteId());
             CertificateCatalogEntity catalogEntity = new CertificateCatalogEntity();
             catalogEntity.setClassifyId(pdu.getClassifyId());
+            catalogEntity.setSiteId(pdu.getSiteId());
             List<CertificateCatalogEntity> clist = certificateCatalogService.find(catalogEntity);
             List<Long> cIdList = new ArrayList<>();
             if(CollectionUtils.isNotEmpty(clist)){
@@ -194,6 +197,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
         try {
             CertificateClassifyQuery query = new CertificateClassifyQuery();
             query.setShowFront(YesNoEnum.YES.getValue());
+            query.setSiteId(deviceClassifyEntity.getSiteId());
             if(deviceClassifyEntity!=null && StringUtils.isNotEmpty(deviceClassifyEntity.getDeviceCode())){
                 List<Long> classifyIdList = deviceClassifyService.getClassifyByDevice(deviceClassifyEntity.getDeviceCode());
                 if(CollectionUtils.isNotEmpty(classifyIdList)){

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.vo.DeviceVo;
 /**
-* 证照柜设备实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照柜设备实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class DeviceEntity extends DeviceVo {
     private static final long serialVersionUID = 1L;
@@ -88,6 +88,10 @@ public class DeviceEntity extends DeviceVo {
      * 启停状态，0：停用,1：启用
      */
     private Integer enabled;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -344,6 +348,20 @@ public class DeviceEntity extends DeviceVo {
     public void setEnabled(Integer enabled){
         this.enabled = enabled;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -384,6 +402,7 @@ public class DeviceEntity extends DeviceVo {
         sb.append(",remark:").append(getRemark());
         sb.append(",status:").append(getStatus());
         sb.append(",enabled:").append(getEnabled());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -424,5 +443,7 @@ public class DeviceEntity extends DeviceVo {
         this.status = 0;
 
         this.enabled = 0;
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.vo.DeviceModuleVo;
 /**
-* 证照柜设备实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照柜设备实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class DeviceModuleEntity extends DeviceModuleVo {
     private static final long serialVersionUID = 1L;
@@ -40,6 +40,10 @@ public class DeviceModuleEntity extends DeviceModuleVo {
      * 纸盒
      */
     private String cartonType;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -128,6 +132,20 @@ public class DeviceModuleEntity extends DeviceModuleVo {
     public void setCartonType(String cartonType){
         this.cartonType = cartonType;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -156,6 +174,7 @@ public class DeviceModuleEntity extends DeviceModuleVo {
         sb.append(",productName:").append(getProductName());
         sb.append(",networkAddress:").append(getNetworkAddress());
         sb.append(",cartonType:").append(getCartonType());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -172,5 +191,7 @@ public class DeviceModuleEntity extends DeviceModuleVo {
         this.networkAddress = "";
 
         this.cartonType = "";
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.print.model.vo.PrintCatalogVo;
 /**
-* 证照目录打印配置实体对象
-*
-* @author zxfei
-* @date 2022-11-21
-*/
+ * 证照目录打印配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class PrintCatalogEntity extends PrintCatalogVo {
     private static final long serialVersionUID = 1L;
@@ -44,6 +44,10 @@ public class PrintCatalogEntity extends PrintCatalogVo {
      * 打印服务配置ID
      */
     private Long serviceId;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -146,6 +150,20 @@ public class PrintCatalogEntity extends PrintCatalogVo {
     public void setServiceId(Long serviceId){
         this.serviceId = serviceId;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -175,6 +193,7 @@ public class PrintCatalogEntity extends PrintCatalogVo {
         sb.append(",printerIp:").append(getPrinterIp());
         sb.append(",paperSource:").append(getPaperSource());
         sb.append(",serviceId:").append(getServiceId());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -193,5 +212,7 @@ public class PrintCatalogEntity extends PrintCatalogVo {
         this.paperSource = "";
 
         this.serviceId = null;
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.print.model.vo.PrintServiceVo;
 /**
-* 证照打印服务配置实体对象
-*
-* @author zxfei
-* @date 2022-11-21
-*/
+ * 证照打印服务配置实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class PrintServiceEntity extends PrintServiceVo {
     private static final long serialVersionUID = 1L;
@@ -24,6 +24,10 @@ public class PrintServiceEntity extends PrintServiceVo {
      * 服务访问地址
      */
     private String serviceUrl;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -56,6 +60,20 @@ public class PrintServiceEntity extends PrintServiceVo {
     public void setServiceUrl(String serviceUrl){
         this.serviceUrl = serviceUrl;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -80,6 +98,7 @@ public class PrintServiceEntity extends PrintServiceVo {
         StringBuilder sb = new StringBuilder("");
         sb.append(",serviceName:").append(getServiceName());
         sb.append(",serviceUrl:").append(getServiceUrl());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -88,5 +107,7 @@ public class PrintServiceEntity extends PrintServiceVo {
         this.serviceName = "";
 
         this.serviceUrl = "";
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
  * 证照申请实体对象
  *
  * @author zxfei
- * @date 2022-11-07
+ * @date 2023-05-14
  */
 
 public class ApplyLogEntity extends ApplyLogVo {
@@ -113,6 +113,10 @@ public class ApplyLogEntity extends ApplyLogVo {
      * 归档状态0否1是
      */
     private Integer recordStatus;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -453,6 +457,20 @@ public class ApplyLogEntity extends ApplyLogVo {
     public void setRecordStatus(Integer recordStatus){
         this.recordStatus = recordStatus;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -499,6 +517,7 @@ public class ApplyLogEntity extends ApplyLogVo {
         sb.append(",generateStatus:").append(getGenerateStatus());
         sb.append(",operType:").append(getOperType());
         sb.append(",recordStatus:").append(getRecordStatus());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -551,5 +570,7 @@ public class ApplyLogEntity extends ApplyLogVo {
         this.operType = 1;
 
         this.recordStatus = 0;
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.PrintLogVo;
 /**
-* 证照打印记录实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照打印记录实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class PrintLogEntity extends PrintLogVo {
     private static final long serialVersionUID = 1L;
@@ -58,7 +58,7 @@ public class PrintLogEntity extends PrintLogVo {
      */
     private String pickerIDCardNo;
     /**
-    * 打印状态1打印成功2失败
+     * 打印状态1打印成功0失败
      */
     private Integer printStatus;
     /**
@@ -73,6 +73,10 @@ public class PrintLogEntity extends PrintLogVo {
      * 打印设备
      */
     private Long deviceId;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -218,14 +222,14 @@ public class PrintLogEntity extends PrintLogVo {
         this.pickerIDCardNo = pickerIDCardNo;
     }
     /**
-    * 获取 打印状态1打印成功2失败
+     * 获取 打印状态1打印成功0失败
      * @return Integer
      */
     public Integer getPrintStatus(){
         return printStatus;
     }
     /**
-    * 设置 打印状态1打印成功2失败
+     * 设置 打印状态1打印成功0失败
      * @param printStatus
      */
     public void setPrintStatus(Integer printStatus){
@@ -273,6 +277,20 @@ public class PrintLogEntity extends PrintLogVo {
     public void setDeviceId(Long deviceId){
         this.deviceId = deviceId;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -309,6 +327,7 @@ public class PrintLogEntity extends PrintLogVo {
         sb.append(",printDate:").append(getPrintDate());
         sb.append(",statusRemark:").append(getStatusRemark());
         sb.append(",deviceId:").append(getDeviceId());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -341,5 +360,7 @@ public class PrintLogEntity extends PrintLogVo {
         this.statusRemark = "";
 
         this.deviceId = null;
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
 /**
-* 证照打印记录实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照打印记录实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-14
+ */
 
 public class PrintWaitQueueEntity extends PrintWaitQueueVo {
     private static final long serialVersionUID = 1L;
@@ -80,6 +80,10 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
      * 允许打印次数
      */
     private Integer total;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
@@ -308,6 +312,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
     public void setTotal(Integer total){
         this.total = total;
     }
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
 
 
 
@@ -346,6 +364,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         sb.append(",certificateUrl:").append(getCertificateUrl());
         sb.append(",printStatus:").append(getPrintStatus());
         sb.append(",total:").append(getTotal());
+        sb.append(",siteId:").append(getSiteId());
         return sb.toString();
     }
 
@@ -382,5 +401,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         this.printStatus = 0;
 
         this.total = 1;
+
+        this.siteId = null;
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java

@@ -166,6 +166,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
     private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){
         Date now = new Date();
         PrintLogEntity printLogEntity = new PrintLogEntity();
+        printLogEntity.setSiteId(waitQueueEntity.getSiteId());
         printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
         printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
         printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
@@ -188,6 +189,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
     private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
         RetainLogEntity retainLogEntity = new RetainLogEntity();
         Date now = new Date();
+        retainLogEntity.setSiteId(waitQueueEntity.getSiteId());
         retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
         retainLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
         retainLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
@@ -201,6 +203,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
         retainLogEntity.setCreateTime(now);
 
         PrintLogEntity printLogEntity = new PrintLogEntity();
+        printLogEntity.setSiteId(waitQueueEntity.getSiteId());
         printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
         printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
         printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());