所有表增加站点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,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

@@ -7,80 +7,98 @@ 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;
 
     /**
-    * 设备编码
-    */
+     * 设备编码
+     */
     private String deviceCode;
     /**
-    * 设备名称
-    */
+     * 设备名称
+     */
     private String deviceName;
     /**
-    * 设备允许显示的分类
-    */
+     * 设备允许显示的分类
+     */
     private String classifyIds;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
     public DeviceClassifyEntity(){}
     /**
-    * 获取 设备编码
-    * @return String
-    */
+     * 获取 设备编码
+     * @return String
+     */
     public String getDeviceCode(){
         return deviceCode;
     }
     /**
-    * 设置 设备编码
-    * @param deviceCode
-    */
+     * 设置 设备编码
+     * @param deviceCode
+     */
     public void setDeviceCode(String deviceCode){
         this.deviceCode = deviceCode;
     }
     /**
-    * 获取 设备名称
-    * @return String
-    */
+     * 获取 设备名称
+     * @return String
+     */
     public String getDeviceName(){
         return deviceName;
     }
     /**
-    * 设置 设备名称
-    * @param deviceName
-    */
+     * 设置 设备名称
+     * @param deviceName
+     */
     public void setDeviceName(String deviceName){
         this.deviceName = deviceName;
     }
     /**
-    * 获取 设备允许显示的分类
-    * @return String
-    */
+     * 获取 设备允许显示的分类
+     * @return String
+     */
     public String getClassifyIds(){
         return classifyIds;
     }
     /**
-    * 设置 设备允许显示的分类
-    * @param 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();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -88,7 +106,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
         if (obj instanceof DeviceClassifyEntity) {
             DeviceClassifyEntity tmp = (DeviceClassifyEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -99,15 +117,18 @@ 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();
     }
 
     public void initAttrValue(){
 
-            this.deviceCode = "";
+        this.deviceCode = "";
+
+        this.deviceName = "";
 
-            this.deviceName = "";
+        this.classifyIds = "";
 
-            this.classifyIds = "";
+        this.siteId = null;
     }
 }
\ No newline at end of file

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/DeviceModuleEntity.java

@@ -7,134 +7,152 @@ 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;
 
     /**
-    * 设备Id
-    */
+     * 设备Id
+     */
     private Long deviceId;
     /**
-    * 设备名称
-    */
+     * 设备名称
+     */
     private String deviceName;
     /**
-    * 模块名称
-    */
+     * 模块名称
+     */
     private String moduleName;
     /**
-    * 产品名称
-    */
+     * 产品名称
+     */
     private String productName;
     /**
-    * 网络地址
-    */
+     * 网络地址
+     */
     private String networkAddress;
     /**
-    * 纸盒
-    */
+     * 纸盒
+     */
     private String cartonType;
+    /**
+     * 站点id
+     */
+    private Long siteId;
 
 
 
     public DeviceModuleEntity(){}
     /**
-    * 获取 设备Id
-    * @return Long
-    */
+     * 获取 设备Id
+     * @return Long
+     */
     public Long getDeviceId(){
         return deviceId;
     }
     /**
-    * 设置 设备Id
-    * @param deviceId
-    */
+     * 设置 设备Id
+     * @param deviceId
+     */
     public void setDeviceId(Long deviceId){
         this.deviceId = deviceId;
     }
     /**
-    * 获取 设备名称
-    * @return String
-    */
+     * 获取 设备名称
+     * @return String
+     */
     public String getDeviceName(){
         return deviceName;
     }
     /**
-    * 设置 设备名称
-    * @param deviceName
-    */
+     * 设置 设备名称
+     * @param deviceName
+     */
     public void setDeviceName(String deviceName){
         this.deviceName = deviceName;
     }
     /**
-    * 获取 模块名称
-    * @return String
-    */
+     * 获取 模块名称
+     * @return String
+     */
     public String getModuleName(){
         return moduleName;
     }
     /**
-    * 设置 模块名称
-    * @param moduleName
-    */
+     * 设置 模块名称
+     * @param moduleName
+     */
     public void setModuleName(String moduleName){
         this.moduleName = moduleName;
     }
     /**
-    * 获取 产品名称
-    * @return String
-    */
+     * 获取 产品名称
+     * @return String
+     */
     public String getProductName(){
         return productName;
     }
     /**
-    * 设置 产品名称
-    * @param productName
-    */
+     * 设置 产品名称
+     * @param productName
+     */
     public void setProductName(String productName){
         this.productName = productName;
     }
     /**
-    * 获取 网络地址
-    * @return String
-    */
+     * 获取 网络地址
+     * @return String
+     */
     public String getNetworkAddress(){
         return networkAddress;
     }
     /**
-    * 设置 网络地址
-    * @param networkAddress
-    */
+     * 设置 网络地址
+     * @param networkAddress
+     */
     public void setNetworkAddress(String networkAddress){
         this.networkAddress = networkAddress;
     }
     /**
-    * 获取 纸盒
-    * @return String
-    */
+     * 获取 纸盒
+     * @return String
+     */
     public String getCartonType(){
         return cartonType;
     }
     /**
-    * 设置 纸盒
-    * @param cartonType
-    */
+     * 设置 纸盒
+     * @param cartonType
+     */
     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;
+    }
 
 
 
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -142,7 +160,7 @@ public class DeviceModuleEntity extends DeviceModuleVo {
         if (obj instanceof DeviceModuleEntity) {
             DeviceModuleEntity tmp = (DeviceModuleEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -156,21 +174,24 @@ 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();
     }
 
     public void initAttrValue(){
 
-            this.deviceId = null;
+        this.deviceId = null;
+
+        this.deviceName = "";
 
-            this.deviceName = "";
+        this.moduleName = "";
 
-            this.moduleName = "";
+        this.productName = "";
 
-            this.productName = "";
+        this.networkAddress = "";
 
-            this.networkAddress = "";
+        this.cartonType = "";
 
-            this.cartonType = "";
+        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/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());