Bläddra i källkod

Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

wutt 5 år sedan
förälder
incheckning
0d7d429196

+ 1 - 1
cloud-socket/src/com/js/kbt/UserTempGenConfig.xml

@@ -11,7 +11,7 @@
     <javaModelGenerator targetPackage="com.js.kbt.model" targetProject="cloud-socket" />
     <sqlMapGenerator targetPackage="com.js.kbt.mapper" targetProject="cloud-socket" />
     <javaClientGenerator targetPackage="com.js.kbt.mapper" targetProject="cloud-socket" type="XMLMAPPER" />
-    <table schema="cloud_model_test" tableName="change_ip_command" >
+    <table schema="cloud_model" tableName="time_calibration_record" >
     	<generatedKey column="id" identity="true" sqlStatement="SELECT LAST_INSERT_ID()"/>
     </table>
 <!--     <table schema="cloud_model" tableName="tb_mould_equipment" > -->

+ 57 - 77
cloud-socket/src/com/js/kbt/mapper/TimeCalibrationRecordMapper.java

@@ -7,92 +7,72 @@ import org.apache.ibatis.annotations.Param;
 
 public interface TimeCalibrationRecordMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    long countByExample(TimeCalibrationRecordExample example);
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	long countByExample(TimeCalibrationRecordExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int deleteByExample(TimeCalibrationRecordExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int deleteByExample(TimeCalibrationRecordExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int insert(TimeCalibrationRecord record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int insert(TimeCalibrationRecord record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int insertSelective(TimeCalibrationRecord record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int insertSelective(TimeCalibrationRecord record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    List<TimeCalibrationRecord> selectByExample(TimeCalibrationRecordExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	List<TimeCalibrationRecord> selectByExample(TimeCalibrationRecordExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    TimeCalibrationRecord selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	TimeCalibrationRecord selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") TimeCalibrationRecord record, @Param("example") TimeCalibrationRecordExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TimeCalibrationRecord record,
+			@Param("example") TimeCalibrationRecordExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int updateByExample(@Param("record") TimeCalibrationRecord record, @Param("example") TimeCalibrationRecordExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int updateByExample(@Param("record") TimeCalibrationRecord record,
+			@Param("example") TimeCalibrationRecordExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int updateByPrimaryKeySelective(TimeCalibrationRecord record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TimeCalibrationRecord record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    int updateByPrimaryKey(TimeCalibrationRecord record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	int updateByPrimaryKey(TimeCalibrationRecord record);
 
-    List<TimeCalibrationRecord> selectCountByToday();
+	List<TimeCalibrationRecord> selectCountByToday(@Param("equipmentNo")String equipmentNo);
 }

+ 36 - 20
cloud-socket/src/com/js/kbt/mapper/TimeCalibrationRecordMapper.xml

@@ -5,16 +5,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="indate" jdbcType="TIMESTAMP" property="indate" />
+    <result column="equipment_no" jdbcType="VARCHAR" property="equipmentNo" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -48,7 +49,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -82,15 +83,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
-    id, indate
+    id, indate, equipment_no
   </sql>
   <select id="selectByExample" parameterType="com.js.kbt.model.TimeCalibrationRecordExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     select
     <if test="distinct">
@@ -109,7 +110,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -120,7 +121,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     delete from time_calibration_record
     where id = #{id,jdbcType=INTEGER}
@@ -129,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     delete from time_calibration_record
     <if test="_parameter != null">
@@ -140,19 +141,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into time_calibration_record (indate)
-    values (#{indate,jdbcType=TIMESTAMP})
+    insert into time_calibration_record (indate, equipment_no)
+    values (#{indate,jdbcType=TIMESTAMP}, #{equipmentNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.js.kbt.model.TimeCalibrationRecord">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -162,18 +163,24 @@
       <if test="indate != null">
         indate,
       </if>
+      <if test="equipmentNo != null">
+        equipment_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="indate != null">
         #{indate,jdbcType=TIMESTAMP},
       </if>
+      <if test="equipmentNo != null">
+        #{equipmentNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.js.kbt.model.TimeCalibrationRecordExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     select count(*) from time_calibration_record
     <if test="_parameter != null">
@@ -184,7 +191,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     update time_calibration_record
     <set>
@@ -194,6 +201,9 @@
       <if test="record.indate != null">
         indate = #{record.indate,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.equipmentNo != null">
+        equipment_no = #{record.equipmentNo,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -203,11 +213,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     update time_calibration_record
     set id = #{record.id,jdbcType=INTEGER},
-      indate = #{record.indate,jdbcType=TIMESTAMP}
+      indate = #{record.indate,jdbcType=TIMESTAMP},
+      equipment_no = #{record.equipmentNo,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -216,13 +227,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     update time_calibration_record
     <set>
       <if test="indate != null">
         indate = #{indate,jdbcType=TIMESTAMP},
       </if>
+      <if test="equipmentNo != null">
+        equipment_no = #{equipmentNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -230,10 +244,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 15:45:15 CST 2019.
+      This element was generated on Thu Nov 28 14:50:56 CST 2019.
     -->
     update time_calibration_record
-    set indate = #{indate,jdbcType=TIMESTAMP}
+    set indate = #{indate,jdbcType=TIMESTAMP},
+      equipment_no = #{equipmentNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -243,6 +258,7 @@
    time_calibration_record
   WHERE 
   TO_DAYS(indate) = TO_DAYS(NOW())
+  and equipment_no = #{equipmentNo}
   </select>
   
 </mapper>

+ 65 - 60
cloud-socket/src/com/js/kbt/model/TimeCalibrationRecord.java

@@ -3,69 +3,74 @@ package com.js.kbt.model;
 import java.util.Date;
 
 public class TimeCalibrationRecord {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column time_calibration_record.id
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column time_calibration_record.indate
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    private Date indate;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column time_calibration_record.id
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column time_calibration_record.indate
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	private Date indate;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column time_calibration_record.equipment_no
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	private String equipmentNo;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column time_calibration_record.id
-     *
-     * @return the value of time_calibration_record.id
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column time_calibration_record.id
+	 * @return  the value of time_calibration_record.id
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column time_calibration_record.id
-     *
-     * @param id the value for time_calibration_record.id
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column time_calibration_record.id
+	 * @param id  the value for time_calibration_record.id
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column time_calibration_record.indate
-     *
-     * @return the value of time_calibration_record.indate
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public Date getIndate() {
-        return indate;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column time_calibration_record.indate
+	 * @return  the value of time_calibration_record.indate
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public Date getIndate() {
+		return indate;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column time_calibration_record.indate
-     *
-     * @param indate the value for time_calibration_record.indate
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public void setIndate(Date indate) {
-        this.indate = indate;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column time_calibration_record.indate
+	 * @param indate  the value for time_calibration_record.indate
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void setIndate(Date indate) {
+		this.indate = indate;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column time_calibration_record.equipment_no
+	 * @return  the value of time_calibration_record.equipment_no
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public String getEquipmentNo() {
+		return equipmentNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column time_calibration_record.equipment_no
+	 * @param equipmentNo  the value for time_calibration_record.equipment_no
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void setEquipmentNo(String equipmentNo) {
+		this.equipmentNo = equipmentNo;
+	}
 }

+ 432 - 403
cloud-socket/src/com/js/kbt/model/TimeCalibrationRecordExample.java

@@ -6,317 +6,438 @@ import java.util.List;
 
 public class TimeCalibrationRecordExample {
     /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public TimeCalibrationRecordExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Integer value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateIsNull() {
-            addCriterion("indate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateIsNotNull() {
-            addCriterion("indate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateEqualTo(Date value) {
-            addCriterion("indate =", value, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateNotEqualTo(Date value) {
-            addCriterion("indate <>", value, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateGreaterThan(Date value) {
-            addCriterion("indate >", value, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateGreaterThanOrEqualTo(Date value) {
-            addCriterion("indate >=", value, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateLessThan(Date value) {
-            addCriterion("indate <", value, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateLessThanOrEqualTo(Date value) {
-            addCriterion("indate <=", value, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateIn(List<Date> values) {
-            addCriterion("indate in", values, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateNotIn(List<Date> values) {
-            addCriterion("indate not in", values, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateBetween(Date value1, Date value2) {
-            addCriterion("indate between", value1, value2, "indate");
-            return (Criteria) this;
-        }
-
-        public Criteria andIndateNotBetween(Date value1, Date value2) {
-            addCriterion("indate not between", value1, value2, "indate");
-            return (Criteria) this;
-        }
-    }
-
-    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public TimeCalibrationRecordExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateIsNull() {
+			addCriterion("indate is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateIsNotNull() {
+			addCriterion("indate is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateEqualTo(Date value) {
+			addCriterion("indate =", value, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateNotEqualTo(Date value) {
+			addCriterion("indate <>", value, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateGreaterThan(Date value) {
+			addCriterion("indate >", value, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateGreaterThanOrEqualTo(Date value) {
+			addCriterion("indate >=", value, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateLessThan(Date value) {
+			addCriterion("indate <", value, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateLessThanOrEqualTo(Date value) {
+			addCriterion("indate <=", value, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateIn(List<Date> values) {
+			addCriterion("indate in", values, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateNotIn(List<Date> values) {
+			addCriterion("indate not in", values, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateBetween(Date value1, Date value2) {
+			addCriterion("indate between", value1, value2, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andIndateNotBetween(Date value1, Date value2) {
+			addCriterion("indate not between", value1, value2, "indate");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoIsNull() {
+			addCriterion("equipment_no is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoIsNotNull() {
+			addCriterion("equipment_no is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoEqualTo(String value) {
+			addCriterion("equipment_no =", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoNotEqualTo(String value) {
+			addCriterion("equipment_no <>", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoGreaterThan(String value) {
+			addCriterion("equipment_no >", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoGreaterThanOrEqualTo(String value) {
+			addCriterion("equipment_no >=", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoLessThan(String value) {
+			addCriterion("equipment_no <", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoLessThanOrEqualTo(String value) {
+			addCriterion("equipment_no <=", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoLike(String value) {
+			addCriterion("equipment_no like", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoNotLike(String value) {
+			addCriterion("equipment_no not like", value, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoIn(List<String> values) {
+			addCriterion("equipment_no in", values, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoNotIn(List<String> values) {
+			addCriterion("equipment_no not in", values, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoBetween(String value1, String value2) {
+			addCriterion("equipment_no between", value1, value2, "equipmentNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andEquipmentNoNotBetween(String value1, String value2) {
+			addCriterion("equipment_no not between", value1, value2, "equipmentNo");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table time_calibration_record
+	 * @mbg.generated  Thu Nov 28 14:50:56 CST 2019
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table time_calibration_record
      *
@@ -328,96 +449,4 @@ public class TimeCalibrationRecordExample {
             super();
         }
     }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table time_calibration_record
-     *
-     * @mbg.generated Thu Oct 10 15:45:15 CST 2019
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
 }

+ 11 - 5
cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -93,14 +93,14 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 	@Override
 	protected void channelRead0(ChannelHandlerContext arg0, String arg1) throws ParseException {
 		String pack = "FAAF0007001e781e50003C37D5";
-		// 校准时间
-		timeCalibration();
 		//验证是否需要切换ip
 //		sendChangeIp();
 		System.out.println("收到===" + arg1 + "\n");
 		String equipmentNo = processMsg(arg1);
+		// 校准时间
+		timeCalibration(equipmentNo);
 		// 以下是配置下行数据
-		 sendPackage(equipmentNo);
+		sendPackage(equipmentNo);
 	}
 
 	private String processMsg(String input) throws ParseException {
@@ -363,8 +363,13 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		}
 	}
 
-	public void timeCalibration() {
-		List<TimeCalibrationRecord> count = timeCalibrationRecordMapper.selectCountByToday();
+	public void timeCalibration(String equipmentNo) {
+		logger.info("下发校准时间的云模盒equipmentNo"+equipmentNo);
+		if (equipmentNo.indexOf("FAAF") != -1) {
+			logger.info("非法云模盒编号,不作下发处理");
+			return;
+		}
+		List<TimeCalibrationRecord> count = timeCalibrationRecordMapper.selectCountByToday(equipmentNo);
 		if (count.size() == 0) {
 			Date date = new Date();
 			SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd,HH:mm:ss");
@@ -378,6 +383,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			sendMsg(strHexStr16);
 			TimeCalibrationRecord timeCalibrationRecord = new TimeCalibrationRecord();
 			timeCalibrationRecord.setIndate(new Date());
+			timeCalibrationRecord.setEquipmentNo(equipmentNo);
 			timeCalibrationRecordMapper.insertSelective(timeCalibrationRecord);
 		}
 	}

+ 2 - 2
cloud-socket/src/jdbc.properties

@@ -1,5 +1,5 @@
-classPath=D:/model/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
-#classPath=D:/workspace/yunsu/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
+#classPath=D:/model/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
+classPath=D:/workspace/yunsu/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
 driver=com.mysql.jdbc.Driver
 url=jdbc:mysql://118.190.47.230:3306/cloud_model?autoReconnect=true&rewriteBatchedStatements=TRUE&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
 username=root

+ 21 - 0
src/main/java/com/hssx/cloudmodel/controller/TbProjectController.java

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+@RestController
+@RequestMapping("/tb-project")
+public class TbProjectController {
+
+}
+

+ 258 - 0
src/main/java/com/hssx/cloudmodel/entity/TbProject.java

@@ -0,0 +1,258 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+public class TbProject extends Model<TbProject> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 项目名称
+     */
+    @TableField("project_name")
+    private String projectName;
+
+    /**
+     * 项目编号
+     */
+    @TableField("project_no")
+    private String projectNo;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 评论内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Integer creatorId;
+
+    /**
+     * 创建人名字
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 是否删除,软删除操作
+     */
+    @TableField("is_delete")
+    private Integer isDelete;
+
+    /**
+     * 资产方公司id
+     */
+    @TableField("owner_company")
+    private Integer ownerCompany;
+
+    /**
+     * 资产方公司名称
+     */
+    @TableField("owner_company_name")
+    private String ownerCompanyName;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 项目经理id
+     */
+    @TableField("manager_id")
+    private Integer managerId;
+
+    /**
+     * 项目经理名字
+     */
+    @TableField("manager")
+    private String manager;
+
+    /**
+     * 是否失效。失效后客户不能看到。运行监测中不显示
+     */
+    @TableField("is_disabled")
+    private Integer isDisabled;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectNo() {
+        return projectNo;
+    }
+
+    public void setProjectNo(String projectNo) {
+        this.projectNo = projectNo;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(Integer creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getOwnerCompany() {
+        return ownerCompany;
+    }
+
+    public void setOwnerCompany(Integer ownerCompany) {
+        this.ownerCompany = ownerCompany;
+    }
+
+    public String getOwnerCompanyName() {
+        return ownerCompanyName;
+    }
+
+    public void setOwnerCompanyName(String ownerCompanyName) {
+        this.ownerCompanyName = ownerCompanyName;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public Integer getManagerId() {
+        return managerId;
+    }
+
+    public void setManagerId(Integer managerId) {
+        this.managerId = managerId;
+    }
+
+    public String getManager() {
+        return manager;
+    }
+
+    public void setManager(String manager) {
+        this.manager = manager;
+    }
+
+    public Integer getIsDisabled() {
+        return isDisabled;
+    }
+
+    public void setIsDisabled(Integer isDisabled) {
+        this.isDisabled = isDisabled;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "TbProject{" +
+        "id=" + id +
+        ", projectName=" + projectName +
+        ", projectNo=" + projectNo +
+        ", startTime=" + startTime +
+        ", endTime=" + endTime +
+        ", content=" + content +
+        ", creatorId=" + creatorId +
+        ", creator=" + creator +
+        ", isDelete=" + isDelete +
+        ", ownerCompany=" + ownerCompany +
+        ", ownerCompanyName=" + ownerCompanyName +
+        ", indate=" + indate +
+        ", managerId=" + managerId +
+        ", manager=" + manager +
+        ", isDisabled=" + isDisabled +
+        "}";
+    }
+}

+ 16 - 0
src/main/java/com/hssx/cloudmodel/mapper/TbProjectMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.TbProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+public interface TbProjectMapper extends BaseMapper<TbProject> {
+
+}

+ 16 - 0
src/main/java/com/hssx/cloudmodel/service/TbProjectService.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.TbProject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+public interface TbProjectService extends IService<TbProject> {
+
+}

+ 20 - 0
src/main/java/com/hssx/cloudmodel/service/impl/TbProjectServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.TbProject;
+import com.hssx.cloudmodel.mapper.TbProjectMapper;
+import com.hssx.cloudmodel.service.TbProjectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+@Service
+public class TbProjectServiceImpl extends ServiceImpl<TbProjectMapper, TbProject> implements TbProjectService {
+
+}

+ 29 - 0
src/main/resources/mapper/TbProjectMapper.xml

@@ -0,0 +1,29 @@
+<?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.hssx.cloudmodel.mapper.TbProjectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.TbProject">
+        <id column="id" property="id" />
+        <result column="project_name" property="projectName" />
+        <result column="project_no" property="projectNo" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="content" property="content" />
+        <result column="creator_id" property="creatorId" />
+        <result column="creator" property="creator" />
+        <result column="is_delete" property="isDelete" />
+        <result column="owner_company" property="ownerCompany" />
+        <result column="owner_company_name" property="ownerCompanyName" />
+        <result column="indate" property="indate" />
+        <result column="manager_id" property="managerId" />
+        <result column="manager" property="manager" />
+        <result column="is_disabled" property="isDisabled" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, indate, manager_id, manager, is_disabled
+    </sql>
+
+</mapper>

+ 11 - 2
ys_int/config/index.js

@@ -1,4 +1,13 @@
 var path = require('path')
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 
 module.exports = {
   build: {
@@ -20,7 +29,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
         '/api': {    
-            target: 'http://192.168.101.166:8099',  // 接口域名 开发
+            target: 'http://'+ ip +':8099',  // 接口域名 开发
             secure: true,  // 如果是https接口,需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径,那么这里将发送到后端的请求重写为没有api的路径
@@ -28,7 +37,7 @@ module.exports = {
             }
         },
         '/ips': {    
-            target: 'http://192.168.101.166:8080',  // 接口域名 开发
+            target: 'http://'+ ip +':8080',  // 接口域名 开发
             secure: true,  // 如果是https接口,需要配置这个参数
             changeOrigin: true,  //是否跨域
             pathRewrite: { // 如果接口本身没有api的路径,那么这里将发送到后端的请求重写为没有api的路径

+ 64 - 20
ys_int/src/views/detection/maintenance.vue

@@ -73,7 +73,7 @@
                         <el-date-picker v-model="openCycle" style="float:right;width:125px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
                         @change='changeOpen(2)' size="mini" :clearable="false" type="date" :placeholder="$t('el.datepicker.selectDate')"></el-date-picker>
                     </div> -->
-                    <div id="myChart2" :style="{ height: '300px'}"></div>
+                    <div id="myChart2" :style="{ height: '400px'}"></div>
                 </el-col>
             </el-col>
 
@@ -518,7 +518,9 @@
                                 trigger: 'axis'
                             },
                             legend: {
-                                data:[this.$t('runTest.maxOpenCycle'),this.$t('runTest.minOpenCycle'),this.$t('runTest.avgOpenCycle'),this.$t('runTest.theoryCycle'),this.$t('runTest.openNum')]
+                                data:[this.$t('runTest.maxOpenCycle'),this.$t('runTest.minOpenCycle'),this.$t('runTest.avgOpenCycle'),this.$t('runTest.theoryCycle'),this.$t('runTest.openNum')],
+                                x: '30%',
+                                y: '-5'
                             },
                             toolbox: {
                                 right: '20',
@@ -526,36 +528,76 @@
                                     saveAsImage: {show: true}
                                 }
                             },
-                            xAxis: {
-                                type: 'category',
-                                data: []
-                            },
+                            grid: [
+                                {
+                                    left: '0%',
+                                    right: '55%',
+                                    top: '15%',
+                                    bottom: '15%',
+                                    containLabel: true
+                                },
+                                {
+                                    gridindex: 1,
+                                    left: '48%',
+                                    right: '3%',
+                                    top: '15%',
+                                    bottom: '15%',
+                                    containLabel: true
+                                }
+                            ],
+                            xAxis: [
+                                {
+                                    type: 'category',
+                                    data: [],
+                                },
+                                {
+                                    gridIndex: 1,
+                                    type: 'category',
+                                    data: []
+                                }
+                            ],
                             yAxis: [
                                 {
                                     name: this.$t('runTest.sec') + '(s)',
-                                    type: 'value'
+                                    type: 'value',
                                 },
                                 {
+                                    gridIndex: 1,
                                     name: this.$t('runTest.openNum'),
                                     type: 'value'
                                 },
                             ],
                             dataZoom: [
                                 {
-                                    type: 'inside',
-                                    start: 0,
-                                    end: 30
-                                }, {
+                                    type: "slider",
+                                    xAxisIndex: [0,1],
+                                    bottom: "0",
                                     start: 0,
-                                    end: 30,
-                                    handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-                                    handleSize: '80%',
+                                    end: 40,
+                                    left:"center",
+                                    handleIcon: "M0,0 v9.7h5 v-9.7h-5 Z",
                                     handleStyle: {
-                                        color: '#fff',
-                                        shadowBlur: 3,
-                                        shadowColor: 'rgba(0, 0, 0, 0.6)',
-                                        shadowOffsetX: 2,
-                                        shadowOffsetY: 2
+                                        color: "#40bcf9",
+                                        borderColor: "#1fb2fb"
+                                    },
+                                    backgroundColor: "#e2f3ff",
+                                    dataBackground: {
+                                        lineStyle: {
+                                            color: "#000000"
+                                        },
+                                        areaStyle: {
+                                            color: "#d4d9dd"
+                                        }
+                                    },
+                                    fillerColor: "rgba(31,178,251,0.2)",
+                                    labelFormatter: function (value, params) {
+                                        var str = "";
+                                        if (params.length > 4) {
+                                            str = params.substring(0, 4) + "…";
+                                        } else {
+                                            str = params;
+                                        }
+                                        return str;
                                     }
                                 }
                             ],
@@ -616,6 +658,7 @@
                                     name: this.$t('runTest.openNum'),
                                     type: 'bar',
                                     barWidth : 30,
+                                    xAxisIndex: 1,
                                     yAxisIndex: 1,
                                     data: [],
                                     itemStyle : { 
@@ -663,7 +706,8 @@
                                 }
                             }
                         }
-                        option.xAxis.data = xData;
+                        option.xAxis[0].data = xData;
+                        option.xAxis[1].data = xData;
                         option.series[0].data = max;
                         option.series[1].data = min;
                         option.series[2].data = avg;

+ 4 - 234
ys_int/src/views/map/map.vue

@@ -245,13 +245,14 @@
                             marker.content = str;
                             marker.id = data[i].id;
                             marker.on('click', jumpTo);
-                            marker.on('mouseover', openInfo);
-                            marker.on('mouseout', closeInfo);
+                            // marker.on('mouseover', openInfo);
+                            // marker.on('mouseout', closeInfo);
                         }
                     }
 
                     function jumpTo(e) {
-                        _this.$router.push("/moldList/" + e.target.id + "/0");
+                        // _this.$router.push("/moldList/" + e.target.id + "/0");
+                        _this.$router.push("/moldList");
                     }
 
                     function openInfo(e) {
@@ -304,237 +305,6 @@
 
             that.setMap();
         },
-        // mounted() {
-        //     this.$el.style.height = (window.innerHeight - 100) + "px";
-        //     const that = this;
-        //     window.onresize = function temp() {
-        //         that.$el.style.height = (window.innerHeight - 100) + "px";
-        //     };
-
-        //     //新地图
-        //     var map = new AMap.Map('container', {
-        //         zoom: 4,
-        //         mapStyle: "amap://styles/8016abec658e1132508723183f848f14",
-        //         features: ['bg']
-        //     });
-
-        //     var _this = this;
-        //     //加载相关组件
-        //     AMapUI.load(['ui/geo/DistrictCluster', 'ui/misc/PointSimplifier', 'lib/$' ,  'lib/utils'], function(DistrictCluster, PointSimplifier , $ , utils) {
-
-        //         window.DistrictCluster = DistrictCluster;
-
-        //         //启动页面
-        //         var pointSimplifierIns = new PointSimplifier({
-        //             map: map, //所属的地图实例
-        //             autoSetFitView: false, //禁止自动更新地图视野
-        //             zIndex: 110,
-        //             getPosition: function(item) {
-        //                 if (!item) {
-        //                     return null;
-        //                 }
-        //                 console.log(item)
-        //                 //返回经纬度
-        //                 // return [parseFloat(item.lng), parseFloat(item.lat)];
-        //                 return [item.lng, item.lat];
-        //             },
-        //             getHoverTitle: function(dataItem, idx) {
-        //                 var state = "";
-        //                 if(dataItem.state == '0'){
-        //                     state = '<span style="color:#909399">'+_this.$t('base.static')+'</span>'//_this.$t('base.static') // 静止
-        //                 } else if(dataItem.state == '1'){
-        //                     state = '<span style="color:#00CD66">'+_this.$t('base.run')+'</span>'
-        //                     // state = _this.$t('base.run') // 运行
-        //                 } else if(dataItem.state == '2'){
-        //                     state = '<span style="color:#F56C6C">'+_this.$t('base.warning')+'</span>'
-        //                     // state = _this.$t('base.warning') // 告警
-        //                 } else if(dataItem.state == '3'){
-        //                     state = '<span style="color:#909399">'+_this.$t('base.beScrapped')+'</span>'
-        //                     // state = _this.$t('base.scrap') // 报废
-        //                 } else if(dataItem.state == '4'){
-        //                     state = '<span style="color:#909399">'+_this.$t('base.scraped')+'</span>'
-        //                 } else if(dataItem.state == '5'){
-        //                     state = '<span style="color:#F56C6C">'+_this.$t('base.abnormal')+'</span>'
-        //                 } else if(dataItem.state == '6'){
-        //                     state = '<span style="color:#F56C6C">'+_this.$t('base.dropped')+'</span>'
-        //                 }
-
-        //                 var str = "<div>模具名称:&nbsp;&nbsp;&nbsp;"+ dataItem.modelName +"</div><div>运行状态:&nbsp;&nbsp;&nbsp;"+ state +"</div>"
-                        
-        //                 return  str;
-        //             },
-        //             renderOptions: {
-        //                 //点的样式
-        //                 pointStyle: {
-        //                     width: 6,
-        //                     height: 6,
-        //                     // fillStyle:'rgba(0, 236, 252, 0.9)'
-        //                     fillStyle:'rgba(255, 0, 0, 1)',
-        //                 },
-        //                 //鼠标hover时的title信息
-        //                 hoverTitleStyle: {
-        //                     position: 'top'
-        //                 },
-        //             }
-        //         });
-
-        //         function MyRender(distClusterIns, opts) {
-        //             //直接调用父类的构造函数
-        //             MyRender.__super__.constructor.apply(this, arguments);
-        //         }
-
-        //         //继承默认引擎
-        //         utils.inherit(MyRender, DistrictCluster.Render.Default);
-
-        //         utils.extend(MyRender.prototype, {
-        //             drawFeaturePolygons: function(ctx, polygons, styleOptions, feature, dataItems) {
-        //                 //调用父类方法
-        //                 MyRender.__super__.drawFeaturePolygons.apply(this, arguments);
-
-        //                 //直接绘制聚合信息
-        //                 this.drawMyLabel(feature, dataItems);
-        //             },
-        //             _initContainter: function() {
-        //                 //调用父类方法
-        //                 MyRender.__super__._initContainter.apply(this, arguments);
-
-        //                 //创建一个新的canvas
-        //                 this._createCanvas('mylabel', this._container);
-        //             },
-        //             /**
-        //              * 绘制一个蓝底白字的label替代聚合标注
-        //              */
-        //             drawMyLabel: function(feature, dataItems) {
-        //                 var pixelRatio = this.getPixelRatio(); //高清下存在比例放大
-
-        //                 var containerPos = map.lngLatToContainer(feature.properties.centroid || feature.properties.center);
-
-        //                 var labelCtx = this._getCanvasCxt('mylabel');
-
-        //                 //文字的中心点
-        //                 var centerX = containerPos.getX() * pixelRatio,
-        //                     centerY = containerPos.getY() * pixelRatio;
-
-        //                 labelCtx.save();
-
-        //                 labelCtx.font = 12 * pixelRatio + 'px 微软雅黑';
-                        
-        //                 var name = feature.properties.name;
-        //                 if(feature.properties.level == "province") {
-        //                     if(name == "黑龙江省" || name == "内蒙古自治区"){
-        //                         name = name.substring(0,3)
-        //                     } else {
-        //                         name = name.substring(0,2)
-        //                     }
-        //                 }
-        //                 var text = name;//feature.properties.name ;//+ '\n' + dataItems.length;
-        //                 var textMetrics = labelCtx.measureText(text);
-        //                 var halfTxtWidth = textMetrics.width / 2;
-
-        //                 var num = dataItems.length;
-        //                 var numMetrics = labelCtx.measureText(num);
-        //                 var halfNumWidth = numMetrics.width / 2;
-
-        //                 // labelCtx.fillStyle = 'rgba(3 , 94 , 255 , 0.5)';//'#3366cc';
-                        
-        //                 labelCtx.beginPath();
-        //                 labelCtx.fillStyle = 'rgba(12 , 239 , 231 , 0.8)';//'#3366cc';
-
-        //                 //绘制一个蓝色背景
-        //                 labelCtx.strokeStyle= "rgba(12 , 239 , 231 , 0.65)"
-        //                 labelCtx.fillStyle = 'rgba(12 , 239 , 231 , 0.65)';
-                        
-        //                 var radius = 0;
-        //                 if(textMetrics.width > numMetrics.width) {
-        //                     radius = (textMetrics.width + 6 * pixelRatio) / 2;
-        //                 } else {
-        //                     radius = (numMetrics.width + 6 * pixelRatio) / 2;
-        //                 }
-
-        //                 labelCtx.arc(centerX , centerY, radius + 6,
-        //                     0*Math.PI, 2*Math.PI, false);
-
-        //                 labelCtx.closePath();
-        //                 labelCtx.fill();
-
-        //                 labelCtx.fillStyle = '#ffffff';
-        //                 labelCtx.textBaseline = 'middle';
-
-        //                 labelCtx.fillText(text, centerX - halfTxtWidth, centerY - 5);
-        //                 labelCtx.fillText(num , centerX - halfNumWidth, centerY + 12);
-
-        //                 labelCtx.stroke();
-        //                 labelCtx.restore();
-        //             }
-        //         });
-
-        //         var distCluster = new DistrictCluster({
-        //             zIndex: 100,
-        //             map: map, //所属的地图实例
-        //             getPosition: function(item) {
-        //                 if (!item) {
-        //                     return null;
-        //                 }
-        //                 //返回经纬度
-        //                 // return [parseFloat(item.lng), parseFloat(item.lat)];
-        //                 return [item.lng, item.lat];
-        //             },
-        //             renderConstructor: MyRender,
-        //             //特定区划级别的默认样式
-        //             renderOptions: {
-        //                 getClusterMarker: null,
-        //                 featureClickToShowSub: true,
-        //                 featureStyle: {
-        //                     lineWidth: 2, //描边线宽
-        //                     // strokeStyle: 'rgba(0, 119, 180, 0.5)', //描边色
-        //                     strokeStyle: 'rgba(75, 143, 239, 0.5)', //描边色
-        //                     //鼠标Hover后的样式
-        //                     hoverOptions: {
-        //                         fillStyle: 'rgba(255,255,255,0.2)'
-        //                     }
-        //                 },
-        //                 getFeatureStyle: function(feature, dataItems) {
-        //                     return {
-        //                         fillStyle: ''
-        //                     };
-        //                 }
-        //             },
-        //         });
-
-        //         window.distCluster = distCluster;
-
-        //         map.on('zoomend', function() {
-        //             var zoom = map.getZoom();
-        //             //获取 pointStyle
-        //             var pointStyle = pointSimplifierIns.getRenderOptions().pointStyle;
-        //             //根据当前zoom调整点的尺寸
-        //             pointStyle.width = pointStyle.height = 2 * Math.pow(1.2, map.getZoom() - 3);
-        //         });
-
-        //         var zoom = map.getZoom();
-        //         //获取 pointStyle
-        //         var pointStyle = pointSimplifierIns.getRenderOptions().pointStyle;
-        //         //根据当前zoom调整点的尺寸
-        //         pointStyle.width = pointStyle.height = 2 * Math.pow(1.2, map.getZoom() - 3);
-
-        //         $('<div id="loadingTip">加载数据,请稍候...</div>').appendTo(document.body);
-        //         _this.http.post( _this.port.map.newMap, {},
-        //         res => {
-        //             $('#loadingTip').remove();
-        //             var data = res.data;
-        //             _this.moldList = data;
-        //             distCluster.setData(data);
-        //             pointSimplifierIns.setData(data);
-        //             map.setZoomAndCenter(5, [105.205467, 34.907761]);
-        //         },
-        //         error => {
-        //             _this.$message({
-        //                 message: error,
-        //                 type: "error"
-        //             });
-        //         })
-        //     });
-        // }
 	}
 
 </script>