添加资源部署站点字段

device-manager-ui/admin/src/views/device/module/distribute/list.vue

@@ -11,13 +11,18 @@
 
 import dialogShow from "./dialogshow";
 import table from "@/assets/mixins/table";
+import session from "@/assets/utils/session";
 export default {
   name: "DeviceModuleDistributeList",
   components: {
     dialogShow,
   },
   mixins: [table],
-  created() {},
+  created() {
+    const siteid = session.getSession("siteid");
+    console.log("siteId:"+siteid)
+    this.query["siteId"]=1;
+  },
   methods: {
     /** 重写新增方法 */
     toAdd(row) {
@@ -122,4 +127,4 @@ export default {
     };
   },
 };
-</script>
+</script>
\ No newline at end of file

device-manager/db/add.sql

@@ -49,3 +49,16 @@ ADD COLUMN  `push` tinyint(2)    DEFAULT '0'  COMMENT '是否推送',
 ADD COLUMN   `productId` bigint(20)   DEFAULT '0'   COMMENT '产品Id',
 ADD COLUMN  `productCode` varchar(256)   DEFAULT ''   COMMENT '产品编码',
 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   `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 '站点名称';

device-manager/pom.xml

@@ -178,7 +178,7 @@
 				<profiles.datasource.uri>
 					<![CDATA[jdbc:mysql://127.0.0.1:3306/device-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
 				<profiles.datasource.username>root</profiles.datasource.username>
-				<profiles.datasource.password>xhx@2022</profiles.datasource.password>
+				<profiles.datasource.password>root</profiles.datasource.password>
 				<profiles.redis.uri>127.0.0.1</profiles.redis.uri>
 				<profiles.redis.port>6379</profiles.redis.port>
 				<profiles.redis.username></profiles.redis.username>
@@ -186,8 +186,8 @@
 				<profiles.redis.database>6</profiles.redis.database>
 				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-				<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
-				<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
 				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
 				<profiles.rabbitmq.exchange>amp.direct</profiles.rabbitmq.exchange>
 				<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
@@ -198,7 +198,7 @@
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-				<profiles.log.path>/mortals/app/logs</profiles.log.path>
+				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>build:prod</package.environment>
 				<skipDeploy>false</skipDeploy>
 			</properties>

device-manager/src/main/bin/start.cmd

@@ -29,7 +29,7 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.port=%PORT%
 set JVM_CONFIG=%JVM_CONFIG% -Djava.io.tmpdir=%TEMP_PATH%
 set JVM_CONFIG=%JVM_CONFIG% -Dbasedir=%BASEDIR%
 set JVM_CONFIG=%JVM_CONFIG% -Dloader.path=file://%BASEDIR%/conf,file://%BASEDIR%/lib
-
+set JVM_CONFIG=%JVM_CONFIG% -Dfile.encoding=utf-8
 
 set DEBUG_OPTS=
 if ""%1"" == ""debug"" (

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

 package com.mortals.xhx.module.device.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.device.model.vo.DeviceModuleDistributeVo;
+import lombok.Data;
 /**
-* 设备前端模块部署实体对象
-*
-* @author zxfei
-* @date 2022-08-02
-*/
-
+ * 设备前端模块部署实体对象
+ *
+ * @author zxfei
+ * @date 2023-08-18
+ */
+@Data
 public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 产品Id
-    */
+     * 产品Id
+     */
     private Long productId;
     /**
-    * 产品编码
-    */
+     * 产品编码
+     */
     private String productCode;
     /**
-    * 产品名称
-    */
+     * 产品名称
+     */
     private String productName;
     /**
-    * 分辨率
-    */
+     * 分辨率
+     */
     private String imageResolution;
     /**
-    * 分辨率值
-    */
+     * 分辨率值
+     */
     @Excel(name = "分辨率值")
     private String imageResolutionValue;
     /**
-    * 文件相对路径地址
-    */
+     * 文件相对路径地址
+     */
     @Excel(name = "文件相对路径地址")
     private String filePath;
     /**
-    * 文件部署路径地址
-    */
+     * 文件部署路径地址
+     */
     @Excel(name = "文件部署路径地址")
     private String distributeFilePath;
     /**
-    * 版本号
-    */
+     * 版本号
+     */
     @Excel(name = "版本号")
     private String version;
     /**
-    * 是否部署(0.否，1.是)
-    */
+     * 是否部署(0.否，1.是)
+     */
     @Excel(name = "是否部署", readConverterExp = "0=否,1=是")
     private Integer distribute;
-
-
-
-    public DeviceModuleDistributeEntity(){}
-    /**
-    * 获取 产品Id
-    * @return Long
-    */
-    public Long getProductId(){
-        return productId;
-    }
-    /**
-    * 设置 产品Id
-    * @param productId
-    */
-    public void setProductId(Long productId){
-        this.productId = productId;
-    }
-    /**
-    * 获取 产品编码
-    * @return String
-    */
-    public String getProductCode(){
-        return productCode;
-    }
-    /**
-    * 设置 产品编码
-    * @param productCode
-    */
-    public void setProductCode(String productCode){
-        this.productCode = productCode;
-    }
-    /**
-    * 获取 产品名称
-    * @return String
-    */
-    public String getProductName(){
-        return productName;
-    }
-    /**
-    * 设置 产品名称
-    * @param productName
-    */
-    public void setProductName(String productName){
-        this.productName = productName;
-    }
-    /**
-    * 获取 分辨率
-    * @return String
-    */
-    public String getImageResolution(){
-        return imageResolution;
-    }
-    /**
-    * 设置 分辨率
-    * @param imageResolution
-    */
-    public void setImageResolution(String imageResolution){
-        this.imageResolution = imageResolution;
-    }
-    /**
-    * 获取 分辨率值
-    * @return String
-    */
-    public String getImageResolutionValue(){
-        return imageResolutionValue;
-    }
-    /**
-    * 设置 分辨率值
-    * @param imageResolutionValue
-    */
-    public void setImageResolutionValue(String imageResolutionValue){
-        this.imageResolutionValue = imageResolutionValue;
-    }
-    /**
-    * 获取 文件相对路径地址
-    * @return String
-    */
-    public String getFilePath(){
-        return filePath;
-    }
     /**
-    * 设置 文件相对路径地址
-    * @param filePath
-    */
-    public void setFilePath(String filePath){
-        this.filePath = filePath;
-    }
-    /**
-    * 获取 文件部署路径地址
-    * @return String
-    */
-    public String getDistributeFilePath(){
-        return distributeFilePath;
-    }
+     * 站点Id，来源基础服务平台
+     */
+    private Long siteId;
     /**
-    * 设置 文件部署路径地址
-    * @param distributeFilePath
-    */
-    public void setDistributeFilePath(String distributeFilePath){
-        this.distributeFilePath = distributeFilePath;
-    }
+     * 站点编号，来源基础服务平台
+     */
+    private String siteCode;
     /**
-    * 获取 版本号
-    * @return String
-    */
-    public String getVersion(){
-        return version;
-    }
-    /**
-    * 设置 版本号
-    * @param version
-    */
-    public void setVersion(String version){
-        this.version = version;
-    }
-    /**
-    * 获取 是否部署(0.否，1.是)
-    * @return Integer
-    */
-    public Integer getDistribute(){
-        return distribute;
-    }
-    /**
-    * 设置 是否部署(0.否，1.是)
-    * @param distribute
-    */
-    public void setDistribute(Integer distribute){
-        this.distribute = distribute;
-    }
-
-
-
-
+     * 站点名称
+     */
+    private String siteName;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -201,44 +76,24 @@ public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo {
         if (obj instanceof DeviceModuleDistributeEntity) {
             DeviceModuleDistributeEntity tmp = (DeviceModuleDistributeEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",productId:").append(getProductId());
-        sb.append(",productCode:").append(getProductCode());
-        sb.append(",productName:").append(getProductName());
-        sb.append(",imageResolution:").append(getImageResolution());
-        sb.append(",imageResolutionValue:").append(getImageResolutionValue());
-        sb.append(",filePath:").append(getFilePath());
-        sb.append(",distributeFilePath:").append(getDistributeFilePath());
-        sb.append(",version:").append(getVersion());
-        sb.append(",distribute:").append(getDistribute());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
-
-            this.productId = null;
-
-            this.productCode = "";
-
-            this.productName = "";
-
-            this.imageResolution = "0";
-
-            this.imageResolutionValue = "";
-
-            this.filePath = "";
-
-            this.distributeFilePath = "";
-
-            this.version = "";
-
-            this.distribute = 0;
+        this.productId = 0L;
+        this.productCode = "";
+        this.productName = "";
+        this.imageResolution = "";
+        this.imageResolutionValue = "";
+        this.filePath = "";
+        this.distributeFilePath = "";
+        this.version = "";
+        this.distribute = 0;
+        this.siteId = 0L;
+        this.siteCode = "";
+        this.siteName = "";
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java

@@ -42,9 +42,7 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
         ProductEntity productEntity = productService.get(entity.getProductId(), context);
         entity.setProductCode(productEntity.getProductCode());
         entity.setProductName(productEntity.getProductName());
-
         entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
-
         super.saveBefore(entity, context);
     }
 

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

 package com.mortals.xhx.module.product.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.product.model.vo.ProductVersionVo;
+import lombok.Data;
 /**
-* 产品客户端版本实体对象
-*
-* @author zxfei
-* @date 2022-08-22
-*/
-
+ * 产品客户端版本实体对象
+ *
+ * @author zxfei
+ * @date 2023-08-18
+ */
+@Data
 public class ProductVersionEntity extends ProductVersionVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 产品Id
-    */
+     * 产品Id
+     */
     private Long productId;
     /**
-    * 产品编码
-    */
+     * 产品编码
+     */
     private String productCode;
     /**
-    * 产品名称
-    */
+     * 产品名称
+     */
     private String productName;
     /**
-    * 文件相对路径地址
-    */
+     * 文件相对路径地址
+     */
     @Excel(name = "文件相对路径地址")
     private String filePath;
     /**
-    * 版本号
-    */
+     * 版本号
+     */
     @Excel(name = "版本号")
     private Integer version;
     /**
-    * 备注信息
-    */
+     * 备注信息
+     */
     @Excel(name = "备注信息")
     private String remark;
-
-
-
-    public ProductVersionEntity(){}
-    /**
-    * 获取 产品Id
-    * @return Long
-    */
-    public Long getProductId(){
-        return productId;
-    }
     /**
-    * 设置 产品Id
-    * @param productId
-    */
-    public void setProductId(Long productId){
-        this.productId = productId;
-    }
+     * 站点Id，来源基础服务平台
+     */
+    private Long siteId;
     /**
-    * 获取 产品编码
-    * @return String
-    */
-    public String getProductCode(){
-        return productCode;
-    }
-    /**
-    * 设置 产品编码
-    * @param productCode
-    */
-    public void setProductCode(String productCode){
-        this.productCode = productCode;
-    }
+     * 站点编号，来源基础服务平台
+     */
+    private String siteCode;
     /**
-    * 获取 产品名称
-    * @return String
-    */
-    public String getProductName(){
-        return productName;
-    }
-    /**
-    * 设置 产品名称
-    * @param productName
-    */
-    public void setProductName(String productName){
-        this.productName = productName;
-    }
-    /**
-    * 获取 文件相对路径地址
-    * @return String
-    */
-    public String getFilePath(){
-        return filePath;
-    }
-    /**
-    * 设置 文件相对路径地址
-    * @param filePath
-    */
-    public void setFilePath(String filePath){
-        this.filePath = filePath;
-    }
-    /**
-    * 获取 版本号
-    * @return Integer
-    */
-    public Integer getVersion(){
-        return version;
-    }
-    /**
-    * 设置 版本号
-    * @param version
-    */
-    public void setVersion(Integer version){
-        this.version = version;
-    }
-    /**
-    * 获取 备注信息
-    * @return String
-    */
-    public String getRemark(){
-        return remark;
-    }
-    /**
-    * 设置 备注信息
-    * @param remark
-    */
-    public void setRemark(String remark){
-        this.remark = remark;
-    }
-
-
-
-
+     * 站点名称
+     */
+    private String siteName;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -145,35 +62,21 @@ public class ProductVersionEntity extends ProductVersionVo {
         if (obj instanceof ProductVersionEntity) {
             ProductVersionEntity tmp = (ProductVersionEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
-    public String toString(){
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",productId:").append(getProductId());
-        sb.append(",productCode:").append(getProductCode());
-        sb.append(",productName:").append(getProductName());
-        sb.append(",filePath:").append(getFilePath());
-        sb.append(",version:").append(getVersion());
-        sb.append(",remark:").append(getRemark());
-        return sb.toString();
-    }
-
     public void initAttrValue(){
-
-            this.productId = null;
-
-            this.productCode = "";
-
-            this.productName = "";
-
-            this.filePath = "";
-
-            this.version = null;
-
-            this.remark = "";
+        this.productId = 0L;
+        this.productCode = "";
+        this.productName = "";
+        this.filePath = "";
+        this.version = 0;
+        this.remark = "";
+        this.siteId = 0L;
+        this.siteCode = "";
+        this.siteName = "";
     }
 }
\ No newline at end of file