维多利亚项目初始化

hx-service-api/pom.xml

@@ -34,6 +34,7 @@
         <module>crm-api</module>
         <module>blade-ex-api</module>
         <module>dev-ops-api</module>
+        <module>victoriatourist-api</module>
     </modules>
 
     <dependencyManagement>

hx-service-api/storage-api/src/main/java/com/fjhx/entity/material/MaterialCategory.java

@@ -1,6 +1,7 @@
 package com.fjhx.entity.material;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fjhx.base.BasicEntity;
 import lombok.Data;
@@ -24,6 +25,7 @@ public class MaterialCategory extends BasicEntity {
     /**
      * 软删除
      */
+    @TableLogic
     @TableField("IsDelete")
     private Integer IsDelete;
 

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/EditMaterialCategoryVo.java

@@ -1,6 +1,5 @@
 package com.fjhx.params.material;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -14,19 +13,16 @@ public class EditMaterialCategoryVo {
     /**
      * 编码
      */
-    @TableField("Code")
-    private String Code;
+    private String code;
 
     /**
      * 名称
      */
-    @TableField("Name")
-    private String Name;
+    private String name;
 
     /**
      * 跳转链接
      */
-    @TableField("ParentCode")
-    private String ParentCode;
+    private String parentCode;
 
 }

hx-service-api/storage-api/src/main/java/com/fjhx/params/material/EditMaterialVo.java

@@ -40,4 +40,9 @@ public class EditMaterialVo {
      */
     private String stockUnit;
 
+    /**
+     * 物料分类
+     */
+    private String categoryCode;
+
 }

hx-service-api/victoriatourist-api/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hx-service-api</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>victoriatourist-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

hx-service/pom.xml

@@ -32,6 +32,7 @@
         <module>dev-ops</module>
         <module>ding</module>
         <module>weixin</module>
+        <module>victoriatourist</module>
     </modules>
 
     <dependencyManagement>
@@ -155,6 +156,12 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>victoriatourist-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

hx-service/storage/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java

@@ -95,6 +95,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialSMapper, Material>
         material.setUnitweight(editMaterialVo.getUnitWeight());
         material.setWidth(editMaterialVo.getWidth());
         material.setStockunitid(editMaterialVo.getStockUnit());
+        material.setCategorycode(editMaterialVo.getCategoryCode());
 
         Material oldMaterial = getOne(Wrappers.<Material>lambdaQuery()
                 .eq(Material::getCode, editMaterialVo.getCode())

hx-service/victoriatourist/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hx-service</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>victoriatourist</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>victoriatourist-api</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

hx-service/victoriatourist/src/main/java/com/fjhx/VictoriatouristApplication.java

@@ -0,0 +1,18 @@
+package com.fjhx;
+
+import org.springblade.core.cloud.client.BladeCloudApplication;
+import org.springblade.core.launch.BladeApplication;
+
+/**
+ * 针筒物联网管理模块启动器
+ */
+@BladeCloudApplication
+public class VictoriatouristApplication {
+
+    private static final String APP_NAME = "victoriatourist";
+
+    public static void main(String[] args) {
+        BladeApplication.run(APP_NAME, VictoriatouristApplication.class, args);
+    }
+
+}

hx-service/victoriatourist/src/main/resources/application-dev.yml

@@ -0,0 +1,11 @@
+# 服务器端口
+server:
+  port: 8204
+
+# 数据源配置
+spring:
+  # 数据库
+  datasource:
+    url: ${blade.datasource.victoriatourist.dev.url}
+    username: ${blade.datasource.victoriatourist.dev.username}
+    password: ${blade.datasource.victoriatourist.dev.password}

hx-service/victoriatourist/src/main/resources/application-prod.yml

@@ -0,0 +1,12 @@
+# 服务器端口
+server:
+  port: 8204
+
+# 数据源配置
+spring:
+  # 数据库
+  datasource:
+    url: ${blade.datasource.victoriatourist.prod.url}
+    username: ${blade.datasource.victoriatourist.prod.username}
+    password: ${blade.datasource.victoriatourist.prod.password}
+

hx-service/victoriatourist/src/main/resources/application-test.yml

@@ -0,0 +1,11 @@
+# 服务器端口
+server:
+  port: 8204
+
+# 数据源配置
+spring:
+  # 数据库
+  datasource:
+    url: ${blade.datasource.victoriatourist.test.url}
+    username: ${blade.datasource.victoriatourist.test.username}
+    password: ${blade.datasource.victoriatourist.test.password}