Merge branch 'bieao-lift-manager' of lift-manager/lift-server into develop

lift-manager-service/src/main/java/cn/com/ty/lift/manger/ManagerApplication.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.manger;
+package cn.com.ty.lift.manager;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -17,7 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 public class ManagerApplication {
 
     public static void main(String[] args) {
-        log.debug("DemoApplication startup main");
+        log.debug("ManagerApplication startup main");
         SpringApplication application = new SpringApplication(ManagerApplication.class);
         application.run(args);
     }

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

@@ -0,0 +1,59 @@
+package cn.com.ty.lift.manager.library.controller;
+
+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.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;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author bieao
+ * @date 2019/11/27
+ * @description 电梯档案控制层
+ */
+@RestController
+@RequestMapping("library")
+public class LibraryController {
+
+    @Resource
+    private LibraryService libraryService;
+
+    /**
+     * @param
+     * @return
+     * @description 查询电梯列表
+     * @date 2019/11/27 10:03 AM
+     */
+    @PostMapping("list")
+    public RestResponse<IPage<Lift>> list(@RequestBody LiftRequest request) {
+        return libraryService.list(request);
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 新增电梯
+     * @date 2019/11/27 10:03 AM
+     */
+    @PostMapping("add")
+    public RestResponse add(@RequestBody Lift lift) {
+        return libraryService.add(lift);
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 修改电梯
+     * @date 2019/11/27 10:03 AM
+     */
+    @PostMapping("modify")
+    public RestResponse modify(@RequestBody Lift lift) {
+        return libraryService.modify(lift);
+    }
+}

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

@@ -1,17 +1,15 @@
-package cn.com.ty.lift.manger.dao.entity;
+package cn.com.ty.lift.manager.library.dao.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 import lombok.Data;
-import org.apache.ibatis.type.Alias;
 
 /**
  * 实体类 - 表：lift 电梯
  * @since 2019-11-25 17:37:16
  */
 @Data
-@Alias("Lift")
 public class Lift {
 	private Long id;
 
@@ -19,21 +17,21 @@ public class Lift {
 
 	private Byte category;
 
-	private Integer type;
+	private Integer liftType;
 
-	private String code;
+	private String liftCode;
 
 	private Date manufactureDate;
 
 	private String factoryCode;
 
-	private Byte usage;
+	private Byte deviceUsage;
 
-	private String brand;
+	private String liftBrand;
 
 	private String installCompany;
 
-	private String model;
+	private String liftModel;
 
 	private BigDecimal pulleyDiameter;
 
@@ -61,7 +59,7 @@ public class Lift {
 
 	private String reformCompany;
 
-	private String position;
+	private String devicePosition;
 
 	private String coordinate;
 
@@ -85,7 +83,7 @@ public class Lift {
 
 	private String factory;
 
-	private String code1;
+	private String customNumber;
 
-	private String useCompanyCode;
+	private String companyCode;
 }

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

@@ -0,0 +1,43 @@
+package cn.com.ty.lift.manager.library.dao.entity.model;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+import lombok.Data;
+
+/**
+ * @author bieao
+ * @date 2019/11/27
+ * @description 电梯档案列表请求体
+ */
+@Data
+public class LiftRequest extends BaseRequestModel {
+
+    /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 项目名
+     */
+    private String projectName;
+
+    /**
+     * 电梯号
+     */
+    private Long liftCode;
+
+    /**
+     * 电梯品牌
+     */
+    private String liftBrand;
+
+    /**
+     * 电梯类型
+     */
+    private String liftType;
+
+    /**
+     * 维保工
+     */
+    private String maintenanceWorker;
+}

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

@@ -0,0 +1,17 @@
+package cn.com.ty.lift.manager.library.dao.entity.model;
+
+import lombok.Data;
+
+/**
+ * @author bieao
+ * @date 2019/11/27
+ * @description 电梯档案列表返回体
+ */
+@Data
+public class LiftResponse {
+    private String liftCode;
+    private String registrationCode;
+    private String liftBrand;
+    private String liftType;
+    private String devicePosition;
+}

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

@@ -0,0 +1,26 @@
+package cn.com.ty.lift.manager.library.dao.mapper;
+
+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;
+
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2019/11/27
+ * @description 电梯档案数据层
+ */
+public interface LiftMapper extends BaseMapper<Lift> {
+    int deleteByPrimaryKey(Long id);
+
+    int insertSelective(Lift record);
+
+    List<Lift> findByCondition(IPage page, @Param("request") LiftRequest request);
+
+    int updateByPrimaryKeySelective(Lift record);
+
+    int updateByPrimaryKey(Lift record);
+}

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

@@ -0,0 +1,59 @@
+package cn.com.ty.lift.manager.library.service;
+
+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;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2019/11/27
+ * @description 电梯档案业务层
+ */
+@Service
+public class LibraryService extends BaseServiceImpl {
+
+    @Resource
+    private LiftMapper mapper;
+
+    /**
+     * @description 条件查询电梯档案列表
+     * @date 2019/11/27 2:10 PM
+     * @param
+     * @return
+     */
+    public RestResponse<IPage<Lift>> list(LiftRequest request) {
+        IPage page = this.getPage(request);
+        List<Lift> lifts = mapper.findByCondition(page, request);
+        page.setRecords(lifts);
+        return RestResponse.ok(page);
+    }
+
+    /**
+     * @description 新增电梯
+     * @date 2019/11/27 2:22 PM
+     * @param
+     * @return
+     */
+    public RestResponse add(Lift lift){
+        Integer result = mapper.insertSelective(lift);
+        return RestResponse.ok(result);
+    }
+
+    /**
+     * @description 修改电梯
+     * @date 2019/11/27 2:22 PM
+     * @param
+     * @return
+     */
+    public RestResponse modify(Lift lift){
+        Integer result = mapper.updateByPrimaryKeySelective(lift);
+        return RestResponse.ok(result);
+    }
+}

lift-manager-service/src/main/java/cn/com/ty/lift/manger/mangeriot/controller/ManagerIotController.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.manger.mangeriot.controller;
+package cn.com.ty.lift.manager.mangeriot.controller;
 
 import org.springframework.web.bind.annotation.RestController;
 

lift-manager-service/src/main/java/cn/com/ty/lift/manger/mangeriot/service/ManagerIotService.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.manger.mangeriot.service;
+package cn.com.ty.lift.manager.mangeriot.service;
 
 import org.springframework.stereotype.Service;
 

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

@@ -1,21 +0,0 @@
-package cn.com.ty.lift.manger.dao.mapper;
-
-import cn.com.ty.lift.manger.dao.entity.Lift;
-
-/**
- * MyBatis Mapper 接口 - 表：lift
- * @since 2019-11-25 17:37:16
- */
-public interface LiftMapper {
-	int deleteByPrimaryKey(Long id);
-
-	int insert(Lift record);
-
-	int insertSelective(Lift record);
-
-	Lift selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(Lift record);
-
-	int updateByPrimaryKey(Lift record);
-}

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

@@ -1,9 +0,0 @@
-package cn.com.ty.lift.manger.library.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/library")
-public class LibraryController {
-}

lift-manager-service/src/main/java/cn/com/ty/lift/manger/library/service/ILibraryService.java

@@ -1,10 +0,0 @@
-package cn.com.ty.lift.manger.library.service;
-
-/**
- * @remark 电梯库服务类
- * @author bieao - 2019-11-25 18:02:09
- */
-public interface ILibraryService {
-
-	
-}

lift-manager-service/src/main/java/cn/com/ty/lift/manger/library/service/impl/LibraryService.java

@@ -1,11 +0,0 @@
-package cn.com.ty.lift.manger.library.service.impl;
-
-
-import cn.com.ty.lift.manger.library.service.ILibraryService;
-import org.springframework.stereotype.Service;
-
-@Service("ILibraryService")
-public class LibraryService implements ILibraryService {
-
-
-}

lift-manager-service/src/main/resources/application.yml

@@ -3,13 +3,16 @@ server:
 
 spring:
   application:
-    name: lift-manger-service
+    name: lift-manager-service
   profiles:
     active: dev
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/portal?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
-    username: mysql
-    password: mysql
+    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
+    username: root
+    password: ms.c88pocY/
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**Mapper.xml
 
 #自动添加createTime、isDelete 等字段
 xwy:

lift-manager-service/src/main/resources/cn.com.ty.lift.manager.mapper/LiftMapper.xml

@@ -1,18 +1,18 @@
 <?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.mapper.LiftMapper" >
-	<resultMap id="BaseResultMap" type="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" />
-		<result column="type" property="type" jdbcType="INTEGER" />
-		<result column="code" property="code" jdbcType="CHAR" />
+		<result column="lift_type" property="liftType" jdbcType="INTEGER" />
+		<result column="lift_code" property="liftCode" jdbcType="CHAR" />
 		<result column="manufacture_date" property="manufactureDate" jdbcType="DATE" />
 		<result column="factory_code" property="factoryCode" jdbcType="VARCHAR" />
-		<result column="usage" property="usage" jdbcType="TINYINT" />
-		<result column="brand" property="brand" jdbcType="VARCHAR" />
+		<result column="device_usage" property="deviceUsage" jdbcType="TINYINT" />
+		<result column="lift_brand" property="liftBrand" jdbcType="VARCHAR" />
 		<result column="install_company" property="installCompany" jdbcType="VARCHAR" />
-		<result column="model" property="model" jdbcType="VARCHAR" />
+		<result column="lift_model" property="liftModel" jdbcType="VARCHAR" />
 		<result column="pulley_diameter" property="pulleyDiameter" jdbcType="DECIMAL" />
 		<result column="rope_num" property="ropeNum" jdbcType="INTEGER" />
 		<result column="lock_model" property="lockModel" jdbcType="VARCHAR" />
@@ -26,7 +26,7 @@
 		<result column="layer_station_door" property="layerStationDoor" jdbcType="VARCHAR" />
 		<result column="clamp_type" property="clampType" jdbcType="TINYINT" />
 		<result column="reform_company" property="reformCompany" jdbcType="VARCHAR" />
-		<result column="position" property="position" jdbcType="VARCHAR" />
+		<result column="device_position" property="devicePosition" jdbcType="VARCHAR" />
 		<result column="coordinate" property="coordinate" jdbcType="VARCHAR" />
 		<result column="remarks" property="remarks" jdbcType="VARCHAR" />
 		<result column="creator_id" property="creatorId" jdbcType="BIGINT" />
@@ -38,17 +38,17 @@
 		<result column="control_type" property="controlType" jdbcType="VARCHAR" />
 		<result column="mpa" property="mpa" jdbcType="INTEGER" />
 		<result column="factory" property="factory" jdbcType="VARCHAR" />
-		<result column="code1" property="code1" jdbcType="VARCHAR" />
-		<result column="use_company_code" property="useCompanyCode" jdbcType="VARCHAR" />
+		<result column="custom_number" property="customNumber" jdbcType="VARCHAR" />
+		<result column="company_code" property="companyCode" jdbcType="VARCHAR" />
 	</resultMap>
 
 	<sql id="Base_Column_List" >
-		id, registration_code, category, type, code, manufacture_date, factory_code, usage, 
-		brand, install_company, model, pulley_diameter, rope_num, lock_model, rated_load, 
-		promote_height, step_width, sidewalk_length, tilt_angle, motor_power, rated_speed, 
-		layer_station_door, clamp_type, reform_company, position, coordinate, remarks, creator_id, 
-		create_date, steel_belt, cylinder_type, cylinder_num, top_type, control_type, mpa, 
-		factory, code1, use_company_code
+		id, registration_code, category, lift_type, lift_code, manufacture_date, factory_code,
+		device_usage, lift_brand, install_company, lift_model, pulley_diameter, rope_num,
+		lock_model, rated_load, promote_height, step_width, sidewalk_length, tilt_angle,
+		motor_power, rated_speed, layer_station_door, clamp_type, reform_company, device_position,
+		coordinate, remarks, creator_id, create_date, steel_belt, cylinder_type, cylinder_num,
+		top_type, control_type, mpa, factory, custom_number, company_code
 	</sql>
 
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -58,41 +58,59 @@
 		where id = #{id,jdbcType=BIGINT}
 	</select>
 
+	<!-- 根据区域，项目，电梯号，电梯品牌，电梯类型，维保工查询电梯列表信息-->
+	<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,
+         lift_brand as liftBrand,
+         lift_type as liftType,
+         device_position as devicePosition
+		FROM lift
+		WHERE 1=1
+		<if test="request.liftBrand!=null and request.liftBrand!=''">
+			and lift_brand = #{request.liftBrand,jdbcType=VARCHAR}
+		</if>
+		<if test="request.liftType!=null and request.liftType!=''">
+			and lift_type = #{request.liftType,jdbcType=VARCHAR}
+		</if>
+	</select>
+
 	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
 		delete from lift
 		where id = #{id,jdbcType=BIGINT}
 	</delete>
 
-	<insert id="insert" parameterType="cn.com.ty.lift.entity.Lift" >
-		insert into lift (id, registration_code, category, 
-			type, code, manufacture_date, 
-			factory_code, usage, brand, 
-			install_company, model, pulley_diameter, 
-			rope_num, lock_model, rated_load, 
-			promote_height, step_width, sidewalk_length, 
-			tilt_angle, motor_power, rated_speed, 
-			layer_station_door, clamp_type, reform_company, 
-			position, coordinate, remarks, 
-			creator_id, create_date, steel_belt, 
-			cylinder_type, cylinder_num, top_type, 
-			control_type, mpa, factory, 
-			code1, use_company_code)
-		values (#{id,jdbcType=BIGINT}, #{registrationCode,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT}, 
-			#{type,jdbcType=INTEGER}, #{code,jdbcType=CHAR}, #{manufactureDate,jdbcType=DATE}, 
-			#{factoryCode,jdbcType=VARCHAR}, #{usage,jdbcType=TINYINT}, #{brand,jdbcType=VARCHAR}, 
-			#{installCompany,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{pulleyDiameter,jdbcType=DECIMAL}, 
-			#{ropeNum,jdbcType=INTEGER}, #{lockModel,jdbcType=VARCHAR}, #{ratedLoad,jdbcType=INTEGER}, 
-			#{promoteHeight,jdbcType=DECIMAL}, #{stepWidth,jdbcType=DECIMAL}, #{sidewalkLength,jdbcType=DECIMAL}, 
-			#{tiltAngle,jdbcType=DECIMAL}, #{motorPower,jdbcType=DECIMAL}, #{ratedSpeed,jdbcType=DECIMAL}, 
-			#{layerStationDoor,jdbcType=VARCHAR}, #{clampType,jdbcType=TINYINT}, #{reformCompany,jdbcType=VARCHAR}, 
-			#{position,jdbcType=VARCHAR}, #{coordinate,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
-			#{creatorId,jdbcType=BIGINT}, #{createDate,jdbcType=TIMESTAMP}, #{steelBelt,jdbcType=INTEGER}, 
-			#{cylinderType,jdbcType=VARCHAR}, #{cylinderNum,jdbcType=INTEGER}, #{topType,jdbcType=TINYINT}, 
-			#{controlType,jdbcType=VARCHAR}, #{mpa,jdbcType=INTEGER}, #{factory,jdbcType=VARCHAR}, 
-			#{code1,jdbcType=VARCHAR}, #{useCompanyCode,jdbcType=VARCHAR})
+	<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,
+			install_company, lift_model, pulley_diameter,
+			rope_num, lock_model, rated_load,
+			promote_height, step_width, sidewalk_length,
+			tilt_angle, motor_power, rated_speed,
+			layer_station_door, clamp_type, reform_company,
+			device_position, coordinate, remarks,
+			creator_id, create_date, steel_belt,
+			cylinder_type, cylinder_num, top_type,
+			control_type, mpa, factory,
+			custom_number, company_code)
+		values (#{id,jdbcType=BIGINT}, #{registrationCode,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT},
+			#{liftType,jdbcType=INTEGER}, #{liftCode,jdbcType=CHAR}, #{manufactureDate,jdbcType=DATE},
+			#{factoryCode,jdbcType=VARCHAR}, #{deviceUsage,jdbcType=TINYINT}, #{liftBrand,jdbcType=VARCHAR},
+			#{installCompany,jdbcType=VARCHAR}, #{liftModel,jdbcType=VARCHAR}, #{pulleyDiameter,jdbcType=DECIMAL},
+			#{ropeNum,jdbcType=INTEGER}, #{lockModel,jdbcType=VARCHAR}, #{ratedLoad,jdbcType=INTEGER},
+			#{promoteHeight,jdbcType=DECIMAL}, #{stepWidth,jdbcType=DECIMAL}, #{sidewalkLength,jdbcType=DECIMAL},
+			#{tiltAngle,jdbcType=DECIMAL}, #{motorPower,jdbcType=DECIMAL}, #{ratedSpeed,jdbcType=DECIMAL},
+			#{layerStationDoor,jdbcType=VARCHAR}, #{clampType,jdbcType=TINYINT}, #{reformCompany,jdbcType=VARCHAR},
+			#{devicePosition,jdbcType=VARCHAR}, #{coordinate,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR},
+			#{creatorId,jdbcType=BIGINT}, #{createDate,jdbcType=TIMESTAMP}, #{steelBelt,jdbcType=INTEGER},
+			#{cylinderType,jdbcType=VARCHAR}, #{cylinderNum,jdbcType=INTEGER}, #{topType,jdbcType=TINYINT},
+			#{controlType,jdbcType=VARCHAR}, #{mpa,jdbcType=INTEGER}, #{factory,jdbcType=VARCHAR},
+			#{customNumber,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR})
 	</insert>
 
-	<insert id="insertSelective" parameterType="cn.com.ty.lift.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" >
@@ -104,11 +122,11 @@
 			<if test="category != null" >
 				category,
 			</if>
-			<if test="type != null" >
-				type,
+			<if test="liftType != null" >
+				lift_type,
 			</if>
-			<if test="code != null" >
-				code,
+			<if test="liftCode != null" >
+				lift_code,
 			</if>
 			<if test="manufactureDate != null" >
 				manufacture_date,
@@ -116,17 +134,17 @@
 			<if test="factoryCode != null" >
 				factory_code,
 			</if>
-			<if test="usage != null" >
-				usage,
+			<if test="deviceUsage != null" >
+				device_usage,
 			</if>
-			<if test="brand != null" >
-				brand,
+			<if test="liftBrand != null" >
+				lift_brand,
 			</if>
 			<if test="installCompany != null" >
 				install_company,
 			</if>
-			<if test="model != null" >
-				model,
+			<if test="liftModel != null" >
+				lift_model,
 			</if>
 			<if test="pulleyDiameter != null" >
 				pulley_diameter,
@@ -167,8 +185,8 @@
 			<if test="reformCompany != null" >
 				reform_company,
 			</if>
-			<if test="position != null" >
-				position,
+			<if test="devicePosition != null" >
+				device_position,
 			</if>
 			<if test="coordinate != null" >
 				coordinate,
@@ -203,11 +221,11 @@
 			<if test="factory != null" >
 				factory,
 			</if>
-			<if test="code1 != null" >
-				code1,
+			<if test="customNumber != null" >
+				custom_number,
 			</if>
-			<if test="useCompanyCode != null" >
-				use_company_code,
+			<if test="companyCode != null" >
+				company_code,
 			</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -220,11 +238,11 @@
 			<if test="category != null" >
 				#{category,jdbcType=TINYINT},
 			</if>
-			<if test="type != null" >
-				#{type,jdbcType=INTEGER},
+			<if test="liftType != null" >
+				#{liftType,jdbcType=INTEGER},
 			</if>
-			<if test="code != null" >
-				#{code,jdbcType=CHAR},
+			<if test="liftCode != null" >
+				#{liftCode,jdbcType=CHAR},
 			</if>
 			<if test="manufactureDate != null" >
 				#{manufactureDate,jdbcType=DATE},
@@ -232,17 +250,17 @@
 			<if test="factoryCode != null" >
 				#{factoryCode,jdbcType=VARCHAR},
 			</if>
-			<if test="usage != null" >
-				#{usage,jdbcType=TINYINT},
+			<if test="deviceUsage != null" >
+				#{deviceUsage,jdbcType=TINYINT},
 			</if>
-			<if test="brand != null" >
-				#{brand,jdbcType=VARCHAR},
+			<if test="liftBrand != null" >
+				#{liftBrand,jdbcType=VARCHAR},
 			</if>
 			<if test="installCompany != null" >
 				#{installCompany,jdbcType=VARCHAR},
 			</if>
-			<if test="model != null" >
-				#{model,jdbcType=VARCHAR},
+			<if test="liftModel != null" >
+				#{liftModel,jdbcType=VARCHAR},
 			</if>
 			<if test="pulleyDiameter != null" >
 				#{pulleyDiameter,jdbcType=DECIMAL},
@@ -283,8 +301,8 @@
 			<if test="reformCompany != null" >
 				#{reformCompany,jdbcType=VARCHAR},
 			</if>
-			<if test="position != null" >
-				#{position,jdbcType=VARCHAR},
+			<if test="devicePosition != null" >
+				#{devicePosition,jdbcType=VARCHAR},
 			</if>
 			<if test="coordinate != null" >
 				#{coordinate,jdbcType=VARCHAR},
@@ -319,16 +337,16 @@
 			<if test="factory != null" >
 				#{factory,jdbcType=VARCHAR},
 			</if>
-			<if test="code1 != null" >
-				#{code1,jdbcType=VARCHAR},
+			<if test="customNumber != null" >
+				#{customNumber,jdbcType=VARCHAR},
 			</if>
-			<if test="useCompanyCode != null" >
-				#{useCompanyCode,jdbcType=VARCHAR},
+			<if test="companyCode != null" >
+				#{companyCode,jdbcType=VARCHAR},
 			</if>
 		</trim>
 	</insert>
 
-	<update id="updateByPrimaryKeySelective" parameterType="cn.com.ty.lift.entity.Lift" >
+	<update id="updateByPrimaryKeySelective" parameterType="cn.com.ty.lift.manager.library.dao.entity.Lift" >
 		update lift
 		<set >
 			<if test="registrationCode != null" >
@@ -337,11 +355,11 @@
 			<if test="category != null" >
 				category = #{category,jdbcType=TINYINT},
 			</if>
-			<if test="type != null" >
-				type = #{type,jdbcType=INTEGER},
+			<if test="liftType != null" >
+				lift_type = #{liftType,jdbcType=INTEGER},
 			</if>
-			<if test="code != null" >
-				code = #{code,jdbcType=CHAR},
+			<if test="liftCode != null" >
+				lift_code = #{liftCode,jdbcType=CHAR},
 			</if>
 			<if test="manufactureDate != null" >
 				manufacture_date = #{manufactureDate,jdbcType=DATE},
@@ -349,17 +367,17 @@
 			<if test="factoryCode != null" >
 				factory_code = #{factoryCode,jdbcType=VARCHAR},
 			</if>
-			<if test="usage != null" >
-				usage = #{usage,jdbcType=TINYINT},
+			<if test="deviceUsage != null" >
+				device_usage = #{deviceUsage,jdbcType=TINYINT},
 			</if>
-			<if test="brand != null" >
-				brand = #{brand,jdbcType=VARCHAR},
+			<if test="liftBrand != null" >
+				lift_brand = #{liftBrand,jdbcType=VARCHAR},
 			</if>
 			<if test="installCompany != null" >
 				install_company = #{installCompany,jdbcType=VARCHAR},
 			</if>
-			<if test="model != null" >
-				model = #{model,jdbcType=VARCHAR},
+			<if test="liftModel != null" >
+				lift_model = #{liftModel,jdbcType=VARCHAR},
 			</if>
 			<if test="pulleyDiameter != null" >
 				pulley_diameter = #{pulleyDiameter,jdbcType=DECIMAL},
@@ -400,8 +418,8 @@
 			<if test="reformCompany != null" >
 				reform_company = #{reformCompany,jdbcType=VARCHAR},
 			</if>
-			<if test="position != null" >
-				position = #{position,jdbcType=VARCHAR},
+			<if test="devicePosition != null" >
+				device_position = #{devicePosition,jdbcType=VARCHAR},
 			</if>
 			<if test="coordinate != null" >
 				coordinate = #{coordinate,jdbcType=VARCHAR},
@@ -436,28 +454,28 @@
 			<if test="factory != null" >
 				factory = #{factory,jdbcType=VARCHAR},
 			</if>
-			<if test="code1 != null" >
-				code1 = #{code1,jdbcType=VARCHAR},
+			<if test="customNumber != null" >
+				custom_number = #{customNumber,jdbcType=VARCHAR},
 			</if>
-			<if test="useCompanyCode != null" >
-				use_company_code = #{useCompanyCode,jdbcType=VARCHAR},
+			<if test="companyCode != null" >
+				company_code = #{companyCode,jdbcType=VARCHAR},
 			</if>
 		</set>
 		where id = #{id,jdbcType=BIGINT}
 	</update>
 
-	<update id="updateByPrimaryKey" parameterType="cn.com.ty.lift.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},
-			type = #{type,jdbcType=INTEGER},
-			code = #{code,jdbcType=CHAR},
+			lift_type = #{liftType,jdbcType=INTEGER},
+			lift_code = #{liftCode,jdbcType=CHAR},
 			manufacture_date = #{manufactureDate,jdbcType=DATE},
 			factory_code = #{factoryCode,jdbcType=VARCHAR},
-			usage = #{usage,jdbcType=TINYINT},
-			brand = #{brand,jdbcType=VARCHAR},
+			device_usage = #{deviceUsage,jdbcType=TINYINT},
+			lift_brand = #{liftBrand,jdbcType=VARCHAR},
 			install_company = #{installCompany,jdbcType=VARCHAR},
-			model = #{model,jdbcType=VARCHAR},
+			lift_model = #{liftModel,jdbcType=VARCHAR},
 			pulley_diameter = #{pulleyDiameter,jdbcType=DECIMAL},
 			rope_num = #{ropeNum,jdbcType=INTEGER},
 			lock_model = #{lockModel,jdbcType=VARCHAR},
@@ -471,7 +489,7 @@
 			layer_station_door = #{layerStationDoor,jdbcType=VARCHAR},
 			clamp_type = #{clampType,jdbcType=TINYINT},
 			reform_company = #{reformCompany,jdbcType=VARCHAR},
-			position = #{position,jdbcType=VARCHAR},
+			device_position = #{devicePosition,jdbcType=VARCHAR},
 			coordinate = #{coordinate,jdbcType=VARCHAR},
 			remarks = #{remarks,jdbcType=VARCHAR},
 			creator_id = #{creatorId,jdbcType=BIGINT},
@@ -483,8 +501,8 @@
 			control_type = #{controlType,jdbcType=VARCHAR},
 			mpa = #{mpa,jdbcType=INTEGER},
 			factory = #{factory,jdbcType=VARCHAR},
-			code1 = #{code1,jdbcType=VARCHAR},
-			use_company_code = #{useCompanyCode,jdbcType=VARCHAR}
+			custom_number = #{customNumber,jdbcType=VARCHAR},
+			company_code = #{companyCode,jdbcType=VARCHAR}
 		where id = #{id,jdbcType=BIGINT}
 	</update>