别傲 5 سال پیش
والد
کامیت
be00243660

+ 2 - 2
lift-manager-service/src/main/java/cn/com/ty/lift/manager/library/controller/LibraryController.java

@@ -1,8 +1,8 @@
 package cn.com.ty.lift.manager.library.controller;
 
-import cn.com.ty.lift.manager.dao.entity.Lift;
+import cn.com.ty.lift.manager.library.dao.entity.Lift;
 import cn.com.ty.lift.manager.library.service.LibraryService;
-import cn.com.ty.lift.manager.dao.entity.model.LiftRequest;
+import cn.com.ty.lift.manager.library.dao.entity.model.LiftRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;

+ 1 - 1
lift-manager-service/src/main/java/cn/com/ty/lift/manager/dao/entity/Lift.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.manager.dao.entity;
+package cn.com.ty.lift.manager.library.dao.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;

+ 1 - 1
lift-manager-service/src/main/java/cn/com/ty/lift/manager/dao/entity/model/LiftRequest.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.manager.dao.entity.model;
+package cn.com.ty.lift.manager.library.dao.entity.model;
 
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;

+ 1 - 1
lift-manager-service/src/main/java/cn/com/ty/lift/manager/dao/entity/model/LiftResponse.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.manager.dao.entity.model;
+package cn.com.ty.lift.manager.library.dao.entity.model;
 
 import lombok.Data;
 

+ 3 - 3
lift-manager-service/src/main/java/cn/com/ty/lift/manager/dao/mapper/LiftMapper.java

@@ -1,7 +1,7 @@
-package cn.com.ty.lift.manager.dao.mapper;
+package cn.com.ty.lift.manager.library.dao.mapper;
 
-import cn.com.ty.lift.manager.dao.entity.Lift;
-import cn.com.ty.lift.manager.dao.entity.model.LiftRequest;
+import cn.com.ty.lift.manager.library.dao.entity.Lift;
+import cn.com.ty.lift.manager.library.dao.entity.model.LiftRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;

+ 3 - 3
lift-manager-service/src/main/java/cn/com/ty/lift/manager/library/service/LibraryService.java

@@ -1,8 +1,8 @@
 package cn.com.ty.lift.manager.library.service;
 
-import cn.com.ty.lift.manager.dao.entity.Lift;
-import cn.com.ty.lift.manager.dao.mapper.LiftMapper;
-import cn.com.ty.lift.manager.dao.entity.model.LiftRequest;
+import cn.com.ty.lift.manager.library.dao.entity.Lift;
+import cn.com.ty.lift.manager.library.dao.mapper.LiftMapper;
+import cn.com.ty.lift.manager.library.dao.entity.model.LiftRequest;
 import cn.com.xwy.boot.service.impl.BaseServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 7 - 7
lift-manager-service/src/main/resources/mapper/LiftMapper.xml

@@ -1,7 +1,7 @@
 <?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="cn.com.ty.lift.manager.dao.mapper.LiftMapper" >
-	<resultMap id="BaseResultMap" type="cn.com.ty.lift.manager.dao.entity.Lift" >
+<mapper namespace="cn.com.ty.lift.manager.library.dao.mapper.LiftMapper" >
+	<resultMap id="BaseResultMap" type="cn.com.ty.lift.manager.library.dao.entity.Lift" >
 		<id column="id" property="id" jdbcType="BIGINT" />
 		<result column="registration_code" property="registrationCode" jdbcType="VARCHAR" />
 		<result column="category" property="category" jdbcType="TINYINT" />
@@ -59,7 +59,7 @@
 	</select>
 
 	<!-- 根据区域,项目,电梯号,电梯品牌,电梯类型,维保工查询电梯列表信息-->
-	<select id="findByCondition" resultType="cn.com.ty.lift.manager.dao.entity.model.LiftResponse" parameterType="cn.com.ty.lift.manager.dao.entity.model.LiftRequest" >
+	<select id="findByCondition" resultType="cn.com.ty.lift.manager.library.dao.entity.model.LiftResponse" parameterType="cn.com.ty.lift.manager.library.dao.entity.model.LiftRequest" >
 		SELECT
          lift_code as liftCode,
 		 registration_code as registrationCode,
@@ -81,7 +81,7 @@
 		where id = #{id,jdbcType=BIGINT}
 	</delete>
 
-	<insert id="insert" parameterType="cn.com.ty.lift.manager.dao.entity.Lift" >
+	<insert id="insert" parameterType="cn.com.ty.lift.manager.library.dao.entity.Lift" >
 		insert into lift (id, registration_code, category,
 			lift_type, lift_code, manufacture_date,
 			factory_code, device_usage, lift_brand,
@@ -110,7 +110,7 @@
 			#{customNumber,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR})
 	</insert>
 
-	<insert id="insertSelective" parameterType="cn.com.ty.lift.manager.dao.entity.Lift" >
+	<insert id="insertSelective" parameterType="cn.com.ty.lift.manager.library.dao.entity.Lift" >
 		insert into lift
 		<trim prefix="(" suffix=")" suffixOverrides="," >
 			<if test="id != null" >
@@ -346,7 +346,7 @@
 		</trim>
 	</insert>
 
-	<update id="updateByPrimaryKeySelective" parameterType="cn.com.ty.lift.manager.dao.entity.Lift" >
+	<update id="updateByPrimaryKeySelective" parameterType="cn.com.ty.lift.manager.library.dao.entity.Lift" >
 		update lift
 		<set >
 			<if test="registrationCode != null" >
@@ -464,7 +464,7 @@
 		where id = #{id,jdbcType=BIGINT}
 	</update>
 
-	<update id="updateByPrimaryKey" parameterType="cn.com.ty.lift.manager.dao.entity.Lift" >
+	<update id="updateByPrimaryKey" parameterType="cn.com.ty.lift.manager.library.dao.entity.Lift" >
 		update lift
 		set registration_code = #{registrationCode,jdbcType=VARCHAR},
 			category = #{category,jdbcType=TINYINT},