dengsixing 1 year ago
parent
commit
f07b703bee

+ 1 - 1
pom.xml

@@ -162,7 +162,7 @@
 <!--        </configuration>-->
 <!--      </plugin>-->
 <!--    </plugins>-->
-    <finalName>scene-push</finalName>
+    <finalName>4dkankan-center-push</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>

+ 42 - 0
src/main/java/com/fdkankan/project/tieta/controller/SceneController.java

@@ -0,0 +1,42 @@
+package com.fdkankan.project.tieta.controller;
+
+
+import com.fdkankan.project.tieta.bean.ResultData;
+import com.fdkankan.project.tieta.entity.Scene;
+import com.fdkankan.project.tieta.service.SceneService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+@RestController
+@RequestMapping("/scene")
+public class SceneController {
+
+    @Autowired
+    private SceneService sceneService;
+
+    @GetMapping("/test")
+    public ResultData test(){
+        return  ResultData.ok(sceneService.list());
+    }
+
+    @GetMapping("/add")
+    public ResultData add(){
+        Scene scene = new Scene();
+        scene.setNum("sdfsdfdhfgjghjrr胜多负少的");
+        sceneService.save(scene);
+        return  ResultData.ok();
+    }
+
+
+}

+ 65 - 0
src/main/java/com/fdkankan/project/tieta/entity/Scene.java

@@ -0,0 +1,65 @@
+package com.fdkankan.project.tieta.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_SCENE")
+public class Scene extends Model<Scene> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private String id;
+
+    @TableField("TITLE")
+    private String title;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("NUM")
+    private String num;
+
+    @TableField("FLOORLOGOSIZE")
+    private String floorlogosize;
+
+    @TableField("SCENEKIND")
+    private String scenekind;
+
+    @TableField("SCENERESOLUTION")
+    private String sceneresolution;
+
+    @TableField("SCENEFROM")
+    private String scenefrom;
+
+    @TableField("MODELKIND")
+    private String modelkind;
+
+    @TableField("FLOORPLANANGLE")
+    private String floorplanangle;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 44 - 0
src/main/java/com/fdkankan/project/tieta/entity/UserInfo.java

@@ -0,0 +1,44 @@
+package com.fdkankan.project.tieta.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("USER_INFO")
+public class UserInfo extends Model<UserInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private String id;
+
+    @TableField("USER_NAME")
+    private String userName;
+
+    @TableField("AGE")
+    private String age;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 17 - 13
src/main/java/com/fdkankan/project/tieta/generator/MappingGeneratorOracle.java

@@ -37,27 +37,27 @@ public class MappingGeneratorOracle {
 	/**
 	 * 生成代码输出路径,<strong>路径必须是绝对路径,不需要包含包名</strong>
 	 */
-	private static final String OUTPUT_DIR = ".\\src\\main\\resources\\genertor";
+	private static final String OUTPUT_DIR = ".\\src\\main\\java\\com\\fdkankan\\project\\tieta\\generator";
 	/**
 	 * 生成代码输出的包名
 	 * <p>
 	 * 总包名,后续生成的 Mapper,Service 等将在该包下生成子包
 	 * </p>
 	 */
-	private static final String PACKAGE = "com.shaoming";
+	private static final String PACKAGE = "com.fdkankan.project.tieta";
 	/**
 	 * JDBC URL 说明: url地址前需要加上@,否则会报错
 	 */
 
-	private static final String JDBC_URL = "jdbc:oracle:thin:@192.168.200.228:1521:orcl";
+	private static final String JDBC_URL = "jdbc:oracle:thin:@//8.135.106.227:1521/helowin";
 	/**
 	 * 数据库账户
 	 */
-	private static final String DB_USERNAME = "scott";
+	private static final String DB_USERNAME = "FDKK";
 	/**
 	 * 数据库账户密码
 	 */
-	private static final String DB_PASSWORD = "tiger";
+	private static final String DB_PASSWORD = "qawsed@123.";
 
 	/**
 	 * 执行即可生成代码 需要添加 freemarker 依赖 <dependency> <groupId>org.freemarker</groupId>
@@ -78,6 +78,10 @@ public class MappingGeneratorOracle {
 		return autoGenerator;
 	}
 
+	public static void main(String[] args) {
+		autoGenerator().execute();
+	}
+
 	/**
 	 * 全局配置
 	 *
@@ -85,7 +89,7 @@ public class MappingGeneratorOracle {
 	 */
 	private static GlobalConfig globalConfig() {
 		GlobalConfig globalConfig = new GlobalConfig();
-		globalConfig.setAuthor("shaoming");
+		globalConfig.setAuthor("dsx");
 		// 设置代码输出位置,需要绝对路径
 		globalConfig.setOutputDir(OUTPUT_DIR);
 		// 覆盖已有的代码
@@ -97,18 +101,18 @@ public class MappingGeneratorOracle {
 		// 开启基于 Model 操作数据库
 		globalConfig.setActiveRecord(true);
 		// 设置 ID 类型
-		globalConfig.setIdType(IdType.NONE);
-		// 生成基本 Swagger2 文档
-		globalConfig.setSwagger2(true);
+		globalConfig.setIdType(IdType.AUTO);
+//		// 生成基本 Swagger2 文档
+//		globalConfig.setSwagger2(true);
 		// 开启二级缓存
-		globalConfig.setEnableCache(true);
+//		globalConfig.setEnableCache(true);
 		// 设置生成的对象名称规则,%s 表示当前的 Entity
 		// 数据库表映射对象名称规则
 		globalConfig.setEntityName("%s");
 		// 也可以使用下面这种就是末尾会以DO结尾
 //		globalConfig.setEntityName("%sDO");
 		// Mapper 接口名称规则
-		globalConfig.setMapperName("%sDao");
+		globalConfig.setMapperName("%sMapper");
 		// Mapper XML 文件名称规则
 		globalConfig.setXmlName("%sMapper");
 		// Controller 生成规则
@@ -133,7 +137,7 @@ public class MappingGeneratorOracle {
 		strategyConfig.setNaming(NamingStrategy.underline_to_camel);
 		strategyConfig.setColumnNaming(NamingStrategy.underline_to_camel);
 		// TODO 填写表前缀、表字段前缀,生成代码时去除字段前缀
-		strategyConfig.setTablePrefix("tb_");
+		strategyConfig.setTablePrefix("t_");
 		strategyConfig.setFieldPrefix("a_", "c_", "e_", "f_", "p_", "r_", "t_", "tf_");
 		return strategyConfig;
 	}
@@ -168,7 +172,7 @@ public class MappingGeneratorOracle {
 		// Controller 包
 		packageConfig.setController("controller");
 		// 数据库表映射对象包
-		packageConfig.setEntity("pojo.entity");
+		packageConfig.setEntity("entity");
 		// Mapper 接口包,含 XML 文件
 		packageConfig.setMapper("mapper");
 		// Service 接口包

+ 16 - 0
src/main/java/com/fdkankan/project/tieta/mapper/SceneMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.project.tieta.mapper;
+
+import com.fdkankan.project.tieta.entity.Scene;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+public interface SceneMapper extends BaseMapper<Scene> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/project/tieta/mapper/UserInfoMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.project.tieta.mapper;
+
+import com.fdkankan.project.tieta.entity.UserInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+public interface UserInfoMapper extends BaseMapper<UserInfo> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/project/tieta/service/SceneService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.project.tieta.service;
+
+import com.fdkankan.project.tieta.entity.Scene;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+public interface SceneService extends IService<Scene> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/project/tieta/service/UserInfoService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.project.tieta.service;
+
+import com.fdkankan.project.tieta.entity.UserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+public interface UserInfoService extends IService<UserInfo> {
+
+}

+ 20 - 0
src/main/java/com/fdkankan/project/tieta/service/impl/SceneServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.project.tieta.service.impl;
+
+import com.fdkankan.project.tieta.entity.Scene;
+import com.fdkankan.project.tieta.mapper.SceneMapper;
+import com.fdkankan.project.tieta.service.SceneService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+@Service
+public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements SceneService {
+
+}

+ 20 - 0
src/main/java/com/fdkankan/project/tieta/service/impl/UserInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.project.tieta.service.impl;
+
+import com.fdkankan.project.tieta.entity.UserInfo;
+import com.fdkankan.project.tieta.mapper.UserInfoMapper;
+import com.fdkankan.project.tieta.service.UserInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-06-25
+ */
+@Service
+public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService {
+
+}

+ 0 - 17
src/main/resources/application-test.yml

@@ -20,23 +20,6 @@ spring:
     username: FDKK
     password: qawsed@123.
     driver-class-name: oracle.jdbc.OracleDriver
-mybatis-plus:
-  mapper-locations: classpath:mapper/*Mapper.xml
-
-fyun:
-  type: local
-  key:
-  secret:
-  bucket: 4dkankan
-  endPoint:
-  host: /oss/
-
-logging:
-  path: /mnt/docker/4dkankan
-
-
-
-
 
 
 

+ 1 - 3
src/main/resources/logback-spring.xml

@@ -5,11 +5,9 @@
 <!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
-
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
-	<property name="log.path" value="${LOG_PATH}/scene_push/logs" />
+	<property name="log.path" value="/mnt/backend/4dkankan/push/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->

+ 27 - 0
src/main/resources/mapper/SceneMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.project.tieta.mapper.SceneMapper">
+
+    <!-- 开启二级缓存 -->
+<!--    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>-->
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.fdkankan.project.tieta.entity.Scene">
+        <id column="ID" property="id" />
+        <result column="TITLE" property="title" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="NUM" property="num" />
+        <result column="FLOORLOGOSIZE" property="floorlogosize" />
+        <result column="SCENEKIND" property="scenekind" />
+        <result column="SCENERESOLUTION" property="sceneresolution" />
+        <result column="SCENEFROM" property="scenefrom" />
+        <result column="MODELKIND" property="modelkind" />
+        <result column="FLOORPLANANGLE" property="floorplanangle" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, TITLE, DESCRIPTION, NUM, FLOORLOGOSIZE, SCENEKIND, SCENERESOLUTION, SCENEFROM, MODELKIND, FLOORPLANANGLE
+    </sql>
+
+</mapper>

+ 20 - 0
src/main/resources/mapper/UserInfoMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.project.tieta.mapper.UserInfoMapper">
+
+    <!-- 开启二级缓存 -->
+<!--    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>-->
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.fdkankan.project.tieta.entity.UserInfo">
+        <id column="ID" property="id" />
+        <result column="USER_NAME" property="userName" />
+        <result column="AGE" property="age" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, USER_NAME, AGE
+    </sql>
+
+</mapper>