Merge branch 'develop' into feature-wcz

[chg] protal工程公共配置修改

.gitignore

@@ -53,7 +53,8 @@ yarn-error.log*
 */.settings
 */.project
 */.classpath
-/.factorypath
+/.factory-path
+*.log
 package-lock.json
 */node_modules/
 */dist/

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

@@ -0,0 +1,91 @@
+package cn.com.ty.lift.manger.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;
+
+	private String registrationCode;
+
+	private Byte category;
+
+	private Integer type;
+
+	private String code;
+
+	private Date manufactureDate;
+
+	private String factoryCode;
+
+	private Byte usage;
+
+	private String brand;
+
+	private String installCompany;
+
+	private String model;
+
+	private BigDecimal pulleyDiameter;
+
+	private Integer ropeNum;
+
+	private String lockModel;
+
+	private Integer ratedLoad;
+
+	private BigDecimal promoteHeight;
+
+	private BigDecimal stepWidth;
+
+	private BigDecimal sidewalkLength;
+
+	private BigDecimal tiltAngle;
+
+	private BigDecimal motorPower;
+
+	private BigDecimal ratedSpeed;
+
+	private String layerStationDoor;
+
+	private Byte clampType;
+
+	private String reformCompany;
+
+	private String position;
+
+	private String coordinate;
+
+	private String remarks;
+
+	private Long creatorId;
+
+	private Date createDate;
+
+	private Integer steelBelt;
+
+	private String cylinderType;
+
+	private Integer cylinderNum;
+
+	private Byte topType;
+
+	private String controlType;
+
+	private Integer mpa;
+
+	private String factory;
+
+	private String code1;
+
+	private String useCompanyCode;
+}

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

@@ -0,0 +1,21 @@
+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,7 +1,9 @@
 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

@@ -0,0 +1,10 @@
+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/LibraryService.java

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.manger.library.service;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class LibraryService {
-}

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

@@ -0,0 +1,11 @@
+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/cn.com.ty.lift.manager.mapper/LiftMapper.xml

@@ -0,0 +1,491 @@
+<?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" >
+		<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="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="install_company" property="installCompany" jdbcType="VARCHAR" />
+		<result column="model" property="model" 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" />
+		<result column="rated_load" property="ratedLoad" jdbcType="INTEGER" />
+		<result column="promote_height" property="promoteHeight" jdbcType="DECIMAL" />
+		<result column="step_width" property="stepWidth" jdbcType="DECIMAL" />
+		<result column="sidewalk_length" property="sidewalkLength" jdbcType="DECIMAL" />
+		<result column="tilt_angle" property="tiltAngle" jdbcType="DECIMAL" />
+		<result column="motor_power" property="motorPower" jdbcType="DECIMAL" />
+		<result column="rated_speed" property="ratedSpeed" jdbcType="DECIMAL" />
+		<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="coordinate" property="coordinate" jdbcType="VARCHAR" />
+		<result column="remarks" property="remarks" jdbcType="VARCHAR" />
+		<result column="creator_id" property="creatorId" jdbcType="BIGINT" />
+		<result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+		<result column="steel_belt" property="steelBelt" jdbcType="INTEGER" />
+		<result column="cylinder_type" property="cylinderType" jdbcType="VARCHAR" />
+		<result column="cylinder_num" property="cylinderNum" jdbcType="INTEGER" />
+		<result column="top_type" property="topType" jdbcType="TINYINT" />
+		<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" />
+	</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
+	</sql>
+
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+		select 
+		<include refid="Base_Column_List" />
+		from lift
+		where id = #{id,jdbcType=BIGINT}
+	</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>
+
+	<insert id="insertSelective" parameterType="cn.com.ty.lift.entity.Lift" >
+		insert into lift
+		<trim prefix="(" suffix=")" suffixOverrides="," >
+			<if test="id != null" >
+				id,
+			</if>
+			<if test="registrationCode != null" >
+				registration_code,
+			</if>
+			<if test="category != null" >
+				category,
+			</if>
+			<if test="type != null" >
+				type,
+			</if>
+			<if test="code != null" >
+				code,
+			</if>
+			<if test="manufactureDate != null" >
+				manufacture_date,
+			</if>
+			<if test="factoryCode != null" >
+				factory_code,
+			</if>
+			<if test="usage != null" >
+				usage,
+			</if>
+			<if test="brand != null" >
+				brand,
+			</if>
+			<if test="installCompany != null" >
+				install_company,
+			</if>
+			<if test="model != null" >
+				model,
+			</if>
+			<if test="pulleyDiameter != null" >
+				pulley_diameter,
+			</if>
+			<if test="ropeNum != null" >
+				rope_num,
+			</if>
+			<if test="lockModel != null" >
+				lock_model,
+			</if>
+			<if test="ratedLoad != null" >
+				rated_load,
+			</if>
+			<if test="promoteHeight != null" >
+				promote_height,
+			</if>
+			<if test="stepWidth != null" >
+				step_width,
+			</if>
+			<if test="sidewalkLength != null" >
+				sidewalk_length,
+			</if>
+			<if test="tiltAngle != null" >
+				tilt_angle,
+			</if>
+			<if test="motorPower != null" >
+				motor_power,
+			</if>
+			<if test="ratedSpeed != null" >
+				rated_speed,
+			</if>
+			<if test="layerStationDoor != null" >
+				layer_station_door,
+			</if>
+			<if test="clampType != null" >
+				clamp_type,
+			</if>
+			<if test="reformCompany != null" >
+				reform_company,
+			</if>
+			<if test="position != null" >
+				position,
+			</if>
+			<if test="coordinate != null" >
+				coordinate,
+			</if>
+			<if test="remarks != null" >
+				remarks,
+			</if>
+			<if test="creatorId != null" >
+				creator_id,
+			</if>
+			<if test="createDate != null" >
+				create_date,
+			</if>
+			<if test="steelBelt != null" >
+				steel_belt,
+			</if>
+			<if test="cylinderType != null" >
+				cylinder_type,
+			</if>
+			<if test="cylinderNum != null" >
+				cylinder_num,
+			</if>
+			<if test="topType != null" >
+				top_type,
+			</if>
+			<if test="controlType != null" >
+				control_type,
+			</if>
+			<if test="mpa != null" >
+				mpa,
+			</if>
+			<if test="factory != null" >
+				factory,
+			</if>
+			<if test="code1 != null" >
+				code1,
+			</if>
+			<if test="useCompanyCode != null" >
+				use_company_code,
+			</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides="," >
+			<if test="id != null" >
+				#{id,jdbcType=BIGINT},
+			</if>
+			<if test="registrationCode != null" >
+				#{registrationCode,jdbcType=VARCHAR},
+			</if>
+			<if test="category != null" >
+				#{category,jdbcType=TINYINT},
+			</if>
+			<if test="type != null" >
+				#{type,jdbcType=INTEGER},
+			</if>
+			<if test="code != null" >
+				#{code,jdbcType=CHAR},
+			</if>
+			<if test="manufactureDate != null" >
+				#{manufactureDate,jdbcType=DATE},
+			</if>
+			<if test="factoryCode != null" >
+				#{factoryCode,jdbcType=VARCHAR},
+			</if>
+			<if test="usage != null" >
+				#{usage,jdbcType=TINYINT},
+			</if>
+			<if test="brand != null" >
+				#{brand,jdbcType=VARCHAR},
+			</if>
+			<if test="installCompany != null" >
+				#{installCompany,jdbcType=VARCHAR},
+			</if>
+			<if test="model != null" >
+				#{model,jdbcType=VARCHAR},
+			</if>
+			<if test="pulleyDiameter != null" >
+				#{pulleyDiameter,jdbcType=DECIMAL},
+			</if>
+			<if test="ropeNum != null" >
+				#{ropeNum,jdbcType=INTEGER},
+			</if>
+			<if test="lockModel != null" >
+				#{lockModel,jdbcType=VARCHAR},
+			</if>
+			<if test="ratedLoad != null" >
+				#{ratedLoad,jdbcType=INTEGER},
+			</if>
+			<if test="promoteHeight != null" >
+				#{promoteHeight,jdbcType=DECIMAL},
+			</if>
+			<if test="stepWidth != null" >
+				#{stepWidth,jdbcType=DECIMAL},
+			</if>
+			<if test="sidewalkLength != null" >
+				#{sidewalkLength,jdbcType=DECIMAL},
+			</if>
+			<if test="tiltAngle != null" >
+				#{tiltAngle,jdbcType=DECIMAL},
+			</if>
+			<if test="motorPower != null" >
+				#{motorPower,jdbcType=DECIMAL},
+			</if>
+			<if test="ratedSpeed != null" >
+				#{ratedSpeed,jdbcType=DECIMAL},
+			</if>
+			<if test="layerStationDoor != null" >
+				#{layerStationDoor,jdbcType=VARCHAR},
+			</if>
+			<if test="clampType != null" >
+				#{clampType,jdbcType=TINYINT},
+			</if>
+			<if test="reformCompany != null" >
+				#{reformCompany,jdbcType=VARCHAR},
+			</if>
+			<if test="position != null" >
+				#{position,jdbcType=VARCHAR},
+			</if>
+			<if test="coordinate != null" >
+				#{coordinate,jdbcType=VARCHAR},
+			</if>
+			<if test="remarks != null" >
+				#{remarks,jdbcType=VARCHAR},
+			</if>
+			<if test="creatorId != null" >
+				#{creatorId,jdbcType=BIGINT},
+			</if>
+			<if test="createDate != null" >
+				#{createDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="steelBelt != null" >
+				#{steelBelt,jdbcType=INTEGER},
+			</if>
+			<if test="cylinderType != null" >
+				#{cylinderType,jdbcType=VARCHAR},
+			</if>
+			<if test="cylinderNum != null" >
+				#{cylinderNum,jdbcType=INTEGER},
+			</if>
+			<if test="topType != null" >
+				#{topType,jdbcType=TINYINT},
+			</if>
+			<if test="controlType != null" >
+				#{controlType,jdbcType=VARCHAR},
+			</if>
+			<if test="mpa != null" >
+				#{mpa,jdbcType=INTEGER},
+			</if>
+			<if test="factory != null" >
+				#{factory,jdbcType=VARCHAR},
+			</if>
+			<if test="code1 != null" >
+				#{code1,jdbcType=VARCHAR},
+			</if>
+			<if test="useCompanyCode != null" >
+				#{useCompanyCode,jdbcType=VARCHAR},
+			</if>
+		</trim>
+	</insert>
+
+	<update id="updateByPrimaryKeySelective" parameterType="cn.com.ty.lift.entity.Lift" >
+		update lift
+		<set >
+			<if test="registrationCode != null" >
+				registration_code = #{registrationCode,jdbcType=VARCHAR},
+			</if>
+			<if test="category != null" >
+				category = #{category,jdbcType=TINYINT},
+			</if>
+			<if test="type != null" >
+				type = #{type,jdbcType=INTEGER},
+			</if>
+			<if test="code != null" >
+				code = #{code,jdbcType=CHAR},
+			</if>
+			<if test="manufactureDate != null" >
+				manufacture_date = #{manufactureDate,jdbcType=DATE},
+			</if>
+			<if test="factoryCode != null" >
+				factory_code = #{factoryCode,jdbcType=VARCHAR},
+			</if>
+			<if test="usage != null" >
+				usage = #{usage,jdbcType=TINYINT},
+			</if>
+			<if test="brand != null" >
+				brand = #{brand,jdbcType=VARCHAR},
+			</if>
+			<if test="installCompany != null" >
+				install_company = #{installCompany,jdbcType=VARCHAR},
+			</if>
+			<if test="model != null" >
+				model = #{model,jdbcType=VARCHAR},
+			</if>
+			<if test="pulleyDiameter != null" >
+				pulley_diameter = #{pulleyDiameter,jdbcType=DECIMAL},
+			</if>
+			<if test="ropeNum != null" >
+				rope_num = #{ropeNum,jdbcType=INTEGER},
+			</if>
+			<if test="lockModel != null" >
+				lock_model = #{lockModel,jdbcType=VARCHAR},
+			</if>
+			<if test="ratedLoad != null" >
+				rated_load = #{ratedLoad,jdbcType=INTEGER},
+			</if>
+			<if test="promoteHeight != null" >
+				promote_height = #{promoteHeight,jdbcType=DECIMAL},
+			</if>
+			<if test="stepWidth != null" >
+				step_width = #{stepWidth,jdbcType=DECIMAL},
+			</if>
+			<if test="sidewalkLength != null" >
+				sidewalk_length = #{sidewalkLength,jdbcType=DECIMAL},
+			</if>
+			<if test="tiltAngle != null" >
+				tilt_angle = #{tiltAngle,jdbcType=DECIMAL},
+			</if>
+			<if test="motorPower != null" >
+				motor_power = #{motorPower,jdbcType=DECIMAL},
+			</if>
+			<if test="ratedSpeed != null" >
+				rated_speed = #{ratedSpeed,jdbcType=DECIMAL},
+			</if>
+			<if test="layerStationDoor != null" >
+				layer_station_door = #{layerStationDoor,jdbcType=VARCHAR},
+			</if>
+			<if test="clampType != null" >
+				clamp_type = #{clampType,jdbcType=TINYINT},
+			</if>
+			<if test="reformCompany != null" >
+				reform_company = #{reformCompany,jdbcType=VARCHAR},
+			</if>
+			<if test="position != null" >
+				position = #{position,jdbcType=VARCHAR},
+			</if>
+			<if test="coordinate != null" >
+				coordinate = #{coordinate,jdbcType=VARCHAR},
+			</if>
+			<if test="remarks != null" >
+				remarks = #{remarks,jdbcType=VARCHAR},
+			</if>
+			<if test="creatorId != null" >
+				creator_id = #{creatorId,jdbcType=BIGINT},
+			</if>
+			<if test="createDate != null" >
+				create_date = #{createDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="steelBelt != null" >
+				steel_belt = #{steelBelt,jdbcType=INTEGER},
+			</if>
+			<if test="cylinderType != null" >
+				cylinder_type = #{cylinderType,jdbcType=VARCHAR},
+			</if>
+			<if test="cylinderNum != null" >
+				cylinder_num = #{cylinderNum,jdbcType=INTEGER},
+			</if>
+			<if test="topType != null" >
+				top_type = #{topType,jdbcType=TINYINT},
+			</if>
+			<if test="controlType != null" >
+				control_type = #{controlType,jdbcType=VARCHAR},
+			</if>
+			<if test="mpa != null" >
+				mpa = #{mpa,jdbcType=INTEGER},
+			</if>
+			<if test="factory != null" >
+				factory = #{factory,jdbcType=VARCHAR},
+			</if>
+			<if test="code1 != null" >
+				code1 = #{code1,jdbcType=VARCHAR},
+			</if>
+			<if test="useCompanyCode != null" >
+				use_company_code = #{useCompanyCode,jdbcType=VARCHAR},
+			</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+
+	<update id="updateByPrimaryKey" parameterType="cn.com.ty.lift.entity.Lift" >
+		update lift
+		set registration_code = #{registrationCode,jdbcType=VARCHAR},
+			category = #{category,jdbcType=TINYINT},
+			type = #{type,jdbcType=INTEGER},
+			code = #{code,jdbcType=CHAR},
+			manufacture_date = #{manufactureDate,jdbcType=DATE},
+			factory_code = #{factoryCode,jdbcType=VARCHAR},
+			usage = #{usage,jdbcType=TINYINT},
+			brand = #{brand,jdbcType=VARCHAR},
+			install_company = #{installCompany,jdbcType=VARCHAR},
+			model = #{model,jdbcType=VARCHAR},
+			pulley_diameter = #{pulleyDiameter,jdbcType=DECIMAL},
+			rope_num = #{ropeNum,jdbcType=INTEGER},
+			lock_model = #{lockModel,jdbcType=VARCHAR},
+			rated_load = #{ratedLoad,jdbcType=INTEGER},
+			promote_height = #{promoteHeight,jdbcType=DECIMAL},
+			step_width = #{stepWidth,jdbcType=DECIMAL},
+			sidewalk_length = #{sidewalkLength,jdbcType=DECIMAL},
+			tilt_angle = #{tiltAngle,jdbcType=DECIMAL},
+			motor_power = #{motorPower,jdbcType=DECIMAL},
+			rated_speed = #{ratedSpeed,jdbcType=DECIMAL},
+			layer_station_door = #{layerStationDoor,jdbcType=VARCHAR},
+			clamp_type = #{clampType,jdbcType=TINYINT},
+			reform_company = #{reformCompany,jdbcType=VARCHAR},
+			position = #{position,jdbcType=VARCHAR},
+			coordinate = #{coordinate,jdbcType=VARCHAR},
+			remarks = #{remarks,jdbcType=VARCHAR},
+			creator_id = #{creatorId,jdbcType=BIGINT},
+			create_date = #{createDate,jdbcType=TIMESTAMP},
+			steel_belt = #{steelBelt,jdbcType=INTEGER},
+			cylinder_type = #{cylinderType,jdbcType=VARCHAR},
+			cylinder_num = #{cylinderNum,jdbcType=INTEGER},
+			top_type = #{topType,jdbcType=TINYINT},
+			control_type = #{controlType,jdbcType=VARCHAR},
+			mpa = #{mpa,jdbcType=INTEGER},
+			factory = #{factory,jdbcType=VARCHAR},
+			code1 = #{code1,jdbcType=VARCHAR},
+			use_company_code = #{useCompanyCode,jdbcType=VARCHAR}
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+
+</mapper>

lift-portal-service/pom.xml

@@ -18,10 +18,10 @@
         </dependency>
 
         <!--单体开发时注释掉依赖-->
-        <dependency>
-            <groupId>cn.com.xwy</groupId>
-            <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.com.xwy</groupId>-->
+<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>
 

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

@@ -7,9 +7,9 @@ spring:
   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/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
+    username: root
+    password: ms.c88pocY/
 
 #自动添加createTime、isDelete 等字段
 xwy:

lift-portal-service/src/main/resources/mapper/RoleMenuMapper.xml

@@ -1,9 +1,9 @@
 <?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.cn.com.ty.portal.dao.mapper.RoleMenuMapper">
+<mapper namespace="cn.com.ty.portal.dao.mapper.RoleMenuMapper">
 
 
-    <select id="queryMenuByRole" resultType="cn.com.ty.cn.com.ty.portal.service.model.RoleMenuModel">
+    <select id="queryMenuByRole" resultType="cn.com.ty.portal.service.model.RoleMenuModel">
         SELECT
             sr.role_code roleCode,
             sr.role_name roleName,

lift-system-service/pom.xml

@@ -18,10 +18,10 @@
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
 
-        <!--<dependency>
+        <dependency>
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>-->
+        </dependency>
 
     </dependencies>
 

lift-system-service/src/main/java/cn/com/ty/lift/system/SystemApplication.java

@@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  */
 @Slf4j
 @EnableFeignClients
-@MapperScan("cn.com.ty.**.dao.mapper")
+@MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
 public class SystemApplication {
 

lift-system-service/src/main/java/cn/com/ty/lift/system/entity/User.java

@@ -0,0 +1,22 @@
+package cn.com.ty.lift.system.entity;
+
+import lombok.Data;
+
+/**
+ * @ClassName User
+ * @Description
+ * @Author huangyuan
+ * @Date 2019-11-26 15:54
+ **/
+@Data
+public class User {
+
+    private Long id;
+
+    private String name;
+
+    private String account;
+
+    private String password;
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/entity/UserInfo.java

@@ -0,0 +1,45 @@
+package cn.com.ty.lift.system.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 实体类 - 表：user_info
+ * @since 2019-11-25 18:01:00
+ */
+@Data
+public class UserInfo {
+	private Long userId;
+
+	private String name;
+
+	private String mobile;
+
+	private Byte gender;
+
+	private Byte age;
+
+	private String remarks;
+
+	private String signature;
+
+	private Integer serviceTotal;
+
+	private Integer satisfactionTotal;
+
+	private Integer level;
+
+	private Integer maintenanceTotal;
+
+	private Integer emergencyTotal;
+
+	private Integer liftTotal;
+
+	private BigDecimal balance;
+
+	private String type;
+
+	private String avatarUrl;
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/mapper/UserInfoMapper.java

@@ -0,0 +1,25 @@
+package cn.com.ty.lift.system.mapper;
+
+import cn.com.ty.lift.system.entity.UserInfo;
+import cn.com.xwy.boot.mybatis.MyBatisMapper;
+
+/**
+ * MyBatis Mapper 接口 - 表：user_info
+ * @since 2019-11-25 18:01:00
+ */
+@MyBatisMapper
+public interface UserInfoMapper {
+	int deleteByPrimaryKey(Long userId);
+
+	int insert(UserInfo record);
+
+	int insertSelective(UserInfo record);
+
+	UserInfo selectByPrimaryKey(Long userId);
+
+	int updateByPrimaryKeySelective(UserInfo record);
+
+	int updateByPrimaryKeyWithBLOBs(UserInfo record);
+
+	int updateByPrimaryKey(UserInfo record);
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/UserController.java

@@ -1,7 +1,40 @@
-package cn.com.ty.lift.system.user.controller;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class UserController {
-}
+package cn.com.ty.lift.system.user.controller;
+
+import cn.com.ty.lift.system.entity.User;
+import cn.com.ty.lift.system.entity.UserInfo;
+import cn.com.ty.lift.system.user.service.impl.UserService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping("/login")
+    @ResponseBody
+    public User getUser(String userId){
+        User user = userService.getUserById(userId);
+        return user;
+    }
+
+    /**
+     * @description
+     * @date 2019/11/27 10:03 AM
+     * @param
+     * @return
+     */
+    @PostMapping("/addUser")
+    @ResponseBody
+    public Object addUserInfo(UserInfo userInfo){
+        userService.saveUserInfo(userInfo);
+        return RestResponse.ok(UserInfo.class, "success");
+    }
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IUserService.java

@@ -0,0 +1,22 @@
+package cn.com.ty.lift.system.user.service;
+
+import cn.com.ty.lift.system.entity.User;
+import cn.com.ty.lift.system.entity.UserInfo;
+
+/**
+ * <h1>.</h1><BR>
+ * @author huangyuan - 2019-11-25 18:36:53
+ */
+public interface IUserService{
+
+    /*
+     *@Author huangyuan
+     *@Description 通过用户id获取用户信息
+     *@Date 15:57 2019-11-26
+     *@Param [userId]
+     *@return cn.com.ty.lift.system.entity.User
+     **/
+    User getUserById(String userId);
+
+    void saveUserInfo(UserInfo userInfo);
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/UserService.java

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.system.user.service;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserService {
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -0,0 +1,35 @@
+package cn.com.ty.lift.system.user.service.impl;
+
+import cn.com.ty.lift.system.entity.User;
+import cn.com.ty.lift.system.entity.UserInfo;
+import cn.com.ty.lift.system.mapper.UserInfoMapper;
+import cn.com.ty.lift.system.user.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <h1>.</h1><BR>
+ * @author huangyuan - 2019-11-25 18:36:53
+ */
+@Service("IUserService")
+@Transactional
+public class UserService implements IUserService {
+
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    public User getUserById(String userId) {
+        User user = new User();
+        user.setId(1L);
+        user.setAccount("huangyuan");
+        user.setName("黄远");
+        user.setPassword("123456");
+        return user;
+    }
+
+    @Override
+    public void saveUserInfo(UserInfo userInfo) {
+        userInfoMapper.insert(userInfo);
+    }
+}

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

@@ -1,5 +1,13 @@
 server:
   port: 20230
+  tomcat:
+    basedir: /Users/huangyuan/application/tomcat/data/tomcat_temp
+
+
+
+# mybatis-plus配置
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**Mapper.xml
 
 spring:
   application:
@@ -7,12 +15,14 @@ spring:
   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/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
+    username: root
+    password: ms.c88pocY/
+
 
 #自动添加createTime、isDelete 等字段
 xwy:
   mybatis:
     audit:
-      enabled: true
+      enabled: true
+

lift-system-service/src/main/resources/mapper/UserInfoMapper.xml

@@ -0,0 +1,259 @@
+<?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.system.mapper.UserInfoMapper" >
+	<resultMap id="BaseResultMap" type="cn.com.ty.lift.system.entity.UserInfo" >
+		<id column="user_id" property="userId" jdbcType="BIGINT" />
+		<result column="name" property="name" jdbcType="VARCHAR" />
+		<result column="mobile" property="mobile" jdbcType="CHAR" />
+		<result column="gender" property="gender" jdbcType="TINYINT" />
+		<result column="age" property="age" jdbcType="TINYINT" />
+		<result column="remarks" property="remarks" jdbcType="VARCHAR" />
+		<result column="signature" property="signature" jdbcType="VARCHAR" />
+		<result column="service_total" property="serviceTotal" jdbcType="INTEGER" />
+		<result column="satisfaction_total" property="satisfactionTotal" jdbcType="INTEGER" />
+		<result column="level" property="level" jdbcType="INTEGER" />
+		<result column="maintenance_total" property="maintenanceTotal" jdbcType="INTEGER" />
+		<result column="emergency_total" property="emergencyTotal" jdbcType="INTEGER" />
+		<result column="lift_total" property="liftTotal" jdbcType="INTEGER" />
+		<result column="balance" property="balance" jdbcType="DECIMAL" />
+		<result column="type" property="type" jdbcType="VARCHAR" />
+	</resultMap>
+
+	<resultMap id="ResultMapWithBLOBs" type="cn.com.ty.lift.system.entity.UserInfo" extends="BaseResultMap" >
+		<result column="avatar_url" property="avatarUrl" jdbcType="LONGVARCHAR" />
+	</resultMap>
+
+	<sql id="Base_Column_List" >
+		user_id, name, mobile, gender, age, remarks, signature, service_total, satisfaction_total, 
+		level, maintenance_total, emergency_total, lift_total, balance, type
+	</sql>
+
+	<sql id="Blob_Column_List" >
+		avatar_url
+	</sql>
+
+	<select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Long" >
+		select 
+		<include refid="Base_Column_List" />
+		,
+		<include refid="Blob_Column_List" />
+		from user_info
+		where user_id = #{userId,jdbcType=BIGINT}
+	</select>
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+		delete from user_info
+		where user_id = #{userId,jdbcType=BIGINT}
+	</delete>
+
+	<insert id="insert" parameterType="cn.com.ty.lift.system.entity.UserInfo" >
+		insert into user_info (user_id, name, mobile, 
+			gender, age, remarks, 
+			signature, service_total, satisfaction_total, 
+			level, maintenance_total, emergency_total, 
+			lift_total, balance, type, 
+			avatar_url)
+		values (#{userId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{mobile,jdbcType=CHAR}, 
+			#{gender,jdbcType=TINYINT}, #{age,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}, 
+			#{signature,jdbcType=VARCHAR}, #{serviceTotal,jdbcType=INTEGER}, #{satisfactionTotal,jdbcType=INTEGER}, 
+			#{level,jdbcType=INTEGER}, #{maintenanceTotal,jdbcType=INTEGER}, #{emergencyTotal,jdbcType=INTEGER}, 
+			#{liftTotal,jdbcType=INTEGER}, #{balance,jdbcType=DECIMAL}, #{type,jdbcType=VARCHAR}, 
+			#{avatarUrl,jdbcType=LONGVARCHAR})
+	</insert>
+
+	<insert id="insertSelective" parameterType="cn.com.ty.lift.system.entity.UserInfo" >
+		insert into user_info
+		<trim prefix="(" suffix=")" suffixOverrides="," >
+			<if test="userId != null" >
+				user_id,
+			</if>
+			<if test="name != null" >
+				name,
+			</if>
+			<if test="mobile != null" >
+				mobile,
+			</if>
+			<if test="gender != null" >
+				gender,
+			</if>
+			<if test="age != null" >
+				age,
+			</if>
+			<if test="remarks != null" >
+				remarks,
+			</if>
+			<if test="signature != null" >
+				signature,
+			</if>
+			<if test="serviceTotal != null" >
+				service_total,
+			</if>
+			<if test="satisfactionTotal != null" >
+				satisfaction_total,
+			</if>
+			<if test="level != null" >
+				level,
+			</if>
+			<if test="maintenanceTotal != null" >
+				maintenance_total,
+			</if>
+			<if test="emergencyTotal != null" >
+				emergency_total,
+			</if>
+			<if test="liftTotal != null" >
+				lift_total,
+			</if>
+			<if test="balance != null" >
+				balance,
+			</if>
+			<if test="type != null" >
+				type,
+			</if>
+			<if test="avatarUrl != null" >
+				avatar_url,
+			</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides="," >
+			<if test="userId != null" >
+				#{userId,jdbcType=BIGINT},
+			</if>
+			<if test="name != null" >
+				#{name,jdbcType=VARCHAR},
+			</if>
+			<if test="mobile != null" >
+				#{mobile,jdbcType=CHAR},
+			</if>
+			<if test="gender != null" >
+				#{gender,jdbcType=TINYINT},
+			</if>
+			<if test="age != null" >
+				#{age,jdbcType=TINYINT},
+			</if>
+			<if test="remarks != null" >
+				#{remarks,jdbcType=VARCHAR},
+			</if>
+			<if test="signature != null" >
+				#{signature,jdbcType=VARCHAR},
+			</if>
+			<if test="serviceTotal != null" >
+				#{serviceTotal,jdbcType=INTEGER},
+			</if>
+			<if test="satisfactionTotal != null" >
+				#{satisfactionTotal,jdbcType=INTEGER},
+			</if>
+			<if test="level != null" >
+				#{level,jdbcType=INTEGER},
+			</if>
+			<if test="maintenanceTotal != null" >
+				#{maintenanceTotal,jdbcType=INTEGER},
+			</if>
+			<if test="emergencyTotal != null" >
+				#{emergencyTotal,jdbcType=INTEGER},
+			</if>
+			<if test="liftTotal != null" >
+				#{liftTotal,jdbcType=INTEGER},
+			</if>
+			<if test="balance != null" >
+				#{balance,jdbcType=DECIMAL},
+			</if>
+			<if test="type != null" >
+				#{type,jdbcType=VARCHAR},
+			</if>
+			<if test="avatarUrl != null" >
+				#{avatarUrl,jdbcType=LONGVARCHAR},
+			</if>
+		</trim>
+	</insert>
+
+	<update id="updateByPrimaryKeySelective" parameterType="cn.com.ty.lift.system.entity.UserInfo" >
+		update user_info
+		<set >
+			<if test="name != null" >
+				name = #{name,jdbcType=VARCHAR},
+			</if>
+			<if test="mobile != null" >
+				mobile = #{mobile,jdbcType=CHAR},
+			</if>
+			<if test="gender != null" >
+				gender = #{gender,jdbcType=TINYINT},
+			</if>
+			<if test="age != null" >
+				age = #{age,jdbcType=TINYINT},
+			</if>
+			<if test="remarks != null" >
+				remarks = #{remarks,jdbcType=VARCHAR},
+			</if>
+			<if test="signature != null" >
+				signature = #{signature,jdbcType=VARCHAR},
+			</if>
+			<if test="serviceTotal != null" >
+				service_total = #{serviceTotal,jdbcType=INTEGER},
+			</if>
+			<if test="satisfactionTotal != null" >
+				satisfaction_total = #{satisfactionTotal,jdbcType=INTEGER},
+			</if>
+			<if test="level != null" >
+				level = #{level,jdbcType=INTEGER},
+			</if>
+			<if test="maintenanceTotal != null" >
+				maintenance_total = #{maintenanceTotal,jdbcType=INTEGER},
+			</if>
+			<if test="emergencyTotal != null" >
+				emergency_total = #{emergencyTotal,jdbcType=INTEGER},
+			</if>
+			<if test="liftTotal != null" >
+				lift_total = #{liftTotal,jdbcType=INTEGER},
+			</if>
+			<if test="balance != null" >
+				balance = #{balance,jdbcType=DECIMAL},
+			</if>
+			<if test="type != null" >
+				type = #{type,jdbcType=VARCHAR},
+			</if>
+			<if test="avatarUrl != null" >
+				avatar_url = #{avatarUrl,jdbcType=LONGVARCHAR},
+			</if>
+		</set>
+		where user_id = #{userId,jdbcType=BIGINT}
+	</update>
+
+	<update id="updateByPrimaryKeyWithBLOBs" parameterType="cn.com.ty.lift.system.entity.UserInfo" >
+		update user_info
+		set name = #{name,jdbcType=VARCHAR},
+			mobile = #{mobile,jdbcType=CHAR},
+			gender = #{gender,jdbcType=TINYINT},
+			age = #{age,jdbcType=TINYINT},
+			remarks = #{remarks,jdbcType=VARCHAR},
+			signature = #{signature,jdbcType=VARCHAR},
+			service_total = #{serviceTotal,jdbcType=INTEGER},
+			satisfaction_total = #{satisfactionTotal,jdbcType=INTEGER},
+			level = #{level,jdbcType=INTEGER},
+			maintenance_total = #{maintenanceTotal,jdbcType=INTEGER},
+			emergency_total = #{emergencyTotal,jdbcType=INTEGER},
+			lift_total = #{liftTotal,jdbcType=INTEGER},
+			balance = #{balance,jdbcType=DECIMAL},
+			type = #{type,jdbcType=VARCHAR},
+			avatar_url = #{avatarUrl,jdbcType=LONGVARCHAR}
+		where user_id = #{userId,jdbcType=BIGINT}
+	</update>
+
+	<update id="updateByPrimaryKey" parameterType="cn.com.ty.lift.system.entity.UserInfo" >
+		update user_info
+		set name = #{name,jdbcType=VARCHAR},
+			mobile = #{mobile,jdbcType=CHAR},
+			gender = #{gender,jdbcType=TINYINT},
+			age = #{age,jdbcType=TINYINT},
+			remarks = #{remarks,jdbcType=VARCHAR},
+			signature = #{signature,jdbcType=VARCHAR},
+			service_total = #{serviceTotal,jdbcType=INTEGER},
+			satisfaction_total = #{satisfactionTotal,jdbcType=INTEGER},
+			level = #{level,jdbcType=INTEGER},
+			maintenance_total = #{maintenanceTotal,jdbcType=INTEGER},
+			emergency_total = #{emergencyTotal,jdbcType=INTEGER},
+			lift_total = #{liftTotal,jdbcType=INTEGER},
+			balance = #{balance,jdbcType=DECIMAL},
+			type = #{type,jdbcType=VARCHAR}
+		where user_id = #{userId,jdbcType=BIGINT}
+	</update>
+
+</mapper>