产品表添加所属站点

device-manager/db/add.sql

@@ -55,10 +55,17 @@ ADD COLUMN  `productName` varchar(256)  DEFAULT ''    COMMENT '产品名称'
 2023-08-17
 -- ----------------------------
 
-ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteId` bigint(20)      COMMENT '站点Id，来源基础服务平台';
+ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteId` bigint(20)  default '1'   COMMENT '站点Id，来源基础服务平台';
 ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteCode` varchar(256)  default ''    COMMENT '站点编号，来源基础服务平台';
 ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN   `siteName` varchar(256)  default ''    COMMENT '站点名称';
 
 ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteId` bigint(20)      COMMENT '站点Id，来源基础服务平台';
 ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteCode` varchar(256)  default ''    COMMENT '站点编号，来源基础服务平台';
 ALTER TABLE mortals_xhx_product_version ADD COLUMN   `siteName` varchar(256)  default ''    COMMENT '站点名称';
+
+-- ----------------------------
+2023-08-21
+-- ----------------------------
+ALTER TABLE mortals_xhx_product ADD COLUMN   `siteId` bigint(20)      COMMENT '站点Id，来源基础服务平台';
+ALTER TABLE mortals_xhx_product ADD COLUMN   `siteCode` varchar(256)  default ''    COMMENT '站点编号，来源基础服务平台';
+ALTER TABLE mortals_xhx_product ADD COLUMN   `siteName` varchar(256)  default ''    COMMENT '站点名称';

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java

@@ -106,6 +106,8 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
     @Override
     protected int viewAfter(Long id, Map<String, Object> model, DeviceModuleDistributeEntity entity, Context context) throws AppException {
 
+
+
         String serverName = request.getHeader("server-name");
         Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"),0);
 

device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductEntity.java

@@ -2,13 +2,14 @@ package com.mortals.xhx.module.product.model;
 
 import com.mortals.framework.annotation.Excel;
 import com.mortals.xhx.module.product.model.vo.ProductVo;
+import lombok.Data;
 /**
  * 产品实体对象
  *
  * @author zxfei
- * @date 2022-11-09
+ * @date 2023-08-21
  */
-
+@Data
 public class ProductEntity extends ProductVo {
     private static final long serialVersionUID = 1L;
 
@@ -46,126 +47,18 @@ public class ProductEntity extends ProductVo {
      * 备注
      */
     private String productRemark;
-
-
-
-    public ProductEntity(){}
-    /**
-     * 获取 关联平台
-     * @return Long
-     */
-    public Long getPlatformId(){
-        return platformId;
-    }
-    /**
-     * 设置 关联平台
-     * @param platformId
-     */
-    public void setPlatformId(Long platformId){
-        this.platformId = platformId;
-    }
-    /**
-     * 获取 产品名称，名称唯一
-     * @return String
-     */
-    public String getProductName(){
-        return productName;
-    }
-    /**
-     * 设置 产品名称，名称唯一
-     * @param productName
-     */
-    public void setProductName(String productName){
-        this.productName = productName;
-    }
-    /**
-     * 获取 产品编码
-     * @return String
-     */
-    public String getProductCode(){
-        return productCode;
-    }
-    /**
-     * 设置 产品编码
-     * @param productCode
-     */
-    public void setProductCode(String productCode){
-        this.productCode = productCode;
-    }
-    /**
-     * 获取 皮肤id
-     * @return Long
-     */
-    public Long getSkinId(){
-        return skinId;
-    }
-    /**
-     * 设置 皮肤id
-     * @param skinId
-     */
-    public void setSkinId(Long skinId){
-        this.skinId = skinId;
-    }
-    /**
-     * 获取 皮肤名称
-     * @return String
-     */
-    public String getSkinName(){
-        return skinName;
-    }
-    /**
-     * 设置 皮肤名称
-     * @param skinName
-     */
-    public void setSkinName(String skinName){
-        this.skinName = skinName;
-    }
     /**
-     * 获取 首页地址
-     * @return String
+     * 站点Id，来源基础服务平台
      */
-    public String getHomeUrl(){
-        return homeUrl;
-    }
-    /**
-     * 设置 首页地址
-     * @param homeUrl
-     */
-    public void setHomeUrl(String homeUrl){
-        this.homeUrl = homeUrl;
-    }
+    private Long siteId;
     /**
-     * 获取 事件地址，评价器使用
-     * @return String
+     * 站点编号，来源基础服务平台
      */
-    public String getEventUrl(){
-        return eventUrl;
-    }
-    /**
-     * 设置 事件地址，评价器使用
-     * @param eventUrl
-     */
-    public void setEventUrl(String eventUrl){
-        this.eventUrl = eventUrl;
-    }
-    /**
-     * 获取 备注
-     * @return String
-     */
-    public String getProductRemark(){
-        return productRemark;
-    }
+    private String siteCode;
     /**
-     * 设置 备注
-     * @param productRemark
+     * 站点名称
      */
-    public void setProductRemark(String productRemark){
-        this.productRemark = productRemark;
-    }
-
-
-
-
+    private String siteName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -182,35 +75,17 @@ public class ProductEntity extends ProductVo {
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",platformId:").append(getPlatformId());
-        sb.append(",productName:").append(getProductName());
-        sb.append(",productCode:").append(getProductCode());
-        sb.append(",skinId:").append(getSkinId());
-        sb.append(",skinName:").append(getSkinName());
-        sb.append(",homeUrl:").append(getHomeUrl());
-        sb.append(",eventUrl:").append(getEventUrl());
-        sb.append(",productRemark:").append(getProductRemark());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
-
-        this.platformId = null;
-
+        this.platformId = 0L;
         this.productName = "";
-
         this.productCode = "";
-
-        this.skinId = null;
-
+        this.skinId = 0L;
         this.skinName = "";
-
         this.homeUrl = "";
-
         this.eventUrl = "";
-
         this.productRemark = "";
+        this.siteId = 0L;
+        this.siteCode = "";
+        this.siteName = "";
     }
 }
\ No newline at end of file