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

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

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

@@ -94,5 +94,5 @@ public interface TimeCalibrationRecordMapper {
      */
     int updateByPrimaryKey(TimeCalibrationRecord record);
 
-    int selectCountByToday();
+    List<TimeCalibrationRecord> selectCountByToday();
 }

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

@@ -237,9 +237,12 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   
-  <select id="selectCountByToday" resultType="java.lang.Integer">
-  select count(id) from time_calibration_record
-  WHERE TO_DAYS(indate) = TO_DAYS(NOW())
+  <select id="selectCountByToday" resultMap="BaseResultMap">
+  select
+   * from 
+   time_calibration_record
+  WHERE 
+  TO_DAYS(indate) = TO_DAYS(NOW())
   </select>
   
 </mapper>

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -226,8 +226,8 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 	}
 
 	public void timeCalibration() {
-		Integer count = timeCalibrationRecordMapper.selectCountByToday();
-		if (count == 0) {
+		List<TimeCalibrationRecord> count = timeCalibrationRecordMapper.selectCountByToday();
+		if (count.size()==0) {
 			Date date = new Date();
 			SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd,HH:mm:ss");
 			String dateStr = sdf.format(date);
@@ -239,6 +239,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			logger.info("校准系统模块时间转成16进制的字符串==>" + strHexStr16);
 			sendMsg(strHexStr16);
 			TimeCalibrationRecord timeCalibrationRecord = new TimeCalibrationRecord();
+			timeCalibrationRecord.setIndate(new Date());
 			timeCalibrationRecordMapper.insertSelective(timeCalibrationRecord);
 		}
 	}

cloud-socket/src/log4j.properties

@@ -16,4 +16,11 @@ log4j.appender.R.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
 #log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG
 #log4j.logger.java.sql.Connection=DEBUG
 #log4j.logger.java.sql.Statement=DEBUG
-#log4j.logger.java.sql.PreparedStatement=DEBUG, A1     
+#log4j.logger.java.sql.PreparedStatement=DEBUG, A1 
+log4j.logger.com.ibatis=INFO
+log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=INFO
+log4j.logger.com.ibatis.common.jdbc.ScriptRunner=INFO
+log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=INFO
+log4j.logger.java.sql.Connection=INFO
+log4j.logger.java.sql.Statement=INFO
+log4j.logger.java.sql.PreparedStatement=INFO, A1