app代码提交

iamberry-app-international-service/.classpath

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_101">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

iamberry-app-international-service/.project

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>iamberry-app-international-service</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>

iamberry-app-international-service/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

iamberry-app-international-service/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

iamberry-app-international-service/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

iamberry-app-international-service/.settings/org.eclipse.wst.common.component

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="iamberry-app-international-service">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+    </wb-module>
+</project-modules>

iamberry-app-international-service/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>

iamberry-app-international-service/.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1

iamberry-app-international-service/.svn/entries

@@ -0,0 +1 @@
+12

iamberry-app-international-service/.svn/format

@@ -0,0 +1 @@
+12

iamberry-app-international-service/.svn/pristine/03/03fd8050edaa8cd7d94adc28309c9734d57eaa8a.svn-base

@@ -0,0 +1,274 @@
+package com.iamberry.app.service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.dto.RecordDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.MilkService;
+import com.iamberry.app.ulitity.Utility;
+
+/**
+ * MilkService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:10
+ */
+@Service
+public class MilkServiceImpl extends BaseService implements MilkService {
+
+	/**
+	 * setMilkMakingRecord
+	 * @param makingRecord
+	 * @param token
+	 * @param recordId
+	 * @return
+	 */
+	public MilkMakingRecord setMilkMakingRecord(MilkMakingRecord makingRecord, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		makingRecord.setUser(userInfo.getId());
+		makingRecord.setTimestamp_(new Date());
+		milkMapper.insertMilkMakingRecord(makingRecord);
+		return makingRecord;
+	}
+
+	/**
+	 * searchUserRecordsBytime
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @param startTime
+	 * @param endTime
+	 * @return Milk Making Record List
+	 */
+	public Map<String, List<RecordDTO>> searchUserRecordsByTime(Long userId, String dateStatus, String chosenDate,
+			String machineMac) {
+
+		Map<String, List<RecordDTO>> recordInfos = new LinkedHashMap<String, List<RecordDTO>>();
+		String dateType = null, formatter = null;
+		Calendar calendar = Calendar.getInstance();
+		if (chosenDate != null) {
+			// calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd
+			// HH:mm:ss", chosenDate));
+			// 防止无数据时显示分钟错误
+			chosenDate = chosenDate.substring(0, chosenDate.length() - 6) + ":00:00";
+			calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+		} else {
+			calendar.setTime(new Date());
+		}
+		Date start = null, end = null;
+		switch (dateStatus) {
+		case "day":
+			dateType = "days";
+			formatter = "%Y%m%d%H";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "week":
+			dateType = "weeks";
+			formatter = "%Y%m%d";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			if (Calendar.SUNDAY < Calendar.MONDAY) {
+				calendar.add(Calendar.DATE, 7);
+			}
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "year":
+			dateType = "years";
+			formatter = "%Y%m";
+			calendar.set(calendar.get(Calendar.YEAR), 0, 1, 0, 0, 0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), 11, 31, 23, 59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		}
+		return Utility.fillAppMachineRecordWithZero(Utility.synAppMachineRecord(recordInfos), dateType, chosenDate);
+	}
+
+	/**
+	 * searchUserRecordById
+	 *
+	 * @author Moon Cheng
+	 * @param recordId
+	 * @return Milk Making Record Information
+	 */
+	public MilkMakingRecord searchUserRecordById(Long recordId) {
+		MilkMakingRecord makingRecord = milkMapper.selectMilkMakingRecord(recordId);
+		return makingRecord;
+	}
+
+	/**
+	 * 根据用户，获取冲奶记录的-->总量和次数
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @return
+	 */
+	public RecordCountInfoDTO getTotalMilkVolumeMadeByUser(Long userId) {
+		RecordCountInfoDTO recordcount = milkMapper.getMilkPowderSumByUser(userId);
+		return  recordcount;
+	}
+
+	/**
+	 * setMilkPowderInfo
+	 *
+	 * @author Moon Cheng
+	 * @param entity
+	 * @param token
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo setMilkPowderInfo(MilkPowderInfo entity, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		// change status as user's phone number
+		entity.setStatus_(
+				userInfo.getUsername().length() > 11 ? Constants.MILK_POWDER_NOT_APPROVED : userInfo.getUsername());
+		entity.setCreated_on(new Date());
+		milkMapper.insertMilkPowderInfo(entity);
+		return entity;
+	}
+
+	/**
+	 * searchMilkPowderInfoByBarCode
+	 *
+	 * @author Moon Cheng
+	 * @param barcode
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo searchMilkPowderInfoByBarCode(String barcode) {
+		MilkPowderInfo milkPowderInfo = milkMapper.selectMilkPowderInfo(barcode);
+		return milkPowderInfo;
+	}
+
+	/**
+	 * 
+	 * 通过品牌名获取奶粉信息
+	 * @author Moon Cheng, Yin
+	 * @param brand
+	 * @return Milk Powder List
+	 */
+	public Map<String, List<String>> searchMilkPowderInfosByBrand(String brand) {
+		brand = "%" + brand.trim() + "%";
+		Map<String, List<String>> infos = new IdentityHashMap<String, List<String>>();
+		List<MilkInfoDTO> milkInfo = milkMapper.selectMilkInfoBybrand(brand);
+		for (int i = 0; i < milkInfo.size(); i++) {
+			List<String> list = new LinkedList<String>();
+			list.add(milkInfo.get(i).getLevel() + ":" + milkInfo.get(i).getType() + ":"
+					+ milkInfo.get(i).getPowder_ratio() + ":" + milkInfo.get(i).getId() + ":"
+					+ milkInfo.get(i).getWeight_per_spoon());
+			infos.put(milkInfo.get(i).getSeries(),list);
+		}
+		
+		return infos;
+	}
+
+	/**
+	 * searchMilkPowderBrand
+	 *
+	 * @return Brand List
+	 */
+	public List<String> searchMilkPowderBrand() {
+		List<String> milkPowderInfos = milkMapper.selectMilkPowderBrand();
+		List<String> result = new ArrayList<>();
+		milkPowderInfos.forEach(milk -> {
+			if (NumberUtils.isNumber(milk) && milk.contains(".")) {
+				milk = milk.substring(0, milk.indexOf("."));
+			}
+			result.add(milk);
+		});
+		return result;
+	}
+
+	/**
+	 * searchMilkInfoByBrandSeriesLevel
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo searchMilkInfoByBrandSeriesLevel(String brand, String series, String level) {
+		return milkMapper.selectMilkInfoByBrandSeriesLevel(brand, series, level);
+	}
+
+	// =====================================TuyaHistoryData======================================
+	/**
+	 * getLastRecordDate
+	 *
+	 * @return
+	 */
+	public Date getLastRecordDate() {
+		Date lastDate = milkMapper.selectLastRecordDate();
+		return lastDate == null ? new Date() : lastDate;
+	}
+
+	/**
+	 * addRecordData
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void addRecordData(String devId, String value, Long time, Long userId) {
+		MilkMakingRecord milkMakingRecord = new MilkMakingRecord();
+		milkMakingRecord.setVolume(Integer.parseInt(value));
+		milkMakingRecord.setMachine(devId);
+		milkMakingRecord.setTimestamp_(new Date(time));
+		milkMakingRecord.setUser(userId);
+		milkMapper.insertRecordData(milkMakingRecord);
+	}
+
+	@Override
+	public void setMilkImages(MilkImages images) {
+		// TODO Auto-generated method stub
+		milkMapper.insertMilkImages(images);
+	}
+}

iamberry-app-international-service/.svn/pristine/06/06bf69ba07defa0816499f442dedffe47af55bef.svn-base

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

iamberry-app-international-service/.svn/pristine/07/07e4798d1c60d2e0b2cc2201a96847e86753f88b.svn-base

@@ -0,0 +1,35 @@
+package com.iamberry.app.mapper;
+
+import com.iamberry.app.core.entity.CodeValid;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月1日
+ * @explain	验证码 SQL Mapper映射
+ */
+public interface CodeMapper {
+
+	/**
+	 * 保存一条发送记录
+	 * @param codeValid
+	 * @return
+	 */
+	public int save(CodeValid codeValid);
+	
+	/**
+	 * 获取某一个手机号码最后的发送记录
+	 * @param phone
+	 * @return
+	 */
+	public CodeValid getLast(String phone);
+	
+	/**
+	 * 更新状态
+	 * @param codeId
+	 * @return
+	 */
+	public int update(Long codeId);
+}

iamberry-app-international-service/.svn/pristine/08/0821b0c05b8ceacee0cc1a589aac4181ef83f089.svn-base

@@ -0,0 +1,290 @@
+package com.iamberry.app.service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.dto.RecordDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.MilkService;
+import com.iamberry.app.ulitity.Utility;
+
+/**
+ * MilkService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:10
+ */
+@Service
+public class MilkServiceImpl extends BaseService implements MilkService {
+
+	/**
+	 * setMilkMakingRecord
+	 * @param makingRecord
+	 * @param token
+	 * @param recordId
+	 * @return
+	 */
+	public MilkMakingRecord setMilkMakingRecord(MilkMakingRecord makingRecord, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		makingRecord.setUser(userInfo.getId());
+		makingRecord.setTimestamp_(new Date());
+		milkMapper.insertMilkMakingRecord(makingRecord);
+		return makingRecord;
+	}
+
+	/**
+	 * searchUserRecordsBytime
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @param startTime
+	 * @param endTime
+	 * @return Milk Making Record List
+	 */
+	public Map<String, List<RecordDTO>> searchUserRecordsByTime(Long userId, String dateStatus, String chosenDate,
+			String machineMac) {
+
+		Map<String, List<RecordDTO>> recordInfos = new LinkedHashMap<String, List<RecordDTO>>();
+		String dateType = null, formatter = null;
+		Calendar calendar = Calendar.getInstance();
+		if (chosenDate != null) {
+			// calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd
+			// HH:mm:ss", chosenDate));
+			// 防止无数据时显示分钟错误
+			chosenDate = chosenDate.substring(0, chosenDate.length() - 6) + ":00:00";
+			calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+		} else {
+			calendar.setTime(new Date());
+		}
+		Date start = null, end = null;
+		switch (dateStatus) {
+		case "day":
+			dateType = "days";
+			formatter = "%Y%m%d%H";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "week":
+			dateType = "weeks";
+			formatter = "%Y%m%d";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			if (Calendar.SUNDAY < Calendar.MONDAY) {
+				calendar.add(Calendar.DATE, 7);
+			}
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "year":
+			dateType = "years";
+			formatter = "%Y%m";
+			calendar.set(calendar.get(Calendar.YEAR), 0, 1, 0, 0, 0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), 11, 31, 23, 59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		}
+		return Utility.fillAppMachineRecordWithZero(Utility.synAppMachineRecord(recordInfos), dateType, chosenDate);
+	}
+
+	/**
+	 * searchUserRecordById
+	 *
+	 * @author Moon Cheng
+	 * @param recordId
+	 * @return Milk Making Record Information
+	 */
+	public MilkMakingRecord searchUserRecordById(Long recordId) {
+		MilkMakingRecord makingRecord = milkMapper.selectMilkMakingRecord(recordId);
+		return makingRecord;
+	}
+
+	/**
+	 * 根据用户，获取冲奶记录的-->总量和次数
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @return
+	 */
+	public RecordCountInfoDTO getTotalMilkVolumeMadeByUser(Long userId) {
+		RecordCountInfoDTO recordcount = milkMapper.getMilkPowderSumByUser(userId);
+		return  recordcount;
+	}
+
+	/**
+	 * setMilkPowderInfo
+	 *
+	 * @author Moon Cheng
+	 * @param entity
+	 * @param token
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo setMilkPowderInfo(MilkPowderInfo entity, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		// change status as user's phone number
+		entity.setStatus_(
+				userInfo.getUsername().length() > 11 ? Constants.MILK_POWDER_NOT_APPROVED : userInfo.getUsername());
+		entity.setCreated_on(new Date());
+		milkMapper.insertMilkPowderInfo(entity);
+		return entity;
+	}
+
+	/**
+	 * searchMilkPowderInfoByBarCode
+	 *
+	 * @author Moon Cheng
+	 * @param barcode
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo searchMilkPowderInfoByBarCode(String barcode) {
+		MilkPowderInfo milkPowderInfo = milkMapper.selectMilkPowderInfo(barcode);
+		return milkPowderInfo;
+	}
+
+	/**
+	 * 
+	 * 通过品牌名获取奶粉信息
+	 * @author Moon Cheng, Yin
+	 * @param brand
+	 * @return Milk Powder List
+	 */
+	public Map<String, List<String>> searchMilkPowderInfosByBrand(String brand) {
+		brand = "%" + brand.trim() + "%";
+		Map<String, List<String>> infos = new IdentityHashMap<String, List<String>>();
+		List<MilkInfoDTO> milkInfo = milkMapper.selectMilkInfoBybrand(brand);
+		for (int i = 0; i < milkInfo.size(); i++) {
+			List<String> list = new LinkedList<String>();
+			list.add(milkInfo.get(i).getLevel() + ":" + milkInfo.get(i).getType() + ":"
+					+ milkInfo.get(i).getPowder_ratio() + ":" + milkInfo.get(i).getId() + ":"
+					+ milkInfo.get(i).getWeight_per_spoon());
+			infos.put(milkInfo.get(i).getSeries(),list);
+		}
+		
+		return infos;
+	}
+
+	/**
+	 * searchMilkPowderBrand
+	 *
+	 * @return Brand List
+	 */
+	public List<String> searchMilkPowderBrand() {
+		List<String> milkPowderInfos = milkMapper.selectMilkPowderBrand();
+		List<String> result = new ArrayList<>();
+		milkPowderInfos.forEach(milk -> {
+			if (NumberUtils.isNumber(milk) && milk.contains(".")) {
+				milk = milk.substring(0, milk.indexOf("."));
+			}
+			result.add(milk);
+		});
+		return result;
+	}
+
+	/**
+	 * searchMilkInfoByBrandSeriesLevel
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo searchMilkInfoByBrandSeriesLevel(String brand, String series, String level) {
+		return milkMapper.selectMilkInfoByBrandSeriesLevel(brand, series, level);
+	}
+
+	// =====================================TuyaHistoryData======================================
+	/**
+	 * getLastRecordDate
+	 *
+	 * @return
+	 */
+	public Date getLastRecordDate() {
+		Date lastDate = milkMapper.selectLastRecordDate();
+		return lastDate == null ? new Date() : lastDate;
+	}
+
+	/**
+	 * addRecordData
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void addRecordData(String devId, String value, Long time, Long userId) {
+		//判断当前机器30秒内是否有数据上传
+		Date timestamp_ = milkMapper.selectMakingRecordAndmachine(devId);
+		boolean msg = true;
+		if(timestamp_ != null){
+			if((new Date().getTime() - timestamp_.getTime()) <= 30000){
+				msg = false;
+			}
+		}
+		if(msg){
+			MilkMakingRecord milkMakingRecord = new MilkMakingRecord();
+			milkMakingRecord.setVolume(Integer.parseInt(value));
+			milkMakingRecord.setMachine(devId);
+			milkMakingRecord.setTimestamp_(new Date(time));
+			milkMakingRecord.setUser(userId);
+			milkMapper.insertRecordData(milkMakingRecord);
+		}
+	}
+
+	@Override
+	public void setMilkImages(MilkImages images) {
+		// TODO Auto-generated method stub
+		milkMapper.insertMilkImages(images);
+	}
+
+	@Override
+	public MilkPowderInfo selectMilkPowderByBar(String barcode) {
+		// TODO Auto-generated method stub
+		return milkMapper.selectMilkPowderByBar(barcode);
+	}
+}

iamberry-app-international-service/.svn/pristine/12/12d53b815c8c402182185574bf66b9edf0f5e5ac.svn-base

@@ -0,0 +1,159 @@
+package com.iamberry.app.mapper;
+
+import com.iamberry.app.core.entity.User;
+
+/**
+ *
+ * @author Moon Cheng
+ * @date 2016年1月16日 下午12:25:05
+ */
+public interface UserMapper {
+
+	// ================================================================================================
+	// ------------------------------------------User----------------------------------------------
+	// ================================================================================================
+	/**
+	 * 根据id查询user所有信息
+	 *
+	 * @param id
+	 * @return User Information
+	 */
+	public User selectUserById(Long id);
+
+	/**
+	 * 根据username查询user所有信息
+	 *
+	 * @param username
+	 * @return User Information
+	 */
+	public User selectUserByUsername(String username);
+
+	/**
+	 * 通过ext_open_id查询user所有信息
+	 *
+	 * @param extOpenId
+	 * @return User Information
+	 */
+	public User selectUserByExtOpenId(String extOpenId);
+
+	/**
+	 * 添加用户信息到user表中
+	 *
+	 * @param user
+	 */
+	public void insertUser(User user);
+
+	/**
+	 * 根据id修改user表数据
+	 *
+	 * @param user
+	 */
+	public void updateUser(User user);
+
+	/**
+	 * 根据id修改user表的个人头像
+	 *
+	 * @author Moon Cheng
+	 * @param image
+	 * @param id
+	 */
+	public int updateDisplayPicture(String imageUrl, Long id);
+
+	/**
+	 * 根据用户名和密码查询用户表信息
+	 *
+	 * @param username
+	 * @param password
+	 * @return User Information
+	 */
+	public User validateUser(String username, String password);
+
+	/**
+	 * 通过id修改用户表密码
+	 *
+	 * @param id
+	 * @param newPassword
+	 * @return update row count
+	 */
+	public int changePassword(Long id, String newPassword);
+
+	// ================================================================================================
+	// ------------------------------------------UserToken----------------------------------------------
+	// ================================================================================================
+	/**
+	 * 通过token查询user表所有信息
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public User selectUserByToken(String token);
+
+	/**
+	 * 根据id修改token值
+	 *
+	 * @param token
+	 * @param userId
+	 * @return int
+	 */
+	public int updateUserToken(String token, Long userId);
+
+	/**
+	 * 根据id修改user表的用户名
+	 *
+	 * @author Moon Cheng
+	 * @param username
+	 * @param userId
+	 * @return
+	 */
+	public int updateUserName(String username, Long userId);
+	
+	
+	/**
+	 * 根据id修改user表的用户名和国家代码
+	 *
+	 * @author Moon Cheng
+	 * @param username
+	 * @param userId
+	 * @param countryCode
+	 * @return
+	 */
+	public int updateUserNameAndCountry(String username,String countryCode,  Long userId);
+	
+
+	/**
+	 * 通过key_查询sys_config表数据
+	 *
+	 * @param key
+	 * @return String
+	 */
+	public String selectConfig(String key);
+
+	// ================================================================================================
+	// ------------------------------------------UserAvator----------------------------------------------
+	// ================================================================================================
+	/**
+	 * USER_AVATOR表中添加数据
+	 *
+	 * @param id
+	 * @param avator
+	 *            void
+	 */
+	public void insertUserAvator(Long id, String avator);
+
+	/**
+	 * 通过user_id修改USER_AVATOR表数据
+	 *
+	 * @param id
+	 * @param avator
+	 * @return int
+	 */
+	public int updateUserAvator(Long id, String avator);
+
+	/**
+	 * 根据user_id查询USER_AVATOR表数据
+	 *
+	 * @param id
+	 * @return String
+	 */
+	public String selectUserAvator(Long id);
+}

iamberry-app-international-service/.svn/pristine/14/14c97ecad830290fee1955c6a5adbbd11a3642cf.svn-base

@@ -0,0 +1,76 @@
+package com.iamberry.app.mapper;
+
+import java.util.List;
+
+import com.iamberry.app.core.entity.Machine;
+
+public interface MachineMapper {
+
+	/**
+	 *	添加一台机器
+	 * @param machine
+	 * @return void
+	 */
+	public void insertMachine(Machine machine);
+
+	/**
+	 *	根据id 修改一台机器信息
+	 * @param machine
+	 */
+	public void updateMachine(Machine machine);
+
+	/**
+	 * 根据机器id 修改个人机器状态，增加修改时间为当前时间的字段
+	 * 取消数据库中表machine的时间修改字段自动更新！
+	 * @param status,
+	 *            id
+	 */
+	public int updateMachineStatus(String status,Long id);
+
+	/**
+	 *	根据id 修改一台机器的位置信息
+	 * @param location,
+	 *            id
+	 * @return void
+	 */
+	public int updateMachineLocation(String location,Long id);
+
+	/**
+	 *	按用户，查询所有机器
+	 * @author Moon Cheng
+	 * @param owner
+	 * @return
+	 */
+	public List<Machine> selectMachineByOwner(Long owner);
+
+	/**
+	 * 	根据id 查询一台机器
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public Machine selectMachineById(Long id);
+	
+	/**
+	 * 	根据机器码和所属用户 查一台机器id
+	 * @param devId
+	 * @param userId
+	 * @return
+	 */ 
+	public Long isDevUserPairExist(String devId, Long userId);
+	
+	/**
+	 * 	根据机器码 修改个人机器状态，增加修改时间为当前时间的字段
+	 *
+	 * @param mac
+	 * @param status
+	 */
+	public void updateStatusByMac(String devId, String status);
+
+	/**
+	 * 根据机器的ID，查询最近的一个用户ID
+	 * @param devId
+	 * @return
+	 */
+	public Long selectUserIDByDevId(String devId);
+}

iamberry-app-international-service/.svn/pristine/17/17251926572387fabd98475b3e7a866b118a0167.svn-base

@@ -0,0 +1,245 @@
+package com.iamberry.app.mapper;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectKey;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Repository;
+
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.sqlprovider.DMLProvider;
+
+public interface MilkMapper {
+
+	/**
+	 * 添加信息到milk_making_record表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkMakingRecord(MilkMakingRecord entity);
+
+	/**
+	 * 根据id修改MILK_MAKING_RECORD的start和comments属性
+	 *
+	 * @param stars
+	 * @param comments
+	 * @param id
+	 */
+	public void updateMilkMakingRecord(int stars, String comments, Long id);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param userId
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, Long userId, String devId);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param devids
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMachineMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, String devids);
+
+	/**
+	 * 根据id查询MILK_MAKING_RECORD所有信息
+	 *
+	 * @author Moon Cheng
+	 * @param id
+	 * @return
+	 */
+	public MilkMakingRecord selectMilkMakingRecord(Long id);
+
+	/**
+	 * 根据user查询所有冲奶信息
+	 *
+	 * @author Moon Cheng
+	 * @param user
+	 * @return
+	 */
+	public List<MilkMakingRecord> getMilkPowderByUser(Long user);
+	
+	
+	
+	/**
+	 * 根据user查询总冲奶量和次数
+	 * @param user
+	 * @return
+	 */
+	public RecordCountInfoDTO getMilkPowderSumByUser(Long user);
+	
+	/**
+	 * 将奶粉信息插入到奶粉信息表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkPowderInfo(MilkPowderInfo entity);
+
+	/**
+	 * 通过条形码查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderInfo(String barcode);
+
+	/**
+	 * 根据品牌查询奶粉信息的系列
+	 *
+	 * @param brand
+	 * @return
+	 */
+	public List<String> selectSeries(String brand);
+
+	/**
+	 * 根据系列查询奶粉信息的段数
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectLevel(String series);
+
+	
+	/**
+	 * 根据奶粉品牌获取奶粉，详细信息
+	 * @param brand 奶粉品牌
+	 * @return 详细信息
+	 */
+	public List<MilkInfoDTO> selectMilkInfoBybrand(String brand);
+	
+	
+	/**
+	 * 根据系列查询奶粉信息
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<MilkInfoDTO> selectMilkInfo( String series);
+
+	
+
+	/**
+	 * 根据系列查询奶粉类型
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkType(String series);
+
+	/**
+	 * 根据奶粉系列查询奶粉密度
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkDensity(String series);
+
+	/**
+	 * 根据系列查询奶粉比例
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkRatio(String series);
+
+	/**
+	 * 根据系列查询奶粉id
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<Long> selectMilkId(String series);
+
+	/**
+	 * 根据系列查询奶粉的重量
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkWeightPerSpoon(String series);
+
+	/**
+	 * 查询奶粉品牌
+	 *
+	 * @return
+	 */
+	public List<String> selectMilkPowderBrand();
+
+	/**
+	 * 根据系列段数品牌获取奶粉信息
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkInfoByBrandSeriesLevel(String brand, String series, String level);
+
+	/**
+	 * 查询冲奶记录的冲奶时间
+	 *
+	 * @return
+	 */
+	public Date selectLastRecordDate();
+
+	/**
+	 * 将信息插入到冲奶记录表中
+	 *
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void insertRecordData(MilkMakingRecord milkMakingRecord);
+
+	/**
+	 * 根据用户id查询冲奶机机器码
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public List<String> getMyMachines(Long userId);
+
+	/**
+	 * milk_images表中添加数据
+	 * @param entity
+	 */
+	public void insertMilkImages(MilkImages entity);
+	
+	/**
+	 * 通过barcode查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderByBar(String barcode);
+	
+}

iamberry-app-international-service/.svn/pristine/18/1841c0d2dfff4575ead276eb2f0966a57408fc31.svn-base

@@ -0,0 +1,287 @@
+package com.iamberry.app.service;
+
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_KEY;
+import static com.iamberry.app.config.ImberryConfig.SMS_PASSWORD;
+import static com.iamberry.app.config.ImberryConfig.SMS_TEXT;
+import static com.iamberry.app.config.ImberryConfig.SMS_URL;
+import static com.iamberry.app.config.ImberryConfig.SMS_USERNAME;
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_KEY;
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_TEXT;
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_URL;
+
+
+
+
+
+
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.core.entity.CodeValid;
+import com.iamberry.app.face.CodeService;
+import com.iamberry.app.mapper.CodeMapper;
+import com.iamberry.app.tool.util.Result;
+import com.iamberry.app.ulitity.Utility;
+import com.iamberry.wechat.tools.ResponseJson;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月1日
+ * @explain	验证码业务实现类
+ */
+@SuppressWarnings("unused")
+@Service
+public class CodeServiceImpl implements CodeService {
+
+	@Autowired
+	private CodeMapper codeMapper;
+	
+	private static String ENCODING = "UTF-8";
+
+	@Override
+	public ResponseJson sendCode(String phone, int codeScenario) {
+		// TODO Auto-generated method stub
+		// 第一步,判断使用通道，如果是+86开头，优先使用国内通道,否则默认使用国外通道
+		ResponseJson json = new ResponseJson();
+		if (StringUtils.isEmpty(phone)) {
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Phone Empty!");
+			return json;
+		}
+	
+		String phones = StringUtils.substringAfter(phone, ","); //截取
+		// 第二步,如果是国内，判断是否存在
+		CodeValid codeValid = codeMapper.getLast(phones);
+		
+		// 通道是否是中国的
+		boolean IS_CHANNEL_ZH = false;
+		if (StringUtils.startsWith(phone, "86,")) {
+				IS_CHANNEL_ZH = true;
+		} else {
+			IS_CHANNEL_ZH = false;
+		}
+		// 判断通道
+		Date now = new Date();
+		if (IS_CHANNEL_ZH && codeValid != null) {
+			// ** 切换通道需求：每次请求验证码，如果上一次验证码在一分钟以后，三分钟以内没有使用，那么切换通道 **//
+			if (now.getTime() <= (codeValid.getCodeValidDate().getTime()) && 
+					(now.getTime() - 60000) >= codeValid.getCodeSendDate().getTime() && codeValid.getCodeUse() == 2 && codeValid.getCodeScenario() == codeScenario) {
+				// 如果等待三分钟后，那么切换通道
+				IS_CHANNEL_ZH = false;
+			}
+		}
+		// 获取验证码
+		String code = Utility.getRandomCode(4);
+		json = sendCMS(phone, code, IS_CHANNEL_ZH ? 1 : 2);
+		if (json.getReturnCode() != 200) {
+			json = sendCMS(phone, code, IS_CHANNEL_ZH ? 1 : 2);
+		}
+		// 保存发送记录
+		codeValid = new CodeValid();
+		codeValid.setCodeChannel(IS_CHANNEL_ZH ? 1 : 2);
+		codeValid.setCodeMsg(json.getReturnMsg().get("returnMsg").toString());
+		codeValid.setCodePhone(phones);
+		codeValid.setCodeScenario(codeScenario);
+		codeValid.setCodeSendDate(now);
+		codeValid.setCodeValidDate(new Date(now.getTime() + 180000));
+		codeValid.setCodeStatus(json.getReturnCode() == 200 ? 3 : 4);
+		codeValid.setCodeUse(2);
+		codeValid.setCodeValue(Integer.parseInt(code));
+		codeMapper.save(codeValid);
+		return json;
+	}
+	
+	/**
+	 * @param phone		手机号码
+	 * @param code		短信验证码
+	 * @param channel	通道 1：主通道；2：备用通道(国外的电话通通使用此)
+	 * @return
+	 */
+	private ResponseJson sendCMS(String phone, String code, int channel) {
+		
+		// 国内号码
+		ResponseJson json = new ResponseJson();
+		json.setReturnCode(500);
+		String result = null;
+		try {
+			if (channel == 1) {
+				phone = StringUtils.substringAfter(phone, ","); //截取
+
+				// 使用主通道
+				result = sendZHCMS(phone, code);
+			} else {
+				phone = StringUtils.replace(phone,",",""); //替换
+				// 使用备用通道
+				result = sendOtherCMS(phone, code);
+			}
+		} catch (Exception e) {
+			result = e.getMessage();
+		}
+		if (StringUtils.equals(result, "SUCCESS")) {
+			json.setReturnCode(200);
+		}
+		json.addResponseKeyValue(result);
+		return json;
+	}
+	
+	private String sendOtherCMS(String phone, String code) {
+		String text = MessageFormat.format(INTER_SMS_TEXT, code);
+		String results = sendSms(text, "+"+phone);
+        JSONObject json =  JSONObject.fromObject(results);
+        String resultcod  = json.get("code").toString();
+        if(resultcod.equals("0")){
+        	System.out.println("使用备用通道，发送验证码成功!" + code);
+        	return "SUCCESS";
+        }else{
+        	System.out.println("使用备用通道，发送失败...!" + code);
+        	return results;
+        }
+		
+	}
+	
+	public static String sendSms(String text, String mobile)  {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("apikey", INTER_SMS_KEY);
+        params.put("text", text);
+        params.put("mobile", mobile);
+        return post(INTER_SMS_URL, params);
+    }
+    /** 基于HttpClient 4.3的通用POST方法
+    * @param url       提交的URL
+    * @param paramsMap 提交<参数，值>Map
+    * @return 提交响应
+    */
+
+    public static String post(String url, Map<String, String> paramsMap) {
+    	
+        CloseableHttpClient client = HttpClients.createDefault();
+        String responseText = "";
+        CloseableHttpResponse response = null;
+            try {
+                HttpPost method = new HttpPost(url);
+                if (paramsMap != null) {
+                    List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+                    for (Map.Entry<String, String> param : paramsMap.entrySet()) {
+                        NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+                        paramList.add(pair);
+                    }
+                    method.setEntity(new UrlEncodedFormEntity(paramList, ENCODING));
+                }
+                response = client.execute(method);
+                HttpEntity entity = response.getEntity();
+                if (entity != null) {
+                    responseText = EntityUtils.toString(entity);
+                }
+                
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    response.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            return responseText;
+        }
+	
+	
+	private String sendZHCMS(String phone, String code) throws Exception {
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		Map<String, String> params = new HashMap<String, String>();
+		CloseableHttpResponse response = null;
+		params.put("username", SMS_USERNAME);
+		params.put("password", SMS_PASSWORD);
+		params.put("mobile", phone);
+		params.put("content", MessageFormat.format(SMS_TEXT, code));
+		HttpPost method = new HttpPost(SMS_URL);
+		if (params != null) {
+			List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+			for (Map.Entry<String, String> param : params.entrySet()) {
+				NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+				paramList.add(pair);
+			}
+			method.setEntity(new UrlEncodedFormEntity(paramList, "UTF-8"));
+		}
+		response = client.execute(method);
+		HttpEntity entity = response.getEntity();
+		if (entity != null) {
+			String result = EntityUtils.toString(entity);
+			XStream xs = new XStream(new StaxDriver());
+			xs.alias("result", Result.class);
+			Result object = (Result)xs.fromXML(result);
+			response.close();
+			if (0 == object.getResultcode()) {
+				return "SUCCESS";
+			} else {
+				return object.getResultcode() + ":" + object.getErrordescription();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public ResponseJson validCode(String phone, String code, int codeScenario) {
+		ResponseJson json = new ResponseJson();
+		// 校验
+		CodeValid codeValid = codeMapper.getLast(phone);
+		if (codeValid == null) {
+			// 操作有误
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Wrong operation");
+			return json;
+		}
+		Date now = new Date();
+		if (now.getTime() >= codeValid.getCodeValidDate().getTime()) {
+			// 验证码无效
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Verification code is invalid");
+			return json;
+		}
+		// 必须 验证码正确，并且场景正确
+		if (!(codeValid.getCodeValue() == (Integer.parseInt(code)) 
+				&& codeScenario == codeValid.getCodeScenario())) {
+			// 验证码错误
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Verification code error");
+			return json;
+		}
+		// 只要校验，表示本次验证码使用
+		codeMapper.update(codeValid.getCodeId());
+		json.setReturnCode(200);
+		json.addResponseKeyValue("SUCCESS");
+		return json;
+	}
+	
+	
+	
+	
+	
+	
+}

iamberry-app-international-service/.svn/pristine/1c/1c7efa18b65588c3a0b918a7ea5068fa6c070587.svn-base

@@ -0,0 +1,285 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MilkMapper">
+
+	<sql id="milkAttribute">
+		id,
+		volume,
+		controller,
+		stars,
+		comments,
+		brand,
+		powder_info,
+		machine_name,
+		machine,
+		user,
+		timestamp_
+	</sql>
+	
+	<sql id="powderAttribute">
+		id,
+		powder_number,
+		spoon_picture,
+		bar_code,
+		brand,
+		series,
+		level,
+		version_,
+		age_range,
+		weight_per_spoon,
+		milk_volume_per_spoon,
+		powder_ratio,
+		density,
+		type,
+		status_,
+		created_on
+	</sql>
+	
+	<resultMap type="MilkMakingRecord" id="milkMap">
+		<id property="id" column="id"/>
+		<result property="volume" column="volume"/>
+		<result property="controller" column="controller"/>
+		<result property="stars" column="stars"/>
+		<result property="comments" column="comments"/>
+		<result property="brand" column="brand"/>
+		<result property="powder_info" column="powder_info"/>
+		<result property="machine_name" column="machine_name"/>
+		<result property="machine" column="machine"/>
+		<result property="user" column="user"/>
+		<result property="timestamp_" column="timestamp_"/>
+	</resultMap>
+	
+	<resultMap type="MilkPowderInfo" id="powderMap">
+		<id property="id" column="id"/>
+		<result property="powder_number" column="powder_number"/>
+		<result property="spoon_picture" column="spoon_picture"/>
+		<result property="bar_code" column="bar_code"/>
+		<result property="brand" column="brand"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="version_" column="version_"/>
+		<result property="age_range" column="age_range"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+		<result property="milk_volume_per_spoon" column="milk_volume_per_spoon"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="density" column="density"/>
+		<result property="type" column="type"/>
+		<result property="status_" column="status_"/>
+		<result property="created_on" column="created_on"/>
+	</resultMap>
+	
+	<resultMap type="com.iamberry.app.core.dto.MilkInfoDTO" id="milkInfoDtoMap">
+		<id property="id" column="id"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="type" column="type"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+	</resultMap>
+	
+	<!-- 添加信息到milk_making_record表中 -->
+	<insert id="insertMilkMakingRecord" parameterType="MilkMakingRecord" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_MAKING_RECORD
+		(VOLUME,CONTROLLER,STARS,COMMENTS,BRAND,POWDER_INFO,MACHINE_NAME,MACHINE,USER,TIMESTAMP_) 
+		VALUES
+		(#{volume},#{controller},#{stars},#{comments},#{brand},#{powder_info},#{machine_name},#{machine},#{user},NOW())
+	</insert>
+	
+	<!-- 根据id修改MILK_MAKING_RECORD的start和comments属性 -->
+	<update id="updateMilkMakingRecord">
+		UPDATE MILK_MAKING_RECORD SET STARS = #{0}, COMMENTS = #{1} WHERE ID = #{2}
+	</update>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			user = #{5} 
+		AND 
+			machine = #{6} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMachineMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			machine = #{5} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 根据id查询MILK_MAKING_RECORD所有信息 -->
+	<select id="selectMilkMakingRecord" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据user查询所有冲奶信息 -->
+	<select id="getMilkPowderByUser" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE USER = #{0}
+	</select>
+	
+	<!-- 根据user查询总冲奶量和次数 -->
+	<select id="getMilkPowderSumByUser" parameterType="java.lang.Long" resultType="com.iamberry.app.core.dto.RecordCountInfoDTO">
+		SELECT COUNT(1) count,SUM(VOLUME) total FROM MILK_MAKING_RECORD WHERE USER = #{0} 
+	</select>
+	
+	<!-- 将奶粉信息插入到奶粉信息表中 -->
+	<insert id="insertMilkPowderInfo" parameterType="MilkPowderInfo" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_POWDER_INFO
+			(POWDER_NUMBER,SPOON_PICTURE,BAR_CODE,BRAND,SERIES,LEVEL,VERSION_,AGE_RANGE,
+			WEIGHT_PER_SPOON,MILK_VOLUME_PER_SPOON,POWDER_RATIO,DENSITY,TYPE,STATUS_,CREATED_ON) 
+		VALUES
+			(#{powder_number},#{spoon_picture},#{bar_code},#{brand},#{series},#{level},#{version_},#{age_range},#{weight_per_spoon},
+			#{milk_volume_per_spoon},#{powder_ratio},#{density},#{type},#{status_},NOW())
+	</insert>
+	
+	<!-- 通过条形码查询奶粉信息 -->
+	<select id="selectMilkPowderInfo" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} AND UPPER(STATUS_) = 'APPROVED' 
+	</select>
+	
+	<!-- 根据品牌查询奶粉信息的系列 -->
+	<select id="selectSeries" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT 
+			series 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{brand} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息的段数 -->
+	<select id="selectLevel" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT level FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC 
+	</select>
+	
+	<!-- 根据奶粉品牌获取奶粉，详细信息 -->
+	<select id="selectMilkInfoBybrand" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			series,
+			level,
+			type,
+			id,
+			powder_ratio,
+			weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{0} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息 -->
+	<select id="selectMilkInfo" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			level,type,id,powder_ratio,weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			SERIES LIKE #{0} 
+		ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉类型 -->
+	<select id="selectMilkType" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT type FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据奶粉系列查询奶粉密度 -->
+	<select id="selectMilkDensity" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT density FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉比例 -->
+	<select id="selectMilkRatio" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT powder_ratio FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉id -->
+	<select id="selectMilkId" parameterType="java.lang.String" resultType="java.lang.Long">
+		SELECT id FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉的重量 -->
+	<select id="selectMilkWeightPerSpoon" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT weight_per_spoon FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 查询奶粉品牌 -->
+	<select id="selectMilkPowderBrand" resultType="java.lang.String">
+		SELECT brand FROM MILK_POWDER_INFO WHERE STATUS_ = 'approved' GROUP BY BRAND
+	</select>
+	
+	<!-- 根据系列段数品牌获取奶粉信息 -->
+	<select id="selectMilkInfoByBrandSeriesLevel" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BRAND = #{0} AND SERIES = #{1} AND LEVEL = #{2} 
+	</select>
+	
+	<!-- 查询冲奶记录的冲奶时间 -->
+	<select id="selectLastRecordDate" resultType="java.util.Date">
+		SELECT timestamp_ FROM MILK_MAKING_RECORD WHERE CONTROLLER = 'machine' ORDER BY ID DESC LIMIT 1 
+	</select>
+	
+	<!-- 根据用户id查询冲奶机机器码 -->
+	<select id="getMyMachines" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT machine_mac FROM MACHINE WHERE OWNER = #{0}
+	</select>
+	
+	<!-- 将信息插入到冲奶记录表中 -->
+	<insert id="insertRecordData" parameterType="MilkMakingRecord">
+		INSERT INTO milk_making_record (volume, controller, machine, timestamp_, user) VALUE (#{volume}, 'machine', #{machine}, #{timestamp_}, #{user})
+	</insert>
+	
+	<!-- milk_images表中添加数据 -->
+	<insert id="insertMilkImages" parameterType="MilkImages" useGeneratedKeys="true" keyProperty="image_id">
+		INSERT INTO MILK_IMAGES
+		(
+			IMAGE_MILK_ID,IMAGE_FRONT,IMAGE_BAR,IMAGE_FEED
+		) 
+		VALUES 
+		(
+			#{image_Milk_ID},#{image_Front},#{image_Bar},#{image_Feed}
+		)
+	</insert>
+	
+	<!-- 通过bar_code查询奶粉信息 -->
+	<select id="selectMilkPowderByBar" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} 
+	</select>
+	
+	<!-- 根据设备id查询最新一条冲奶记录 -->
+	<select id="selectMakingRecordAndmachine" parameterType="String" resultType="java.util.Date">
+		SELECT timestamp_ from milk_making_record where machine = #{machine} order by timestamp_ desc LIMIT 1
+	</select>
+</mapper>

iamberry-app-international-service/.svn/pristine/1f/1ff8519924b79f823f3dd8265176912dc799f4da.svn-base

@@ -0,0 +1,209 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MessageMapper">
+	<sql id="messageAllField">
+		ID,TITLE, CONTENT,URL,
+		FORWORD,IS_NEEDSEND,IS_READ,
+		CREATE_DATE,READ_DATE,SEND_TYPE,
+		USER,REMARK,SEND_RESULT
+	</sql>
+	<!--通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
+    <resultMap type="Message" id="messageMap">
+        <id property="id" column="ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="content" column="CONTENT"/>
+        <result property="url" column="URL"/>
+        <result property="forword" column="FORWORD"/>
+        <result property="is_needsend" column="IS_NEEDSEND"/>
+        
+        <result property="is_read" column="IS_READ"/>
+        <result property="create_date" column="CREATE_DATE"/>
+        <result property="read_date" column="READ_DATE"/>
+        <result property="send_type" column="SEND_TYPE"/>
+        <result property="user" column="USER"/>
+        <result property="remark" column="REMARK"/>
+        <result property="send_result" column="SEND_RESULT"/>
+    </resultMap>
+    
+	<sql id="userAttribute">
+		ID,
+		USERNAME,
+		PASSWORD,
+		TOKEN,
+		DISPLAY_NAME,
+		DISPLAY_PICTURE,
+		CREATED_ON,
+		EXT_OPEN_ID,
+		EXT_NAME,
+		EXT_TYPE,
+		LOCATION,
+		BABY_NICKNAME,
+		BABY_DOB,
+		BABY_GENDER,
+		STATUS_ 
+	</sql>
+	
+	<!-- 查询符合条件的用户列表 -->
+	<select id="selectUser" parameterType="PageBean" resultType="User">
+		SELECT 
+			<include refid="userAttribute"></include>
+		FROM USER
+		WHERE 1=1
+	    <if test="params.username!=null and params.username!=''" >
+			AND USERNAME LIKE CONCAT('%',#{params.username},'%')
+	    </if>
+		<if test='recordBegin>0 and pageSize>0'>
+			limit ${recordBegin},${pageSize}
+	    </if>
+	    <if test='recordBegin==0 and pageSize>0 '>
+			limit ${pageSize}
+	    </if> 
+	</select>
+	
+	<!-- 获取用户总条数 -->
+	<select id="selectUserCount" parameterType="SerchParam" resultType="int">
+		SELECT COUNT(ID) FROM USER WHERE 1=1 
+	 	<if test="username!=null and username!=''">
+    		AND USERNAME LIKE CONCAT('%',#{username},'%')
+    	</if>
+	</select>
+	
+	<!-- 获取符合条件所有消息 -->
+	<select id="selectMessageRecoreds" parameterType="PageBean" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM (
+			SELECT ID,TITLE, CONTENT,URL,FORWORD,IS_NEEDSEND,IS_READ,CREATE_DATE,READ_DATE,SEND_TYPE,
+			(SELECT USERNAME FROM USER WHERE ID = a.user) USER,REMARK,SEND_RESULT  FROM MESSAGE a 
+		) a
+    	WHERE 1=1
+    	<if test="params.title!=null and params.title!=''" >
+			AND TITLE LIKE CONCAT('%',#{params.title},'%') 
+    	</if>
+		<if test="params.username!=null and params.username!=''">
+			AND USER LIKE CONCAT('%',#{params.username},'%') 
+		</if>
+		<if test="params.beginDate!= null and  params.beginDate!= ''" >
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') >= DATE_FORMAT(#{params.beginDate},'%Y-%m-%d')]]>
+		</if>
+		<if test="params.endDate!= null and params.endDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') <= DATE_FORMAT(#{params.endDate},'%Y-%m-%d')]]>
+    	</if>
+		ORDER BY CREATE_DATE DESC,USER 
+	    <if test='recordBegin>0 and pageSize>0'>
+			LIMIT ${recordBegin},${pageSize}
+	    </if>
+	    <if test='recordBegin==0 and pageSize>0 '>
+			LIMIT ${pageSize}
+	    </if>
+	</select>
+	
+	<!-- 获取所有消息的总条数 -->
+	<select id="selectMessageCount" parameterType="SerchParam" resultType="int">
+		SELECT COUNT(1) FROM MESSAGE
+		WHERE 1=1
+	    <if test="title!=null and title!=''">
+			AND TITLE LIKE CONCAT('%',#{title},'%') 
+	    </if>
+	    <if test="beginDate!= null and  beginDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') >= DATE_FORMAT(#{beginDate},'%Y-%m-%d')]]>
+	    </if>
+	    <if test="endDate!= null and endDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') <= DATE_FORMAT(#{endDate},'%Y-%m-%d')]]>
+	    </if>
+	</select>
+	
+	<!-- 根据id 修改一条消息 -->
+	<update id="updateMessage" parameterType="Message">
+		UPDATE MESSAGE 
+		<set>
+			<if test="title != null and title != ''">
+				TITLE=#{title},
+			</if>
+			<if test="content != null and content != ''">
+				CONTENT=#{content},
+			</if>
+			<if test="url != null and url != ''">
+				URL=#{url},
+			</if>
+			<if test="forword != null and forword != ''">
+				FORWORD=#{forword},
+			</if>
+			<if test="is_needsend != null and is_needsend != ''">
+				IS_NEEDSEND=#{is_needsend},
+			</if>
+			<if test="is_read != null and is_read != ''">
+				IS_READ=#{is_read},
+			</if>
+			<if test="create_date != null and create_date != ''">
+				CREATE_DATE=#{create_date},
+			</if>
+			<if test="read_date != null and read_date != ''">
+				READ_DATE=#{read_date},
+			</if>
+			<if test="send_type != null and send_type != ''">
+				SEND_TYPE=#{send_type},
+			</if>
+			<if test="user != null and user != ''">
+				USER=#{user},
+			</if>
+			<if test="remark != null and remark != ''">
+				REMARK=#{remark},
+			</if>
+			<if test="send_result != null and send_result != ''">
+				SEND_RESULT=#{send_result}
+			</if>
+		</set>
+		WHERE ID=#{id}
+	</update>
+	
+	<!-- 添加一条消息 -->
+	<insert id="insertMessage" parameterType="Message"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MESSAGE
+			(
+				TITLE, CONTENT,URL, FORWORD,IS_NEEDSEND,IS_READ,
+				CREATE_DATE,READ_DATE,SEND_TYPE, USER,REMARK,SEND_RESULT
+			)
+		VALUES
+			(
+				#{title},#{content},#{url},#{forword},#{is_needsend},#{is_read},
+				#{create_date},#{read_date},#{send_type},#{user},
+				#{remark},#{send_result}
+			)
+	</insert>
+	
+	<!-- 获取系统的所有消息 -->
+	<select id="selectSysMessageRecoreds" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM MESSAGE 
+		WHERE USER IS NULL 
+		ORDER BY CREATE_DATE DESC
+	</select>
+	
+	<!-- 根据id获取一条信息  -->
+	<select id="selectUserMessageByid" parameterType="Long" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM MESSAGE WHERE ID = #{id}
+	</select>
+	
+	<!-- 根据用户id获取该用户的所有消息 -->
+	<select id="selectUserMessageRecoreds" parameterType="Long" resultMap="messageMap">
+		SELECT
+			<include refid="messageAllField"></include>
+		FROM MESSAGE WHERE USER=#{userid}  ORDER BY CREATE_DATE DESC
+	</select>
+	
+	<!--  获取某状态的用户消息 -->
+	<select id="selectUserMessageByisread" resultType="int">
+		SELECT COUNT(1)  FROM message where is_read = #{1} and user=#{0}	
+	</select>
+</mapper>

iamberry-app-international-service/.svn/pristine/20/20d693c03189339341c7e9da8fb091cfc2431bae.svn-base

@@ -0,0 +1,181 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.UserMapper">
+
+	<sql id="userAttribute">
+		id,
+		username,
+		password,
+		token,
+		display_name,
+		display_picture,
+		created_on,
+		ext_open_id,
+		ext_name,
+		ext_type,
+		location,
+		baby_nickname,
+		baby_dob,
+		baby_gender,
+		status_,
+		country_code,
+		is_perfect_user
+	</sql>
+	
+	<resultMap type="User" id="userMap">
+		<id property="id" column="id"/>
+		<result property="username" column="username"/>
+		<result property="password" column="password"/>
+		<result property="token" column="token"/>
+		<result property="display_name" column="display_name"/>
+		<result property="display_picture" column="display_picture"/>
+		<result property="created_on" column="created_on"/>
+		<result property="ext_open_id" column="ext_open_id"/>
+		<result property="ext_name" column="ext_name"/>
+		<result property="ext_type" column="ext_type"/>
+		<result property="location" column="location"/>
+		<result property="baby_nickname" column="baby_nickname"/>
+		<result property="baby_dob" column="baby_dob"/>
+		<result property="baby_gender" column="baby_gender"/>
+		<result property="status_" column="status_"/>
+		<result property="is_perfect_user" column="is_perfect_user"/>
+		<result property="country_code" column="country_code"/>
+	</resultMap>
+	
+	<!-- 根据id查询user所有信息 -->
+	<select id="selectUserById"  parameterType="java.lang.Long" resultMap="userMap">
+		SELECT 
+			<include refid="userAttribute" />
+		FROM USER WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据username查询user所有信息 -->
+	<select id="selectUserByUsername" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute" /> FROM USER WHERE USERNAME = #{0}
+	</select>
+	
+	<!-- 通过ext_open_id查询user所有信息 -->
+	<select id="selectUserByExtOpenId" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute" /> FROM USER WHERE EXT_OPEN_ID = #{0}
+	</select>
+	
+	<!-- 添加用户信息到user表中 -->
+	<insert id="insertUser" parameterType="User" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO USER 
+		(USERNAME,PASSWORD,TOKEN,DISPLAY_NAME,DISPLAY_PICTURE,CREATED_ON,EXT_OPEN_ID,EXT_NAME,EXT_TYPE,
+		LOCATION,BABY_NICKNAME,BABY_DOB,BABY_GENDER,STATUS_,country_code,is_perfect_user) 
+		VALUES 
+		(#{username},#{password},#{token},#{display_name},#{display_picture},NOW(),#{ext_open_id},#{ext_name},#{ext_type},
+		#{location},#{baby_nickname},#{baby_dob},#{baby_gender},#{status_},#{country_code},#{is_perfect_user})
+	</insert>
+	
+	<!-- 根据id修改user表数据 -->
+	<update id="updateUser" parameterType="User">
+		UPDATE USER 
+		<set>
+			<if test="username != null and username != ''">
+				USERNAME = #{username}, 
+			</if>
+			<if test="password != null and password != ''">
+				PASSWORD = #{password}, 
+			</if>
+			<if test="token != null and token != ''">
+				TOKEN = #{token}, 
+			</if>
+			<if test="display_name != null and display_name != ''">
+				DISPLAY_NAME = #{display_name}, 
+			</if>
+			<if test="display_picture != null and display_picture != ''">
+				DISPLAY_PICTURE = #{display_picture}, 
+			</if>
+			<if test="ext_open_id != null and ext_open_id != ''">
+				EXT_OPEN_ID = #{ext_open_id}, 
+			</if>
+			<if test="ext_name != null and ext_name != ''">
+				EXT_NAME = #{ext_name}, 
+			</if>
+			<if test="ext_type != null and ext_type != ''">
+				EXT_TYPE = #{ext_type}, 
+			</if>
+			<if test="location != null and location != ''">
+				LOCATION = #{location}, 
+			</if>
+			<if test="baby_nickname != null and baby_nickname != ''">
+				BABY_NICKNAME = #{baby_nickname}, 
+			</if>
+			<if test="baby_dob != null and baby_dob != ''">
+				BABY_DOB = #{baby_dob}, 
+			</if>
+			<if test="baby_gender != null and baby_gender != ''">
+				BABY_GENDER = #{baby_gender}, 
+			</if>
+			<if test="status_ != null and status_ != ''">
+				STATUS_ = #{status_} 
+			</if>
+		</set>
+		WHERE 
+			ID = #{id} 
+	</update>
+	
+	<!-- 根据id修改user表的个人头像 -->
+	<update id="updateDisplayPicture">
+		UPDATE USER SET DISPLAY_PICTURE = #{0} WHERE ID = #{1} 
+	</update>
+	
+	<!-- 根据用户名和密码查询用户表信息 -->
+	<select id="validateUser" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute"/> FROM USER WHERE USERNAME=#{0} AND PASSWORD=#{1} 
+	</select>
+	
+	<!-- 通过id修改用户表密码 -->
+	<update id="changePassword">
+		UPDATE USER SET PASSWORD=#{1} WHERE ID=#{0}
+	</update>
+	
+	<!-- 通过token查询user表所有信息 -->
+	<select id="selectUserByToken" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute"/> FROM USER WHERE TOKEN=#{0} 
+	</select>
+	
+	<!-- 根据id修改token值 -->
+	<update id="updateUserToken">
+		UPDATE USER SET TOKEN=#{0} WHERE ID=#{1}
+	</update>
+	
+	<!-- 根据id修改user表的用户名 修改IS_PERFECT_USER字段未已完善状态-->
+	<update id="updateUserName">
+	
+		UPDATE USER SET USERNAME=#{0},IS_PERFECT_USER=2 WHERE ID=#{1}                  
+	</update>
+	
+	<!-- 根据id修改user表的用户名和国家代码 -->
+	<update id="updateUserNameAndCountry">
+		UPDATE USER SET USERNAME=#{0},country_code=#{1},IS_PERFECT_USER=2 WHERE ID=#{2}                  
+	</update>
+	
+	<!-- 通过key_查询sys_config表数据 -->
+	<select id="selectConfig" parameterType="java.lang.String" resultType="String">
+		SELECT VALUE_ FROM SYS_CONFIG WHERE KEY_ = #{0}
+	</select>
+	
+	<!-- USER_AVATOR表中添加数据 -->
+	<insert id="insertUserAvator">
+		INSERT INTO USER_AVATOR (USER_ID, AVATOR) VALUE (#{0}, #{1})
+	</insert>
+	
+	<!-- 通过user_id修改USER_AVATOR表数据 -->
+	<update id="updateUserAvator">
+		UPDATE USER_AVATOR SET AVATOR = #{1} WHERE USER_ID = #{0}
+	</update>
+	
+	<!-- 根据user_id查询USER_AVATOR表数据 -->
+	<select id="selectUserAvator" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT avator FROM USER_AVATOR WHERE USER_ID = #{id}
+	</select>
+</mapper>

iamberry-app-international-service/.svn/pristine/22/22afb8c50aed52533783208bde4216320e030f17.svn-base

@@ -0,0 +1,360 @@
+package com.iamberry.app.service;
+
+
+import static com.iamberry.app.config.ImberryConfig.BASE_URL;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.dto.RemoteIpInfoDTO;
+import com.iamberry.app.core.dto.UserDTO;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.UserService;
+import com.iamberry.app.tool.util.AES;
+import com.iamberry.app.tool.util.HttpUtility;
+import com.iamberry.app.tool.util.MD5;
+import com.iamberry.app.tool.util.TuyaConnector;
+import com.iamberry.app.ulitity.Utility;
+/**
+ * UserService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:29
+ */
+@Service
+public class UserServiceImpl extends BaseService implements UserService {
+	
+	private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
+	/**
+	 * register
+	 *
+	 * @author Moon Cheng
+	 * @param phone 电话号码
+	 * @param password 密码
+	 * @param ip ip地址
+	 * @return User Information
+	 */
+	@Transactional
+	public User register(String phone, String password, String ip) {
+		String areacode = StringUtils.substringBefore(phone, ","); 
+		phone = StringUtils.substringAfter(phone, ",");
+		User user = new User(phone, MD5.md5(password), new Date(), Constants.USER_ACTIVE);
+		
+		user.setDisplay_name("Iamberry");
+		user.setStatus_(Constants.USER_ACTIVE);
+		user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+		RemoteIpInfoDTO dto = getLocation(ip);
+		if (dto != null) {
+			try {
+				user.setLocation(dto.getCity());
+			} catch (Exception e) {
+				user.setLocation("未知");
+			}
+		}
+		user.setCountry_code(areacode);
+		user.setCreated_on(new Date());
+		user.setIs_perfect_user(1);//标示用户有没有绑定手机号 1未绑定 2绑定
+		userMapper.insertUser(user);
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * thirdPartBindingPhone
+	 * @param phone
+	 * @param openId
+	 * @return
+	 */
+	public User thirdPartBindingPhone(String phone, String openId) {
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			return null;
+		}
+		
+		String areacode = StringUtils.substringBefore(phone, ",");
+		phone = StringUtils.substringAfter(phone, ",");
+		
+		try {
+			int status = userMapper.updateUserNameAndCountry(phone,areacode, user.getId());
+			if (status > 0) {
+				
+				user.setUsername(phone);
+				user.setPassword(null);
+			} else {
+				return null;
+			}
+			return user;
+		} catch (DuplicateKeyException e) { // 报错，触发数据库唯一约束错误，系统捕获，而后对获取数据重头再来
+			user.setPassword("EXTIES");
+			logger.info("userinfo:" + user.toString());
+			return user;
+		}
+	}
+
+	/**
+	 * findById
+	 * @param id
+	 * @return User
+	 */
+	public User findById(Long id) {
+		User user = userMapper.selectUserById(id);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * login
+	 *
+	 * @param phone
+	 * @param password
+	 * @param userAgent
+	 * @return
+	 */
+	public Object login(String phone, String password) {
+		User user = userMapper.selectUserByUsername(phone);
+		if (user == null) {
+			return -1;
+		}
+		user = userMapper.validateUser(phone, MD5.md5(password));
+		if (user == null) {
+			return -2;
+		}
+		if (Constants.USER_INACTIVE.equals(user.getStatus_())) {
+			return -3;
+		}
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return tuyaConnect(user);
+	}
+
+	/**
+	 * thirdPartLogin
+	 *
+	 * @param openId
+	 * @param extType
+	 * @param extName
+	 * @param extPicture
+	 * @return
+	 */
+	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) {
+		
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			user = new User(openId, MD5.md5(String.valueOf(System.currentTimeMillis())), new Date(), Constants.USER_ACTIVE);
+			user.setExt_open_id(openId);
+			user.setExt_type(extType);
+			user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+			user.setIs_perfect_user(1);//是否完善用户信息 1.未完善。2.已完善
+			user.setCountry_code("86");
+			user.setDisplay_name(extName.replaceAll("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]", "*"));
+
+			RemoteIpInfoDTO dto = getLocation(ip);
+			if (dto != null) {
+				user.setLocation(dto.getCity());
+			}
+			//user.setCountry_code(areacode);
+			user.setDisplay_picture(extPicture);
+			userMapper.insertUser(user);
+		}
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateUserInfo
+	 *
+	 * @param user
+	 * @param token
+	 * @return
+	 */
+	public User updateUserInfo(User user, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		user.setId(userInfo.getId());
+		userMapper.updateUser(user);
+		user = userMapper.selectUserById(user.getId());
+
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateDisplayPicture
+	 *
+	 * @author Moon Cheng
+	 * @param base64
+	 * @param token
+	 * @return
+	 */
+	public String updateDisplayPicture(String imageURL, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		/*if (userMapper.updateUserAvator(userInfo.getId(), base64) < 1) {
+			userMapper.insertUserAvator(userInfo.getId(), base64);
+		}*/
+	
+
+		// final String BASE_URL = "http://localhost/imberry-api";
+		int status = userMapper.updateDisplayPicture(imageURL, userInfo.getId());
+		if (status < 1) {
+			return "";
+		}
+		return imageURL;
+	}
+
+	/**
+	 * changePhone
+	 *
+	 * @author Moon Cheng
+	 * @param phone
+	 * @param token
+	 * @return
+	 */
+	public User changePhone(String phone, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		userMapper.updateUserName(phone, userInfo.getId());
+		userInfo = userMapper.selectUserById(userInfo.getId());
+		userInfo.setPassword(null);
+		return userInfo;
+	}
+
+	/**
+	 * resetPassWord
+	 *
+	 * @param oldPassword
+	 * @param newPassword
+	 * @param token
+	 * @return
+	 */
+	public int changePassword(String oldPassword, String newPassword, String token) {
+		int status = -1;
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+
+		User user = userMapper.validateUser(userInfo.getUsername(), MD5.md5(oldPassword));
+		if (user == null) {
+			return 0;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	/**
+	 * changePassWord
+	 *
+	 * @param username,
+	 *            newPassword
+	 * @param session
+	 * @return int
+	 */
+	public int resetPassWord(String username, String newPassword) {
+		int status = 0;
+		User user = userMapper.selectUserByUsername(username);
+		if (user == null) {
+			return -3;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	public UserDTO tuyaConnect(User user) {
+		UserDTO userInfo = new UserDTO(user.getId(), user.getUsername(), user.getPassword(), user.getToken(), user.getDisplay_name(),
+				user.getDisplay_picture(), user.getCreated_on(), user.getExt_open_id(), user.getExt_name(), user.getExt_type(),
+				user.getLocation(), user.getBaby_nickname(), user.getBaby_dob(), user.getBaby_gender(), user.getStatus_());
+		userInfo.setPassword(null);
+		userInfo.setCountry_code(user.getCountry_code());
+		userInfo.setIs_perfect_user(user.getIs_perfect_user());
+		try {
+			userInfo.setEncryptUsername(AES.encrypt(user.getUsername()));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		userInfo.setUserCode("iamberry123");
+		// Tuya connection
+		TuyaConnector.TuyaSyncConnect(user.getCountry_code()+","+userInfo.getEncryptUsername(), userInfo.getUserCode());
+		return userInfo;
+	}
+
+	/**
+	 * getStartPage
+	 *
+	 * @return String
+	 */
+	public String getStartPage() {
+		return userMapper.selectConfig("start_page");
+	}
+
+	/**
+	 * getLocation
+	 *
+	 * @param ip
+	 * @return String
+	 */
+	public RemoteIpInfoDTO getLocation(String ip) {
+		RemoteIpInfoDTO remoteIpInfoDTO = new RemoteIpInfoDTO();
+//		if (ip.indexOf(",") != -1) {
+//			ip = ip.split(",")[0];
+//		}
+//		logger.info("IP为:" + ip);
+//		try {
+//			String result = HttpUtility.httpsGet(MessageFormat.format(ImberryConfig.SINA_IP_URL, ip));
+//			remoteIpInfoDTO = mapper.readValue(result, RemoteIpInfoDTO.class);
+//		} catch (Exception e) {
+//		}
+		return remoteIpInfoDTO;
+	}
+
+	/**
+	 * getApkVersion
+	 *
+	 * @return
+	 */
+	public String getApkVersion(){
+		return userMapper.selectConfig("apk_version");
+	}
+
+	@Override
+	public String selectUserAvator(Long id) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserAvator(id);
+	}
+
+	@Override
+	public User selectUserByUsername(String username) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserByUsername(username);
+	}
+
+}

iamberry-app-international-service/.svn/pristine/32/32ad929fdffcdec789274929c308c99854de7ff0.svn-base

@@ -0,0 +1,235 @@
+package com.iamberry.app.mapper;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectKey;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Repository;
+
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.sqlprovider.DMLProvider;
+
+public interface MilkMapper {
+
+	/**
+	 * 添加信息到milk_making_record表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkMakingRecord(MilkMakingRecord entity);
+
+	/**
+	 * 根据id修改MILK_MAKING_RECORD的start和comments属性
+	 *
+	 * @param stars
+	 * @param comments
+	 * @param id
+	 */
+	public void updateMilkMakingRecord(int stars, String comments, Long id);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param userId
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, Long userId, String devId);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param devids
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMachineMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, String devids);
+
+	/**
+	 * 根据id查询MILK_MAKING_RECORD所有信息
+	 *
+	 * @author Moon Cheng
+	 * @param id
+	 * @return
+	 */
+	public MilkMakingRecord selectMilkMakingRecord(Long id);
+
+	/**
+	 * 根据user查询所有冲奶信息
+	 *
+	 * @author Moon Cheng
+	 * @param user
+	 * @return
+	 */
+	public List<MilkMakingRecord> getMilkPowderByUser(Long user);
+	
+	
+	
+	/**
+	 * 根据user查询总冲奶量和次数
+	 * @param user
+	 * @return
+	 */
+	public RecordCountInfoDTO getMilkPowderSumByUser(Long user);
+	
+	/**
+	 * 将奶粉信息插入到奶粉信息表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkPowderInfo(MilkPowderInfo entity);
+
+	/**
+	 * 通过条形码查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderInfo(String barcode);
+
+	/**
+	 * 根据品牌查询奶粉信息的系列
+	 *
+	 * @param brand
+	 * @return
+	 */
+	public List<String> selectSeries(String brand);
+
+	/**
+	 * 根据系列查询奶粉信息的段数
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectLevel(String series);
+
+	
+	/**
+	 * 根据奶粉品牌获取奶粉，详细信息
+	 * @param brand 奶粉品牌
+	 * @return 详细信息
+	 */
+	public List<MilkInfoDTO> selectMilkInfoBybrand(String brand);
+	
+	
+	/**
+	 * 根据系列查询奶粉信息
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<MilkInfoDTO> selectMilkInfo( String series);
+
+	
+
+	/**
+	 * 根据系列查询奶粉类型
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkType(String series);
+
+	/**
+	 * 根据奶粉系列查询奶粉密度
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkDensity(String series);
+
+	/**
+	 * 根据系列查询奶粉比例
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkRatio(String series);
+
+	/**
+	 * 根据系列查询奶粉id
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<Long> selectMilkId(String series);
+
+	/**
+	 * 根据系列查询奶粉的重量
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkWeightPerSpoon(String series);
+
+	/**
+	 * 查询奶粉品牌
+	 *
+	 * @return
+	 */
+	public List<String> selectMilkPowderBrand();
+
+	/**
+	 * 根据系列段数品牌获取奶粉信息
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkInfoByBrandSeriesLevel(String brand, String series, String level);
+
+	/**
+	 * 查询冲奶记录的冲奶时间
+	 *
+	 * @return
+	 */
+	public Date selectLastRecordDate();
+
+	/**
+	 * 将信息插入到冲奶记录表中
+	 *
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void insertRecordData(MilkMakingRecord milkMakingRecord);
+
+	/**
+	 * 根据用户id查询冲奶机机器码
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public List<String> getMyMachines(Long userId);
+
+	/**
+	 * milk_images表中添加数据
+	 * @param entity
+	 */
+	public void insertMilkImages(MilkImages entity);
+}

iamberry-app-international-service/.svn/pristine/38/3849d89ceb4b15187eea4a77937957b86ec9ea5c.svn-base

@@ -0,0 +1,28 @@
+package com.iamberry.app.service;
+
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.core.entity.SysLog;
+import com.iamberry.app.face.LogService;
+
+/**
+ * LogService
+ * 
+ * @author Moon Cheng
+ * @date 2016年3月23日 下午2:34:45
+ */
+@Service
+public class LogServiceImpl extends BaseService implements LogService  {
+
+	/**
+	 * saveSystemLog
+	 * 
+	 * @author Moon Cheng
+	 * @param log
+	 * @return
+	 */
+	public SysLog saveSystemLog(SysLog log) {
+		logMapper.insertSysLog(log);
+		return log;
+	}
+}

iamberry-app-international-service/.svn/pristine/46/46abeecde743fcaed214acb7b84f96168982da98.svn-base

@@ -0,0 +1,275 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MilkMapper">
+
+	<sql id="milkAttribute">
+		id,
+		volume,
+		controller,
+		stars,
+		comments,
+		brand,
+		powder_info,
+		machine_name,
+		machine,
+		user,
+		timestamp_
+	</sql>
+	
+	<sql id="powderAttribute">
+		id,
+		powder_number,
+		spoon_picture,
+		bar_code,
+		brand,
+		series,
+		level,
+		version_,
+		age_range,
+		weight_per_spoon,
+		milk_volume_per_spoon,
+		powder_ratio,
+		density,
+		type,
+		status_,
+		created_on
+	</sql>
+	
+	<resultMap type="MilkMakingRecord" id="milkMap">
+		<id property="id" column="id"/>
+		<result property="volume" column="volume"/>
+		<result property="controller" column="controller"/>
+		<result property="stars" column="stars"/>
+		<result property="comments" column="comments"/>
+		<result property="brand" column="brand"/>
+		<result property="powder_info" column="powder_info"/>
+		<result property="machine_name" column="machine_name"/>
+		<result property="machine" column="machine"/>
+		<result property="user" column="user"/>
+		<result property="timestamp_" column="timestamp_"/>
+	</resultMap>
+	
+	<resultMap type="MilkPowderInfo" id="powderMap">
+		<id property="id" column="id"/>
+		<result property="powder_number" column="powder_number"/>
+		<result property="spoon_picture" column="spoon_picture"/>
+		<result property="bar_code" column="bar_code"/>
+		<result property="brand" column="brand"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="version_" column="version_"/>
+		<result property="age_range" column="age_range"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+		<result property="milk_volume_per_spoon" column="milk_volume_per_spoon"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="density" column="density"/>
+		<result property="type" column="type"/>
+		<result property="status_" column="status_"/>
+		<result property="created_on" column="created_on"/>
+	</resultMap>
+	
+	<resultMap type="com.iamberry.app.core.dto.MilkInfoDTO" id="milkInfoDtoMap">
+		<id property="id" column="id"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="type" column="type"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+	</resultMap>
+	
+	<!-- 添加信息到milk_making_record表中 -->
+	<insert id="insertMilkMakingRecord" parameterType="MilkMakingRecord" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_MAKING_RECORD
+		(VOLUME,CONTROLLER,STARS,COMMENTS,BRAND,POWDER_INFO,MACHINE_NAME,MACHINE,USER,TIMESTAMP_) 
+		VALUES
+		(#{volume},#{controller},#{stars},#{comments},#{brand},#{powder_info},#{machine_name},#{machine},#{user},NOW())
+	</insert>
+	
+	<!-- 根据id修改MILK_MAKING_RECORD的start和comments属性 -->
+	<update id="updateMilkMakingRecord">
+		UPDATE MILK_MAKING_RECORD SET STARS = #{0}, COMMENTS = #{1} WHERE ID = #{2}
+	</update>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			user = #{5} 
+		AND 
+			machine = #{6} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMachineMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			machine = #{5} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 根据id查询MILK_MAKING_RECORD所有信息 -->
+	<select id="selectMilkMakingRecord" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据user查询所有冲奶信息 -->
+	<select id="getMilkPowderByUser" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE USER = #{0}
+	</select>
+	
+	<!-- 根据user查询总冲奶量和次数 -->
+	<select id="getMilkPowderSumByUser" parameterType="java.lang.Long" resultType="com.iamberry.app.core.dto.RecordCountInfoDTO">
+		SELECT COUNT(1) count,SUM(VOLUME) total FROM MILK_MAKING_RECORD WHERE USER = #{0} 
+	</select>
+	
+	<!-- 将奶粉信息插入到奶粉信息表中 -->
+	<insert id="insertMilkPowderInfo" parameterType="MilkPowderInfo" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_POWDER_INFO
+			(POWDER_NUMBER,SPOON_PICTURE,BAR_CODE,BRAND,SERIES,LEVEL,VERSION_,AGE_RANGE,
+			WEIGHT_PER_SPOON,MILK_VOLUME_PER_SPOON,POWDER_RATIO,DENSITY,TYPE,STATUS_,CREATED_ON) 
+		VALUES
+			(#{powder_number},#{spoon_picture},#{bar_code},#{brand},#{series},#{level},#{version_},#{age_range},#{weight_per_spoon},
+			#{milk_volume_per_spoon},#{powder_ratio},#{density},#{type},#{status_},NOW())
+	</insert>
+	
+	<!-- 通过条形码查询奶粉信息 -->
+	<select id="selectMilkPowderInfo" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} AND UPPER(STATUS_) = 'APPROVED' 
+	</select>
+	
+	<!-- 根据品牌查询奶粉信息的系列 -->
+	<select id="selectSeries" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT 
+			series 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{brand} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息的段数 -->
+	<select id="selectLevel" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT level FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC 
+	</select>
+	
+	<!-- 根据奶粉品牌获取奶粉，详细信息 -->
+	<select id="selectMilkInfoBybrand" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			series,
+			level,
+			type,
+			id,
+			powder_ratio,
+			weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{0} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息 -->
+	<select id="selectMilkInfo" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			level,type,id,powder_ratio,weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			SERIES LIKE #{0} 
+		ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉类型 -->
+	<select id="selectMilkType" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT type FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据奶粉系列查询奶粉密度 -->
+	<select id="selectMilkDensity" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT density FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉比例 -->
+	<select id="selectMilkRatio" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT powder_ratio FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉id -->
+	<select id="selectMilkId" parameterType="java.lang.String" resultType="java.lang.Long">
+		SELECT id FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉的重量 -->
+	<select id="selectMilkWeightPerSpoon" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT weight_per_spoon FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 查询奶粉品牌 -->
+	<select id="selectMilkPowderBrand" resultType="java.lang.String">
+		SELECT brand FROM MILK_POWDER_INFO WHERE STATUS_ = 'approved' GROUP BY BRAND
+	</select>
+	
+	<!-- 根据系列段数品牌获取奶粉信息 -->
+	<select id="selectMilkInfoByBrandSeriesLevel" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BRAND = #{0} AND SERIES = #{1} AND LEVEL = #{2} 
+	</select>
+	
+	<!-- 查询冲奶记录的冲奶时间 -->
+	<select id="selectLastRecordDate" resultType="java.util.Date">
+		SELECT timestamp_ FROM MILK_MAKING_RECORD WHERE CONTROLLER = 'machine' ORDER BY ID DESC LIMIT 1 
+	</select>
+	
+	<!-- 根据用户id查询冲奶机机器码 -->
+	<select id="getMyMachines" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT machine_mac FROM MACHINE WHERE OWNER = #{0}
+	</select>
+	
+	<!-- 将信息插入到冲奶记录表中 -->
+	<insert id="insertRecordData" parameterType="MilkMakingRecord">
+		INSERT INTO milk_making_record (volume, controller, machine, timestamp_, user) VALUE (#{volume}, 'machine', #{machine}, #{timestamp_}, #{user})
+	</insert>
+	
+	<!-- milk_images表中添加数据 -->
+	<insert id="insertMilkImages" parameterType="MilkImages" useGeneratedKeys="true" keyProperty="image_id">
+		INSERT INTO MILK_IMAGES
+		(
+			IMAGE_MILK_ID,IMAGE_FRONT,IMAGE_BAR,IMAGE_FEED
+		) 
+		VALUES 
+		(
+			#{image_Milk_ID},#{image_Front},#{image_Bar},#{image_Feed}
+		)
+	</insert>
+</mapper>

iamberry-app-international-service/.svn/pristine/4b/4bd7ebde68ab0194a2d2364a8672e2b7b2ded279.svn-base

@@ -0,0 +1,132 @@
+package com.iamberry.app.service;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.core.entity.Message;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.core.serch.SerchParam;
+import com.iamberry.app.face.MessageService;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * LogService
+ * 
+ * @author Moon Cheng
+ * @date 2016年3月23日 下午2:34:45
+ */
+@Service
+public class MessageServiceImpl extends BaseService implements MessageService  {
+
+	/**
+	 * 查询符合条件的用户列表
+	 * @return
+	 */
+	public List<User> selectUser(PageBean page){
+		page.initRecordBegin();
+		return messageMapper.selectUser(page);
+	}
+	
+	/**
+	 * 获取用户总条数
+	 * @return
+	 */
+	public int selectUserCount(SerchParam params){
+		return messageMapper.selectUserCount(params);
+	}
+
+	
+	/**
+	 * 修改一条消息
+	 * @return 影响的行数
+	 */
+	public int updateMessage(Message message){
+		return messageMapper.updateMessage(message);
+	}
+	
+	/**
+	 * 添加一条消息
+	 * @return 影响的行数
+	 */
+	public int insertMessage(Message message){
+		message.setCreate_date(new Date());//添加时间
+		message.setIs_read(Long.valueOf("2"));//未读
+		return messageMapper.insertMessage(message);
+	}
+	
+	/**
+	 * 获取符合条件所有消息的总条数
+	 * @return 所有的消息条数
+	 */
+	public int selectMessageCount(SerchParam params){
+		return messageMapper.selectMessageCount(params);
+	}
+	
+	/**
+	 * 获取符合条件所有消息
+	 * @return 所有的消息
+	 */
+	public List<Message> selectMessageRecoreds(PageBean page){
+		page.initRecordBegin();
+		return messageMapper.selectMessageRecoreds(page);
+	}
+
+	
+	/**
+	 * 获取系统的所有消息
+	 * @param userid 用户id
+	 * @return 用户下所有的消息
+	 */
+	public List<Message> selectSysMessageRecoreds(){
+		return messageMapper.selectSysMessageRecoreds();
+	}
+	
+	/**
+	 * 根据信息id获取信息实体类
+	 * @param id 信息id
+	 * @return 信息实体类
+	 */
+	public Message selectUserMessageByid(Long id){
+		Message message = messageMapper.selectUserMessageByid(id);
+		if (message == null) {
+			return null;
+		}
+		//修改为已读
+		message.setRead_date(new Date());
+		message.setIs_read(Long.valueOf("1"));
+		messageMapper.updateMessage(message);
+		return message;
+	}
+	
+	/**
+	 * 根据用户id获取该用户的所有消息
+	 * @param userid 用户id
+	 * @return 用户下所有的消息
+	 */
+	public List<Message> selectUserMessageRecoreds(String token){
+		
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		return messageMapper.selectUserMessageRecoreds(userInfo.getId());
+	}
+	
+	/**
+	 * 获取用户消息
+	 * @param userid 用户id 
+	 * @param isread 1已读，2 未读
+	 * @return 用户消息集合
+	 */
+	public int selectUserMessageByisread(String token,
+			 Long isread){
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+		
+		return messageMapper.selectUserMessageByisread(userInfo.getId(),isread);
+	}
+}

iamberry-app-international-service/.svn/pristine/57/576e7475da69590f8069346bf8ce92e28150644f.svn-base

@@ -0,0 +1,53 @@
+package com.iamberry.app.service;
+
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.jpush.api.JPushClient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.mapper.LogMapper;
+import com.iamberry.app.mapper.MachineMapper;
+import com.iamberry.app.mapper.MessageMapper;
+import com.iamberry.app.mapper.MilkMapper;
+import com.iamberry.app.mapper.UserMapper;
+import com.iamberry.app.ulitity.Utility;
+
+@Service
+public class BaseService {
+
+	@Autowired
+	protected UserMapper userMapper;
+	@Autowired
+	protected MachineMapper machineMapper;
+	@Autowired
+	protected MilkMapper milkMapper;
+	@Autowired
+	protected LogMapper logMapper;
+	@Autowired
+	protected MessageMapper messageMapper;
+
+	protected static final ObjectMapper mapper = new ObjectMapper();
+
+	public static JPushClient jpushClient = new JPushClient(ImberryConfig.MASTERSECRET, ImberryConfig.APPKEY);
+
+	protected static final int PAGE_SIZE = 10;
+
+	protected String getEncToken(long userId) {
+		String tokenKey = Utility.getRandomString(10);
+		String base64 = userId + "|" + tokenKey + "|" + System.currentTimeMillis();
+		return new String(Base64.encodeBase64(base64.getBytes()));
+	}
+
+	public User validateUserToken(String token) {
+		User userInfo = userMapper.selectUserByToken(token);
+
+		if (userInfo == null) {
+			return null;
+		}
+		return userInfo;
+	}
+}

iamberry-app-international-service/.svn/pristine/5f/5f30e6cde7424a55ab127b2ae110a960961bca26.svn-base

@@ -0,0 +1,252 @@
+package com.iamberry.app.mapper;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectKey;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Repository;
+
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.sqlprovider.DMLProvider;
+
+public interface MilkMapper {
+
+	/**
+	 * 添加信息到milk_making_record表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkMakingRecord(MilkMakingRecord entity);
+
+	/**
+	 * 根据id修改MILK_MAKING_RECORD的start和comments属性
+	 *
+	 * @param stars
+	 * @param comments
+	 * @param id
+	 */
+	public void updateMilkMakingRecord(int stars, String comments, Long id);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param userId
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, Long userId, String devId);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param devids
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMachineMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, String devids);
+
+	/**
+	 * 根据id查询MILK_MAKING_RECORD所有信息
+	 *
+	 * @author Moon Cheng
+	 * @param id
+	 * @return
+	 */
+	public MilkMakingRecord selectMilkMakingRecord(Long id);
+
+	/**
+	 * 根据user查询所有冲奶信息
+	 *
+	 * @author Moon Cheng
+	 * @param user
+	 * @return
+	 */
+	public List<MilkMakingRecord> getMilkPowderByUser(Long user);
+	
+	
+	
+	/**
+	 * 根据user查询总冲奶量和次数
+	 * @param user
+	 * @return
+	 */
+	public RecordCountInfoDTO getMilkPowderSumByUser(Long user);
+	
+	/**
+	 * 将奶粉信息插入到奶粉信息表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkPowderInfo(MilkPowderInfo entity);
+
+	/**
+	 * 通过条形码查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderInfo(String barcode);
+
+	/**
+	 * 根据品牌查询奶粉信息的系列
+	 *
+	 * @param brand
+	 * @return
+	 */
+	public List<String> selectSeries(String brand);
+
+	/**
+	 * 根据系列查询奶粉信息的段数
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectLevel(String series);
+
+	
+	/**
+	 * 根据奶粉品牌获取奶粉，详细信息
+	 * @param brand 奶粉品牌
+	 * @return 详细信息
+	 */
+	public List<MilkInfoDTO> selectMilkInfoBybrand(String brand);
+	
+	
+	/**
+	 * 根据系列查询奶粉信息
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<MilkInfoDTO> selectMilkInfo( String series);
+
+	
+
+	/**
+	 * 根据系列查询奶粉类型
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkType(String series);
+
+	/**
+	 * 根据奶粉系列查询奶粉密度
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkDensity(String series);
+
+	/**
+	 * 根据系列查询奶粉比例
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkRatio(String series);
+
+	/**
+	 * 根据系列查询奶粉id
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<Long> selectMilkId(String series);
+
+	/**
+	 * 根据系列查询奶粉的重量
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkWeightPerSpoon(String series);
+
+	/**
+	 * 查询奶粉品牌
+	 *
+	 * @return
+	 */
+	public List<String> selectMilkPowderBrand();
+
+	/**
+	 * 根据系列段数品牌获取奶粉信息
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkInfoByBrandSeriesLevel(String brand, String series, String level);
+
+	/**
+	 * 查询冲奶记录的冲奶时间
+	 *
+	 * @return
+	 */
+	public Date selectLastRecordDate();
+
+	/**
+	 * 将信息插入到冲奶记录表中
+	 *
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void insertRecordData(MilkMakingRecord milkMakingRecord);
+
+	/**
+	 * 根据用户id查询冲奶机机器码
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public List<String> getMyMachines(Long userId);
+
+	/**
+	 * milk_images表中添加数据
+	 * @param entity
+	 */
+	public void insertMilkImages(MilkImages entity);
+	
+	/**
+	 * 通过barcode查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderByBar(String barcode);
+	
+	/**
+	 * 根据设备id查询最新一条冲奶记录
+	 * @param machine
+	 * @return
+	 */
+	public Date selectMakingRecordAndmachine(String machine);
+	
+}

iamberry-app-international-service/.svn/pristine/6a/6a7a0da8fe56e31789acad87e32b6a1fa757d6dd.svn-base

@@ -0,0 +1,124 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MachineMapper">
+	<sql id="allMachineField">
+		ID,
+		OWNER,
+		MACHINE_NAME,
+		MACHINE_MAC,
+		MACHINE_INFO,
+		STATUS_,
+		LOCATION,
+		CREATED_ON
+	</sql>
+	
+	<!--通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
+    <resultMap type="Machine" id="machineMap">
+        <!-- 用id属性来映射主键字段 -->
+        <id property="id" column="id"/>
+        <!-- 用result属性来映射非主键字段 -->
+        <result property="owner" column="owner"/>
+        <result property="machine_name" column="machine_name"/>
+        <result property="machine_mac" column="machine_mac"/>
+        <result property="machine_info" column="machine_info"/>
+        <result property="status_" column="status_"/>
+        <result property="location" column="location"/>
+        <result property="created_on" column="created_on"/>
+    </resultMap>
+    
+    
+	<!-- 添加一台机器 -->
+	<insert id="insertMachine" parameterType="Machine"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MACHINE 
+			(MACHINE_NAME,MACHINE_MAC,MACHINE_INFO,OWNER,STATUS_,LOCATION,CREATED_ON)
+		VALUES
+			(
+				#{machine_name},#{machine_mac},#{machine_info},#{owner}
+				,#{status_},#{location},#{created_on}
+			)
+	</insert>
+
+	<!-- 根据id 修改一台机器信息  -->
+	<update id="updateMachine" parameterType="Machine">
+		UPDATE MACHINE
+		<set>
+			<if test="owner != null and owner != ''">
+				OWNER=#{owner},
+			</if>
+			<if test="machine_name != null and machine_name != ''">
+				MACHINE_NAME=#{machine_name},
+			</if>
+			<if test="machine_mac != null and machine_mac != ''">
+				MACHINE_MAC=#{machine_mac},
+			</if>
+			<if test="machine_info != null and machine_info != ''">
+				MACHINE_INFO=#{machine_info},
+			</if>
+			<if test="status_ != null and status_ != ''">
+				STATUS_=#{status_},
+			</if>
+			<if test="location != null and location != ''">
+				LOCATION=#{location},
+			</if>
+			<if test="created_on != null and created_on != ''">
+				CREATED_ON=#{created_on},
+			</if>
+		</set>
+		WHERE ID=#{id}
+	</update>
+	
+	<!-- 根据id 修改一台机器的状态-->
+	<update id="updateMachineStatus" parameterType="Machine">
+		UPDATE MACHINE 
+		SET STATUS_ = #{0},CREATED_ON = NOW() 
+		WHERE ID = #{1}
+	</update>
+	
+	<!-- 根据机器码 修改一台机器的状态-->
+	<update id="updateStatusByMac">
+		UPDATE MACHINE 
+		SET STATUS_ = #{1},CREATED_ON = NOW() 
+		WHERE machine_mac = #{0}
+	</update>
+	
+	<!-- 根据id 修改一台机器的位置信息-->
+	<update id="updateMachineLocation" parameterType="Machine">
+		UPDATE MACHINE 
+		SET LOCATION = #{0} 
+		WHERE ID = #{1}
+	</update>
+	
+	<!-- 按用户，查询所有机器 -->
+	<select id="selectMachineByOwner" parameterType="long" resultMap="machineMap">
+		SELECT 
+			<include refid="allMachineField"></include>
+		FROM MACHINE WHERE OWNER = #{owner}
+	</select>
+	
+	<!-- 根据id 查询一台机器 -->
+	<select id="selectMachineById" parameterType="long" resultMap="machineMap">
+		SELECT 
+			<include refid="allMachineField"></include>
+		FROM MACHINE WHERE ID = #{id}
+	</select>
+	
+	<!-- 根据机器码和所属用户 查一台机器id -->
+	<select id="isDevUserPairExist" resultType="Long">
+		SELECT ID
+		FROM MACHINE WHERE  MACHINE_MAC = #{0} AND OWNER = #{1}
+	</select>
+	
+	<!-- 根据机器的ID，查询最近的一个用户ID -->
+	<select id="selectUserIDByDevId" parameterType="String" resultType="Long">
+		SELECT OWNER 
+		FROM MACHINE 
+		WHERE MACHINE_MAC = #{devid} ORDER BY id DESC LIMIT 0, 1
+	</select>
+</mapper>

iamberry-app-international-service/.svn/pristine/8a/8acafd2b0d66f9791b650e8ded1c4f10886562b0.svn-base

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>iamberry-app-international-service</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>

iamberry-app-international-service/.svn/pristine/9e/9e8c3cae6cd5770f9af5030fd24fd7e10f45a981.svn-base

@@ -0,0 +1,13 @@
+package com.iamberry.app.mapper;
+
+import com.iamberry.app.core.entity.SysLog;
+
+public interface LogMapper {
+
+	/**
+	 * insertSysLog
+	 * @param sysLog
+	 */
+	public void insertSysLog(SysLog log);
+
+}

iamberry-app-international-service/.svn/pristine/a0/a0b5c96675fe102158038d9ef8c7aa4df2ba5437.svn-base

@@ -0,0 +1,80 @@
+package com.iamberry.app.mapper;
+
+import java.util.List;
+
+import com.iamberry.app.core.entity.Message;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.core.serch.SerchParam;
+import com.iamberry.wechat.core.entity.PageBean;
+
+public interface MessageMapper {
+	
+	/**
+	 * 查询符合条件的用户列表
+	 * @return
+	 */
+	public List<User> selectUser(PageBean page);
+	
+	/**
+	 * 获取用户总条数	
+	 * @return
+	 */
+	public int selectUserCount(SerchParam params);
+	
+	/**
+	 * 获取符合条件所有消息
+	 * @return 所有的消息
+	 */
+	public List<Message> selectMessageRecoreds(PageBean page);
+	
+	/**
+	 * 修改一条消息		
+	 * @return 影响的行数
+	 */
+	public int updateMessage(Message message);
+	
+	/**
+	 * 添加一条消息		
+	 * @return 影响的行数
+	 */
+	public int insertMessage(Message message);
+	
+	
+
+	/**
+	 * 获取所有消息的总条数
+	 * @return 所有的消息条数
+	 */
+	public int selectMessageCount(SerchParam params);
+	
+	/**
+	 * 获取系统的所有消息(user为空的)
+	 * @param recordId 用户id
+	 * @return 用户的所有消息
+	 */
+	public List<Message> selectSysMessageRecoreds();
+	
+	/**
+	 * 根据信息id获取信息实体类			
+	 * @param id 信息id
+	 * @return 信息实体类
+	 */
+	public Message selectUserMessageByid(Long id);
+	
+	/**
+	 * 根据用户id获取该用户的所有消息		
+	 * @param userid 用户id
+	 * @return 用户下所有的消息
+	 */
+	public List<Message> selectUserMessageRecoreds(Long userid);
+	
+	
+	/**
+	 * 获取某状态的用户消息			
+	 * @param userid 用户id 
+	 * @param isread 1已读，2 未读
+	 * @return 用户消息集合
+	 */
+	public int selectUserMessageByisread(Long userid,Long isread);
+
+}

iamberry-app-international-service/.svn/pristine/a1/a112be21c325d37ebc17baafd40c0386b5d09df1.svn-base

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

iamberry-app-international-service/.svn/pristine/a2/a29da2c9387727a0443ea32197fca2a15446cce8.svn-base

@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

iamberry-app-international-service/.svn/pristine/a4/a415529b45b0bb67396c564812685d180cdf4cb4.svn-base

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>

iamberry-app-international-service/.svn/pristine/a4/a4ffe42c2462bfff6a93b560ec783ecbbf7704e7.svn-base

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="iamberry-app-international-service">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+    </wb-module>
+</project-modules>

iamberry-app-international-service/.svn/pristine/a5/a5e21a7fceb7349a54c307aaf68bbb672bd7d654.svn-base

@@ -0,0 +1,280 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MilkMapper">
+
+	<sql id="milkAttribute">
+		id,
+		volume,
+		controller,
+		stars,
+		comments,
+		brand,
+		powder_info,
+		machine_name,
+		machine,
+		user,
+		timestamp_
+	</sql>
+	
+	<sql id="powderAttribute">
+		id,
+		powder_number,
+		spoon_picture,
+		bar_code,
+		brand,
+		series,
+		level,
+		version_,
+		age_range,
+		weight_per_spoon,
+		milk_volume_per_spoon,
+		powder_ratio,
+		density,
+		type,
+		status_,
+		created_on
+	</sql>
+	
+	<resultMap type="MilkMakingRecord" id="milkMap">
+		<id property="id" column="id"/>
+		<result property="volume" column="volume"/>
+		<result property="controller" column="controller"/>
+		<result property="stars" column="stars"/>
+		<result property="comments" column="comments"/>
+		<result property="brand" column="brand"/>
+		<result property="powder_info" column="powder_info"/>
+		<result property="machine_name" column="machine_name"/>
+		<result property="machine" column="machine"/>
+		<result property="user" column="user"/>
+		<result property="timestamp_" column="timestamp_"/>
+	</resultMap>
+	
+	<resultMap type="MilkPowderInfo" id="powderMap">
+		<id property="id" column="id"/>
+		<result property="powder_number" column="powder_number"/>
+		<result property="spoon_picture" column="spoon_picture"/>
+		<result property="bar_code" column="bar_code"/>
+		<result property="brand" column="brand"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="version_" column="version_"/>
+		<result property="age_range" column="age_range"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+		<result property="milk_volume_per_spoon" column="milk_volume_per_spoon"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="density" column="density"/>
+		<result property="type" column="type"/>
+		<result property="status_" column="status_"/>
+		<result property="created_on" column="created_on"/>
+	</resultMap>
+	
+	<resultMap type="com.iamberry.app.core.dto.MilkInfoDTO" id="milkInfoDtoMap">
+		<id property="id" column="id"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="type" column="type"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+	</resultMap>
+	
+	<!-- 添加信息到milk_making_record表中 -->
+	<insert id="insertMilkMakingRecord" parameterType="MilkMakingRecord" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_MAKING_RECORD
+		(VOLUME,CONTROLLER,STARS,COMMENTS,BRAND,POWDER_INFO,MACHINE_NAME,MACHINE,USER,TIMESTAMP_) 
+		VALUES
+		(#{volume},#{controller},#{stars},#{comments},#{brand},#{powder_info},#{machine_name},#{machine},#{user},NOW())
+	</insert>
+	
+	<!-- 根据id修改MILK_MAKING_RECORD的start和comments属性 -->
+	<update id="updateMilkMakingRecord">
+		UPDATE MILK_MAKING_RECORD SET STARS = #{0}, COMMENTS = #{1} WHERE ID = #{2}
+	</update>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			user = #{5} 
+		AND 
+			machine = #{6} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMachineMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			machine = #{5} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 根据id查询MILK_MAKING_RECORD所有信息 -->
+	<select id="selectMilkMakingRecord" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据user查询所有冲奶信息 -->
+	<select id="getMilkPowderByUser" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE USER = #{0}
+	</select>
+	
+	<!-- 根据user查询总冲奶量和次数 -->
+	<select id="getMilkPowderSumByUser" parameterType="java.lang.Long" resultType="com.iamberry.app.core.dto.RecordCountInfoDTO">
+		SELECT COUNT(1) count,SUM(VOLUME) total FROM MILK_MAKING_RECORD WHERE USER = #{0} 
+	</select>
+	
+	<!-- 将奶粉信息插入到奶粉信息表中 -->
+	<insert id="insertMilkPowderInfo" parameterType="MilkPowderInfo" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_POWDER_INFO
+			(POWDER_NUMBER,SPOON_PICTURE,BAR_CODE,BRAND,SERIES,LEVEL,VERSION_,AGE_RANGE,
+			WEIGHT_PER_SPOON,MILK_VOLUME_PER_SPOON,POWDER_RATIO,DENSITY,TYPE,STATUS_,CREATED_ON) 
+		VALUES
+			(#{powder_number},#{spoon_picture},#{bar_code},#{brand},#{series},#{level},#{version_},#{age_range},#{weight_per_spoon},
+			#{milk_volume_per_spoon},#{powder_ratio},#{density},#{type},#{status_},NOW())
+	</insert>
+	
+	<!-- 通过条形码查询奶粉信息 -->
+	<select id="selectMilkPowderInfo" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} AND UPPER(STATUS_) = 'APPROVED' 
+	</select>
+	
+	<!-- 根据品牌查询奶粉信息的系列 -->
+	<select id="selectSeries" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT 
+			series 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{brand} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息的段数 -->
+	<select id="selectLevel" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT level FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC 
+	</select>
+	
+	<!-- 根据奶粉品牌获取奶粉，详细信息 -->
+	<select id="selectMilkInfoBybrand" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			series,
+			level,
+			type,
+			id,
+			powder_ratio,
+			weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{0} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息 -->
+	<select id="selectMilkInfo" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			level,type,id,powder_ratio,weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			SERIES LIKE #{0} 
+		ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉类型 -->
+	<select id="selectMilkType" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT type FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据奶粉系列查询奶粉密度 -->
+	<select id="selectMilkDensity" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT density FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉比例 -->
+	<select id="selectMilkRatio" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT powder_ratio FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉id -->
+	<select id="selectMilkId" parameterType="java.lang.String" resultType="java.lang.Long">
+		SELECT id FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉的重量 -->
+	<select id="selectMilkWeightPerSpoon" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT weight_per_spoon FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 查询奶粉品牌 -->
+	<select id="selectMilkPowderBrand" resultType="java.lang.String">
+		SELECT brand FROM MILK_POWDER_INFO WHERE STATUS_ = 'approved' GROUP BY BRAND
+	</select>
+	
+	<!-- 根据系列段数品牌获取奶粉信息 -->
+	<select id="selectMilkInfoByBrandSeriesLevel" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BRAND = #{0} AND SERIES = #{1} AND LEVEL = #{2} 
+	</select>
+	
+	<!-- 查询冲奶记录的冲奶时间 -->
+	<select id="selectLastRecordDate" resultType="java.util.Date">
+		SELECT timestamp_ FROM MILK_MAKING_RECORD WHERE CONTROLLER = 'machine' ORDER BY ID DESC LIMIT 1 
+	</select>
+	
+	<!-- 根据用户id查询冲奶机机器码 -->
+	<select id="getMyMachines" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT machine_mac FROM MACHINE WHERE OWNER = #{0}
+	</select>
+	
+	<!-- 将信息插入到冲奶记录表中 -->
+	<insert id="insertRecordData" parameterType="MilkMakingRecord">
+		INSERT INTO milk_making_record (volume, controller, machine, timestamp_, user) VALUE (#{volume}, 'machine', #{machine}, #{timestamp_}, #{user})
+	</insert>
+	
+	<!-- milk_images表中添加数据 -->
+	<insert id="insertMilkImages" parameterType="MilkImages" useGeneratedKeys="true" keyProperty="image_id">
+		INSERT INTO MILK_IMAGES
+		(
+			IMAGE_MILK_ID,IMAGE_FRONT,IMAGE_BAR,IMAGE_FEED
+		) 
+		VALUES 
+		(
+			#{image_Milk_ID},#{image_Front},#{image_Bar},#{image_Feed}
+		)
+	</insert>
+	
+	<!-- 通过bar_code查询奶粉信息 -->
+	<select id="selectMilkPowderByBar" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} 
+	</select>
+</mapper>

iamberry-app-international-service/.svn/pristine/b7/b75518a8c690559d15a3bbdce3594e131c74c2ef.svn-base

@@ -0,0 +1,275 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MilkMapper">
+
+	<sql id="milkAttribute">
+		id,
+		volume,
+		controller,
+		stars,
+		comments,
+		brand,
+		powder_info,
+		machine_name,
+		machine,
+		user,
+		timestamp_
+	</sql>
+	
+	<sql id="powderAttribute">
+		id,
+		powder_number,
+		spoon_picture,
+		bar_code,
+		brand,
+		series,
+		level,
+		version_,
+		age_range,
+		weight_per_spoon,
+		milk_volume_per_spoon,
+		powder_ratio,
+		density,
+		type,
+		status_,
+		created_on
+	</sql>
+	
+	<resultMap type="MilkMakingRecord" id="milkMap">
+		<id property="id" column="id"/>
+		<result property="volume" column="volume"/>
+		<result property="controller" column="controller"/>
+		<result property="stars" column="stars"/>
+		<result property="comments" column="comments"/>
+		<result property="brand" column="brand"/>
+		<result property="powder_info" column="powder_info"/>
+		<result property="machine_name" column="machine_name"/>
+		<result property="machine" column="machine"/>
+		<result property="user" column="user"/>
+		<result property="timestamp_" column="timestamp_"/>
+	</resultMap>
+	
+	<resultMap type="MilkPowderInfo" id="powderMap">
+		<id property="id" column="id"/>
+		<result property="powder_number" column="powder_number"/>
+		<result property="spoon_picture" column="spoon_picture"/>
+		<result property="bar_code" column="bar_code"/>
+		<result property="brand" column="brand"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="version_" column="version_"/>
+		<result property="age_range" column="age_range"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+		<result property="milk_volume_per_spoon" column="milk_volume_per_spoon"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="density" column="density"/>
+		<result property="type" column="type"/>
+		<result property="status_" column="status_"/>
+		<result property="created_on" column="created_on"/>
+	</resultMap>
+	
+	<resultMap type="com.iamberry.app.core.dto.MilkInfoDTO" id="milkInfoDtoMap">
+		<id property="id" column="id"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="type" column="type"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+	</resultMap>
+	
+	<!-- 添加信息到milk_making_record表中 -->
+	<insert id="insertMilkMakingRecord" parameterType="MilkMakingRecord" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_MAKING_RECORD
+		(VOLUME,CONTROLLER,STARS,COMMENTS,BRAND,POWDER_INFO,MACHINE_NAME,MACHINE,USER,TIMESTAMP_) 
+		VALUES
+		(#{volume},#{controller},#{stars},#{comments},#{brand},#{powder_info},#{machine_name},#{machine},#{user},NOW())
+	</insert>
+	
+	<!-- 根据id修改MILK_MAKING_RECORD的start和comments属性 -->
+	<update id="updateMilkMakingRecord">
+		UPDATE MILK_MAKING_RECORD SET STARS = #{0}, COMMENTS = #{1} WHERE ID = #{2}
+	</update>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			user = #{5} 
+		AND 
+			machine = #{6} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMachineMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			machine = #{5} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 根据id查询MILK_MAKING_RECORD所有信息 -->
+	<select id="selectMilkMakingRecord" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据user查询所有冲奶信息 -->
+	<select id="getMilkPowderByUser" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE USER = #{0}
+	</select>
+	
+	<!-- 根据user查询总冲奶量和次数 -->
+	<select id="getMilkPowderSumByUser" parameterType="java.lang.Long" resultType="com.iamberry.app.core.dto.RecordCountInfoDTO">
+		SELECT COUNT(1) count,SUM(VOLUME) total FROM MILK_MAKING_RECORD WHERE USER = #{0} 
+	</select>
+	
+	<!-- 将奶粉信息插入到奶粉信息表中 -->
+	<insert id="insertMilkPowderInfo" parameterType="MilkPowderInfo" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_POWDER_INFO
+			(POWDER_NUMBER,SPOON_PICTURE,BAR_CODE,BRAND,SERIES,LEVEL,VERSION_,AGE_RANGE,
+			WEIGHT_PER_SPOON,MILK_VOLUME_PER_SPOON,POWDER_RATIO,DENSITY,TYPE,STATUS_,CREATED_ON) 
+		VALUES
+			(#{powder_number},#{spoon_picture},#{bar_code},#{brand},#{series},#{level},#{version_},#{age_range},#{weight_per_spoon},
+			#{milk_volume_per_spoon},#{powder_ratio},#{density},#{type},#{status_},NOW())
+	</insert>
+	
+	<!-- 通过条形码查询奶粉信息 -->
+	<select id="selectMilkPowderInfo" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} 
+	</select>
+	
+	<!-- 根据品牌查询奶粉信息的系列 -->
+	<select id="selectSeries" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT 
+			series 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{brand} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息的段数 -->
+	<select id="selectLevel" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT level FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC 
+	</select>
+	
+	<!-- 根据奶粉品牌获取奶粉，详细信息 -->
+	<select id="selectMilkInfoBybrand" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			series,
+			level,
+			type,
+			id,
+			powder_ratio,
+			weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{0} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息 -->
+	<select id="selectMilkInfo" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			level,type,id,powder_ratio,weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			SERIES LIKE #{0} 
+		ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉类型 -->
+	<select id="selectMilkType" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT type FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据奶粉系列查询奶粉密度 -->
+	<select id="selectMilkDensity" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT density FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉比例 -->
+	<select id="selectMilkRatio" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT powder_ratio FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉id -->
+	<select id="selectMilkId" parameterType="java.lang.String" resultType="java.lang.Long">
+		SELECT id FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉的重量 -->
+	<select id="selectMilkWeightPerSpoon" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT weight_per_spoon FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 查询奶粉品牌 -->
+	<select id="selectMilkPowderBrand" resultType="java.lang.String">
+		SELECT brand FROM MILK_POWDER_INFO WHERE STATUS_ = 'approved' GROUP BY BRAND
+	</select>
+	
+	<!-- 根据系列段数品牌获取奶粉信息 -->
+	<select id="selectMilkInfoByBrandSeriesLevel" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BRAND = #{0} AND SERIES = #{1} AND LEVEL = #{2} 
+	</select>
+	
+	<!-- 查询冲奶记录的冲奶时间 -->
+	<select id="selectLastRecordDate" resultType="java.util.Date">
+		SELECT timestamp_ FROM MILK_MAKING_RECORD WHERE CONTROLLER = 'machine' ORDER BY ID DESC LIMIT 1 
+	</select>
+	
+	<!-- 根据用户id查询冲奶机机器码 -->
+	<select id="getMyMachines" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT machine_mac FROM MACHINE WHERE OWNER = #{0}
+	</select>
+	
+	<!-- 将信息插入到冲奶记录表中 -->
+	<insert id="insertRecordData" parameterType="MilkMakingRecord">
+		INSERT INTO milk_making_record (volume, controller, machine, timestamp_, user) VALUE (#{volume}, 'machine', #{machine}, #{timestamp_}, #{user})
+	</insert>
+	
+	<!-- milk_images表中添加数据 -->
+	<insert id="insertMilkImages" parameterType="MilkImages" useGeneratedKeys="true" keyProperty="image_id">
+		INSERT INTO MILK_IMAGES
+		(
+			IMAGE_MILK_ID,IMAGE_FRONT,IMAGE_BAR,IMAGE_FEED
+		) 
+		VALUES 
+		(
+			#{image_Milk_ID},#{image_Front},#{image_Bar},#{image_Feed}
+		)
+	</insert>
+</mapper>

iamberry-app-international-service/.svn/pristine/b8/b8adeb7d5fc32ee5b18f860f52eb371555f5d027.svn-base

@@ -0,0 +1,173 @@
+package com.iamberry.app.service;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.http.ParseException;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.entity.Machine;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.MachineService;
+import com.iamberry.app.tool.util.HttpUtility;
+
+/**
+ * MachineService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 下午12:27:32
+ */
+@Service
+public class MachineServiceImpl extends BaseService implements MachineService {
+
+	private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+	
+	/**
+	 * setMachine
+	 * @author Moon Cheng
+	 * @param machine
+	 * @param token
+	 * @return Machine Information
+	 */
+	@Transactional
+	public Machine setMachine(Machine machine, String token, String ip) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		if (ip.indexOf(",") != -1) {
+			ip = ip.split(",")[0];
+		}
+		logger.info("IP为:" + ip);
+
+		String location = null;
+		try {
+			location = new JSONObject(
+					HttpUtility.httpsGet(MessageFormat.format(ImberryConfig.SINA_IP_URL,ip)))
+							.getString("city");
+		} catch (ParseException | IOException | JSONException e) {
+			e.printStackTrace();
+		}
+		machine.setLocation(location);
+
+		machine.setOwner(userInfo.getId());
+		Long machineId = machineMapper.isDevUserPairExist(machine.getMachine_mac(), userInfo.getId());
+		machine.setCreated_on(new Date());
+		if (machineId == null) {
+			machineMapper.insertMachine(machine);
+		} else {
+			machine.setId(machineId);
+			machineMapper.updateMachine(machine);
+		}
+		return machine;
+	}
+
+	/**
+	 * updateMachineStatus
+	 *
+	 * @author Moon Cheng
+	 * @param machineId
+	 * @param status
+	 * @param token
+	 * @return
+	 */
+	public int updateMachineStatus(Long machineId, String status, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+		return machineMapper.updateMachineStatus(status, machineId);
+	}
+
+	/**
+	 * updateMachineLocation
+	 *
+	 * @author Moon Cheng
+	 * @param machineId
+	 * @param location
+	 * @param token
+	 * @return
+	 */
+	public int updateMachineLocation(Long machineId, String location, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+		return machineMapper.updateMachineLocation(location, machineId);
+	}
+
+	/**
+	 * 	按用户，查询所有机器
+	 * @param owner
+	 * @param token
+	 * @return
+	 */
+	public List<Machine> searchMachineByOwner(Long owner, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		List<Machine> machines = machineMapper.selectMachineByOwner(owner);
+		return machines;
+	}
+
+	/**
+	 * searchMachineById
+	 *
+	 * @author Moon Cheng
+	 * @param machineId
+	 * @param token
+	 * @return
+	 */
+	public Machine searchMachineById(Long machineId, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		Machine machine = machineMapper.selectMachineById(machineId);
+		return machine;
+	}
+
+	/**
+	 * updateStatus
+	 *
+	 * @param status
+	 */
+	@SuppressWarnings("unchecked")
+	@Transactional
+	public void updateStatus(String status) {
+		// the method is expensive!
+		Map<String, Object> map = new HashMap<>();
+		try {
+			map = mapper.readValue(status,new HashMap<String, Object>().getClass());
+			
+		} catch (IOException e) {
+			logger.error(e.getMessage());
+			e.printStackTrace();
+		}
+		for (Entry<String, Object> entry : map.entrySet()) {
+			if (entry.getValue() instanceof String) {
+				machineMapper.updateStatusByMac(entry.getKey(),  entry.getValue().equals("0") ? "online" : "offline");
+			} else {
+				machineMapper.updateStatusByMac(entry.getKey(),  (Integer)entry.getValue() == 0 ? "online" : "offline");
+			}
+		}
+	}
+
+	@Override
+	public Long selectUserIDByDevId(String devId) {
+		// TODO Auto-generated method stub
+		return machineMapper.selectUserIDByDevId(devId);
+	}
+}

iamberry-app-international-service/.svn/pristine/c4/c4387a5ebd16d725157a6fccb9371f1f72894085.svn-base

@@ -0,0 +1,134 @@
+package com.iamberry.app.sqlprovider;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import org.apache.ibatis.jdbc.SQL;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+/**
+ * 
+ * @author Sikandar
+ * @date 2016年1月18日 下午9:34:48
+ */
+public class DMLProvider {
+
+	/**
+	 * update
+	 * 
+	 * @param map
+	 * @return String
+	 * @throws Exception
+	 */
+	public String update(Map<String, Object> map) {
+		try {
+			final String entityName = getEntityName(map);
+			final Object object_ = map.get(entityName);
+			final Class<?> cls = Class.forName(object_.getClass().getName());
+			SQL sql = new SQL() {
+				{
+					Object id = null;
+					UPDATE(entityName);
+					for (Method method : cls.getDeclaredMethods()) {
+						String mName = method.getName();
+						if (mName.startsWith("get")) {
+							Object rValue = method.invoke(object_);
+							if (mName.equalsIgnoreCase("getId")) {
+								id = rValue;
+							} else {
+								if (method.getReturnType() == String.class) {
+									if (rValue != null)
+										SET(mName.substring(mName.indexOf("get") + 3).toLowerCase() + " = '" + rValue + "'");
+								} else if (method.getReturnType() == Date.class) {
+
+									SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+									if (rValue != null)
+										SET(mName.substring(mName.indexOf("get") + 3).toLowerCase() + " = '" + format.format(rValue) + "'");
+								} else {
+									if (rValue != null)
+										SET(mName.substring(mName.indexOf("get") + 3).toLowerCase() + "=" + rValue.toString());
+								}
+							}
+						}
+					}
+
+					WHERE("id = " + id);
+				}
+			};
+
+			return sql.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * insert
+	 * 
+	 * @param map
+	 * @return String
+	 */
+	public String insert(Map<String, Object> map) {
+		try {
+
+			final String entityName = getEntityName(map);
+			final Object object_ = map.get(entityName);
+			final Class<?> cls = Class.forName(object_.getClass().getName());
+			SQL sql = new SQL() {
+				{
+					INSERT_INTO(entityName);
+					for (Method method : cls.getDeclaredMethods()) {
+						String mName = method.getName();
+						if (mName.startsWith("get")) {
+							Object rValue = method.invoke(object_);
+							if (method.getReturnType() == String.class) {
+								if (rValue == null)
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "" + rValue + "");
+								else
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "'" + rValue + "'");
+							} else if (method.getReturnType() == Date.class) {
+
+								SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+								if (rValue != null)
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "'" + format.format(rValue) + "'");
+								else
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "" + null + "");
+							} else
+								VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), rValue == null ? "0" : rValue.toString());
+						}
+					}
+				}
+			};
+
+			return sql.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+
+	}
+
+	private String getEntityName(Map<String, Object> map) throws Exception {
+		String entityName = null;
+		for (Object object_ : map.values()) {
+			Class<?> cls = Class.forName(object_.getClass().getName());
+			for (Annotation annotation : cls.getAnnotations()) {
+				if (annotation instanceof Qualifier) {
+					Qualifier myAnnotation = (Qualifier) annotation;
+					entityName = myAnnotation.value();
+				}
+			}
+		}
+
+		if (entityName == null)
+			throw new Exception(
+					"@Qualifier not found, Entity should be defined with @Qualifier name, @Qualifier name must match DataBase table name");
+		return entityName;
+
+	}
+
+}

iamberry-app-international-service/.svn/pristine/c7/c7eba3856991bd528aacf51a0fa5636aeb6a14fa.svn-base

@@ -0,0 +1,43 @@
+<?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">
+<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
+<mapper namespace="com.iamberry.app.mapper.CodeMapper">
+	
+	<!-- 保存一个发送记录 -->
+	<insert id="save" parameterType="CodeValid">
+		INSERT INTO
+			CODE_VALID
+				(
+					CODE_PHONE, CODE_VALUE, CODE_SEND_DATE, CODE_VALID_DATE, 
+					CODE_STATUS, CODE_MSG, CODE_CHANNEL, CODE_USE, CODE_SCENARIO
+				)
+		VALUES
+			(
+				#{codePhone}, #{codeValue}, #{codeSendDate}, #{codeValidDate}, 
+				#{codeStatus}, #{codeMsg}, #{codeChannel}, #{codeUse}, #{codeScenario}
+			)
+	</insert>
+	
+	<!-- 获取用户最近的记录 -->
+	<select id="getLast" parameterType="string" resultType="CodeValid">
+		SELECT 
+			*
+		FROM 
+			CODE_VALID 
+		WHERE 
+			CODE_PHONE = #{phone}
+		ORDER BY 
+			CODE_ID DESC
+		LIMIT 0, 1
+	</select>
+	
+	<!-- 根据code_id，更新本次记录状态 -->
+	<update id="update" parameterType="long">
+		UPDATE 
+			CODE_VALID 
+		SET 
+			CODE_USE = 1
+		WHERE 
+			CODE_ID = #{codeID}
+	</update>
+</mapper>

iamberry-app-international-service/.svn/pristine/cc/cc7ea7f3c8f8bd468db3fcd7b0cd50bd6882aed8.svn-base

@@ -0,0 +1,358 @@
+package com.iamberry.app.service;
+
+
+import static com.iamberry.app.config.ImberryConfig.BASE_URL;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.dto.RemoteIpInfoDTO;
+import com.iamberry.app.core.dto.UserDTO;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.UserService;
+import com.iamberry.app.tool.util.AES;
+import com.iamberry.app.tool.util.HttpUtility;
+import com.iamberry.app.tool.util.MD5;
+import com.iamberry.app.tool.util.TuyaConnector;
+import com.iamberry.app.ulitity.Utility;
+/**
+ * UserService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:29
+ */
+@Service
+public class UserServiceImpl extends BaseService implements UserService {
+	
+	private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
+	/**
+	 * register
+	 *
+	 * @author Moon Cheng
+	 * @param phone 电话号码
+	 * @param password 密码
+	 * @param ip ip地址
+	 * @return User Information
+	 */
+	@Transactional
+	public User register(String phone, String password, String ip) {
+		String areacode = StringUtils.substringBefore(phone, ","); 
+		phone = StringUtils.substringAfter(phone, ",");
+		User user = new User(phone, MD5.md5(password), new Date(), Constants.USER_ACTIVE);
+		
+		user.setDisplay_name("Iamberry");
+		user.setStatus_(Constants.USER_ACTIVE);
+		user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+		RemoteIpInfoDTO dto = getLocation(ip);
+		if (dto != null) {
+			try {
+				user.setLocation(dto.getCity());
+			} catch (Exception e) {
+				user.setLocation("未知");
+			}
+		}
+		user.setCountry_code(areacode);
+		user.setCreated_on(new Date());
+		userMapper.insertUser(user);
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * thirdPartBindingPhone
+	 * @param phone
+	 * @param openId
+	 * @return
+	 */
+	public User thirdPartBindingPhone(String phone, String openId) {
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			return null;
+		}
+		
+		String areacode = StringUtils.substringBefore(phone, ",");
+		phone = StringUtils.substringAfter(phone, ",");
+		
+		try {
+			int status = userMapper.updateUserNameAndCountry(phone,areacode, user.getId());
+			if (status > 0) {
+				
+				user.setUsername(phone);
+				user.setPassword(null);
+			} else {
+				return null;
+			}
+			return user;
+		} catch (DuplicateKeyException e) { // 报错，触发数据库唯一约束错误，系统捕获，而后对获取数据重头再来
+			user.setPassword("EXTIES");
+			logger.info("userinfo:" + user.toString());
+			return user;
+		}
+	}
+
+	/**
+	 * findById
+	 * @param id
+	 * @return User
+	 */
+	public User findById(Long id) {
+		User user = userMapper.selectUserById(id);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * login
+	 *
+	 * @param phone
+	 * @param password
+	 * @param userAgent
+	 * @return
+	 */
+	public Object login(String phone, String password) {
+		User user = userMapper.selectUserByUsername(phone);
+		if (user == null) {
+			return -1;
+		}
+		user = userMapper.validateUser(phone, MD5.md5(password));
+		if (user == null) {
+			return -2;
+		}
+		if (Constants.USER_INACTIVE.equals(user.getStatus_())) {
+			return -3;
+		}
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return tuyaConnect(user);
+	}
+
+	/**
+	 * thirdPartLogin
+	 *
+	 * @param openId
+	 * @param extType
+	 * @param extName
+	 * @param extPicture
+	 * @return
+	 */
+	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) {
+		
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			user = new User(openId, MD5.md5(String.valueOf(System.currentTimeMillis())), new Date(), Constants.USER_ACTIVE);
+			user.setExt_open_id(openId);
+			user.setExt_type(extType);
+			user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+			user.setIs_perfect_user(1);//是否完善用户信息 1.未完善。2.已完善
+			user.setDisplay_name(extName.replaceAll("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]", "*"));
+
+			RemoteIpInfoDTO dto = getLocation(ip);
+			if (dto != null) {
+				user.setLocation(dto.getCity());
+			}
+			//user.setCountry_code(areacode);
+			user.setDisplay_picture(extPicture);
+			userMapper.insertUser(user);
+		}
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateUserInfo
+	 *
+	 * @param user
+	 * @param token
+	 * @return
+	 */
+	public User updateUserInfo(User user, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		user.setId(userInfo.getId());
+		userMapper.updateUser(user);
+		user = userMapper.selectUserById(user.getId());
+
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateDisplayPicture
+	 *
+	 * @author Moon Cheng
+	 * @param base64
+	 * @param token
+	 * @return
+	 */
+	public String updateDisplayPicture(String imageURL, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		/*if (userMapper.updateUserAvator(userInfo.getId(), base64) < 1) {
+			userMapper.insertUserAvator(userInfo.getId(), base64);
+		}*/
+	
+
+		// final String BASE_URL = "http://localhost/imberry-api";
+		int status = userMapper.updateDisplayPicture(imageURL, userInfo.getId());
+		if (status < 1) {
+			return "";
+		}
+		return imageURL;
+	}
+
+	/**
+	 * changePhone
+	 *
+	 * @author Moon Cheng
+	 * @param phone
+	 * @param token
+	 * @return
+	 */
+	public User changePhone(String phone, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		userMapper.updateUserName(phone, userInfo.getId());
+		userInfo = userMapper.selectUserById(userInfo.getId());
+		userInfo.setPassword(null);
+		return userInfo;
+	}
+
+	/**
+	 * resetPassWord
+	 *
+	 * @param oldPassword
+	 * @param newPassword
+	 * @param token
+	 * @return
+	 */
+	public int changePassword(String oldPassword, String newPassword, String token) {
+		int status = -1;
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+
+		User user = userMapper.validateUser(userInfo.getUsername(), MD5.md5(oldPassword));
+		if (user == null) {
+			return 0;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	/**
+	 * changePassWord
+	 *
+	 * @param username,
+	 *            newPassword
+	 * @param session
+	 * @return int
+	 */
+	public int resetPassWord(String username, String newPassword) {
+		int status = 0;
+		User user = userMapper.selectUserByUsername(username);
+		if (user == null) {
+			return -3;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	public UserDTO tuyaConnect(User user) {
+		UserDTO userInfo = new UserDTO(user.getId(), user.getUsername(), user.getPassword(), user.getToken(), user.getDisplay_name(),
+				user.getDisplay_picture(), user.getCreated_on(), user.getExt_open_id(), user.getExt_name(), user.getExt_type(),
+				user.getLocation(), user.getBaby_nickname(), user.getBaby_dob(), user.getBaby_gender(), user.getStatus_());
+		userInfo.setPassword(null);
+		userInfo.setCountry_code(user.getCountry_code());
+		userInfo.setIs_perfect_user(user.getIs_perfect_user());
+		try {
+			userInfo.setEncryptUsername(AES.encrypt(user.getUsername()));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		userInfo.setUserCode("iamberry123");
+		// Tuya connection
+		TuyaConnector.TuyaSyncConnect(user.getCountry_code()+","+userInfo.getEncryptUsername(), userInfo.getUserCode());
+		return userInfo;
+	}
+
+	/**
+	 * getStartPage
+	 *
+	 * @return String
+	 */
+	public String getStartPage() {
+		return userMapper.selectConfig("start_page");
+	}
+
+	/**
+	 * getLocation
+	 *
+	 * @param ip
+	 * @return String
+	 */
+	public RemoteIpInfoDTO getLocation(String ip) {
+		RemoteIpInfoDTO remoteIpInfoDTO = new RemoteIpInfoDTO();
+//		if (ip.indexOf(",") != -1) {
+//			ip = ip.split(",")[0];
+//		}
+//		logger.info("IP为:" + ip);
+//		try {
+//			String result = HttpUtility.httpsGet(MessageFormat.format(ImberryConfig.SINA_IP_URL, ip));
+//			remoteIpInfoDTO = mapper.readValue(result, RemoteIpInfoDTO.class);
+//		} catch (Exception e) {
+//		}
+		return remoteIpInfoDTO;
+	}
+
+	/**
+	 * getApkVersion
+	 *
+	 * @return
+	 */
+	public String getApkVersion(){
+		return userMapper.selectConfig("apk_version");
+	}
+
+	@Override
+	public String selectUserAvator(Long id) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserAvator(id);
+	}
+
+	@Override
+	public User selectUserByUsername(String username) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserByUsername(username);
+	}
+
+}

iamberry-app-international-service/.svn/pristine/cf/cfcd5b8b5e2f1ae3d62ec1a1cdaf78cec6e9bc4a.svn-base

@@ -0,0 +1,17 @@
+<?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">
+<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
+<mapper namespace="com.iamberry.app.mapper.LogMapper">
+	
+	<insert id="insertSysLog" parameterType="SysLog">
+		INSERT INTO
+			SYS_LOG
+				(
+					LOG_TYPE, OPERATION, DETAIL, TIMESTAMP_
+				)
+		VALUES
+			(
+				#{log_type}, #{operation}, #{detail}, #{timestamp_}
+			)
+	</insert>
+</mapper>

iamberry-app-international-service/.svn/pristine/dd/dd8ba1b2aaf14f5f5f1eb48d415562586b2f0f2d.svn-base

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

iamberry-app-international-service/.svn/pristine/de/de55c0eb365c49584a6cc266a788d4bdddfa2704.svn-base

@@ -0,0 +1,359 @@
+package com.iamberry.app.service;
+
+
+import static com.iamberry.app.config.ImberryConfig.BASE_URL;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.dto.RemoteIpInfoDTO;
+import com.iamberry.app.core.dto.UserDTO;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.UserService;
+import com.iamberry.app.tool.util.AES;
+import com.iamberry.app.tool.util.HttpUtility;
+import com.iamberry.app.tool.util.MD5;
+import com.iamberry.app.tool.util.TuyaConnector;
+import com.iamberry.app.ulitity.Utility;
+/**
+ * UserService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:29
+ */
+@Service
+public class UserServiceImpl extends BaseService implements UserService {
+	
+	private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
+	/**
+	 * register
+	 *
+	 * @author Moon Cheng
+	 * @param phone 电话号码
+	 * @param password 密码
+	 * @param ip ip地址
+	 * @return User Information
+	 */
+	@Transactional
+	public User register(String phone, String password, String ip) {
+		String areacode = StringUtils.substringBefore(phone, ","); 
+		phone = StringUtils.substringAfter(phone, ",");
+		User user = new User(phone, MD5.md5(password), new Date(), Constants.USER_ACTIVE);
+		
+		user.setDisplay_name("Iamberry");
+		user.setStatus_(Constants.USER_ACTIVE);
+		user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+		RemoteIpInfoDTO dto = getLocation(ip);
+		if (dto != null) {
+			try {
+				user.setLocation(dto.getCity());
+			} catch (Exception e) {
+				user.setLocation("未知");
+			}
+		}
+		user.setCountry_code(areacode);
+		user.setCreated_on(new Date());
+		userMapper.insertUser(user);
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * thirdPartBindingPhone
+	 * @param phone
+	 * @param openId
+	 * @return
+	 */
+	public User thirdPartBindingPhone(String phone, String openId) {
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			return null;
+		}
+		
+		String areacode = StringUtils.substringBefore(phone, ",");
+		phone = StringUtils.substringAfter(phone, ",");
+		
+		try {
+			int status = userMapper.updateUserNameAndCountry(phone,areacode, user.getId());
+			if (status > 0) {
+				
+				user.setUsername(phone);
+				user.setPassword(null);
+			} else {
+				return null;
+			}
+			return user;
+		} catch (DuplicateKeyException e) { // 报错，触发数据库唯一约束错误，系统捕获，而后对获取数据重头再来
+			user.setPassword("EXTIES");
+			logger.info("userinfo:" + user.toString());
+			return user;
+		}
+	}
+
+	/**
+	 * findById
+	 * @param id
+	 * @return User
+	 */
+	public User findById(Long id) {
+		User user = userMapper.selectUserById(id);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * login
+	 *
+	 * @param phone
+	 * @param password
+	 * @param userAgent
+	 * @return
+	 */
+	public Object login(String phone, String password) {
+		User user = userMapper.selectUserByUsername(phone);
+		if (user == null) {
+			return -1;
+		}
+		user = userMapper.validateUser(phone, MD5.md5(password));
+		if (user == null) {
+			return -2;
+		}
+		if (Constants.USER_INACTIVE.equals(user.getStatus_())) {
+			return -3;
+		}
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return tuyaConnect(user);
+	}
+
+	/**
+	 * thirdPartLogin
+	 *
+	 * @param openId
+	 * @param extType
+	 * @param extName
+	 * @param extPicture
+	 * @return
+	 */
+	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) {
+		
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			user = new User(openId, MD5.md5(String.valueOf(System.currentTimeMillis())), new Date(), Constants.USER_ACTIVE);
+			user.setExt_open_id(openId);
+			user.setExt_type(extType);
+			user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+			user.setIs_perfect_user(1);//是否完善用户信息 1.未完善。2.已完善
+			user.setCountry_code("86");
+			user.setDisplay_name(extName.replaceAll("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]", "*"));
+
+			RemoteIpInfoDTO dto = getLocation(ip);
+			if (dto != null) {
+				user.setLocation(dto.getCity());
+			}
+			//user.setCountry_code(areacode);
+			user.setDisplay_picture(extPicture);
+			userMapper.insertUser(user);
+		}
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateUserInfo
+	 *
+	 * @param user
+	 * @param token
+	 * @return
+	 */
+	public User updateUserInfo(User user, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		user.setId(userInfo.getId());
+		userMapper.updateUser(user);
+		user = userMapper.selectUserById(user.getId());
+
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateDisplayPicture
+	 *
+	 * @author Moon Cheng
+	 * @param base64
+	 * @param token
+	 * @return
+	 */
+	public String updateDisplayPicture(String imageURL, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		/*if (userMapper.updateUserAvator(userInfo.getId(), base64) < 1) {
+			userMapper.insertUserAvator(userInfo.getId(), base64);
+		}*/
+	
+
+		// final String BASE_URL = "http://localhost/imberry-api";
+		int status = userMapper.updateDisplayPicture(imageURL, userInfo.getId());
+		if (status < 1) {
+			return "";
+		}
+		return imageURL;
+	}
+
+	/**
+	 * changePhone
+	 *
+	 * @author Moon Cheng
+	 * @param phone
+	 * @param token
+	 * @return
+	 */
+	public User changePhone(String phone, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		userMapper.updateUserName(phone, userInfo.getId());
+		userInfo = userMapper.selectUserById(userInfo.getId());
+		userInfo.setPassword(null);
+		return userInfo;
+	}
+
+	/**
+	 * resetPassWord
+	 *
+	 * @param oldPassword
+	 * @param newPassword
+	 * @param token
+	 * @return
+	 */
+	public int changePassword(String oldPassword, String newPassword, String token) {
+		int status = -1;
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+
+		User user = userMapper.validateUser(userInfo.getUsername(), MD5.md5(oldPassword));
+		if (user == null) {
+			return 0;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	/**
+	 * changePassWord
+	 *
+	 * @param username,
+	 *            newPassword
+	 * @param session
+	 * @return int
+	 */
+	public int resetPassWord(String username, String newPassword) {
+		int status = 0;
+		User user = userMapper.selectUserByUsername(username);
+		if (user == null) {
+			return -3;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	public UserDTO tuyaConnect(User user) {
+		UserDTO userInfo = new UserDTO(user.getId(), user.getUsername(), user.getPassword(), user.getToken(), user.getDisplay_name(),
+				user.getDisplay_picture(), user.getCreated_on(), user.getExt_open_id(), user.getExt_name(), user.getExt_type(),
+				user.getLocation(), user.getBaby_nickname(), user.getBaby_dob(), user.getBaby_gender(), user.getStatus_());
+		userInfo.setPassword(null);
+		userInfo.setCountry_code(user.getCountry_code());
+		userInfo.setIs_perfect_user(user.getIs_perfect_user());
+		try {
+			userInfo.setEncryptUsername(AES.encrypt(user.getUsername()));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		userInfo.setUserCode("iamberry123");
+		// Tuya connection
+		TuyaConnector.TuyaSyncConnect(user.getCountry_code()+","+userInfo.getEncryptUsername(), userInfo.getUserCode());
+		return userInfo;
+	}
+
+	/**
+	 * getStartPage
+	 *
+	 * @return String
+	 */
+	public String getStartPage() {
+		return userMapper.selectConfig("start_page");
+	}
+
+	/**
+	 * getLocation
+	 *
+	 * @param ip
+	 * @return String
+	 */
+	public RemoteIpInfoDTO getLocation(String ip) {
+		RemoteIpInfoDTO remoteIpInfoDTO = new RemoteIpInfoDTO();
+//		if (ip.indexOf(",") != -1) {
+//			ip = ip.split(",")[0];
+//		}
+//		logger.info("IP为:" + ip);
+//		try {
+//			String result = HttpUtility.httpsGet(MessageFormat.format(ImberryConfig.SINA_IP_URL, ip));
+//			remoteIpInfoDTO = mapper.readValue(result, RemoteIpInfoDTO.class);
+//		} catch (Exception e) {
+//		}
+		return remoteIpInfoDTO;
+	}
+
+	/**
+	 * getApkVersion
+	 *
+	 * @return
+	 */
+	public String getApkVersion(){
+		return userMapper.selectConfig("apk_version");
+	}
+
+	@Override
+	public String selectUserAvator(Long id) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserAvator(id);
+	}
+
+	@Override
+	public User selectUserByUsername(String username) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserByUsername(username);
+	}
+
+}

iamberry-app-international-service/.svn/pristine/e3/e372a14a0b1ad1e7008049b3e95b580ac25130f4.svn-base

@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- 父类定义 -->
+	<parent>
+		<groupId>com.iamberry</groupId>
+		<artifactId>iamberry-parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<artifactId>iamberry-app-international-service</artifactId>
+	
+	<!-- 依赖 -->
+	<dependencies>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>iamberry-common-tool</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>iamberry-app-interface</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+	</dependencies>
+</project>

iamberry-app-international-service/.svn/pristine/ee/ee815a7340979fa9da0c54150fdd19fd5d1fb75c.svn-base

@@ -0,0 +1,280 @@
+package com.iamberry.app.service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.dto.RecordDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.MilkService;
+import com.iamberry.app.ulitity.Utility;
+
+/**
+ * MilkService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:10
+ */
+@Service
+public class MilkServiceImpl extends BaseService implements MilkService {
+
+	/**
+	 * setMilkMakingRecord
+	 * @param makingRecord
+	 * @param token
+	 * @param recordId
+	 * @return
+	 */
+	public MilkMakingRecord setMilkMakingRecord(MilkMakingRecord makingRecord, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		makingRecord.setUser(userInfo.getId());
+		makingRecord.setTimestamp_(new Date());
+		milkMapper.insertMilkMakingRecord(makingRecord);
+		return makingRecord;
+	}
+
+	/**
+	 * searchUserRecordsBytime
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @param startTime
+	 * @param endTime
+	 * @return Milk Making Record List
+	 */
+	public Map<String, List<RecordDTO>> searchUserRecordsByTime(Long userId, String dateStatus, String chosenDate,
+			String machineMac) {
+
+		Map<String, List<RecordDTO>> recordInfos = new LinkedHashMap<String, List<RecordDTO>>();
+		String dateType = null, formatter = null;
+		Calendar calendar = Calendar.getInstance();
+		if (chosenDate != null) {
+			// calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd
+			// HH:mm:ss", chosenDate));
+			// 防止无数据时显示分钟错误
+			chosenDate = chosenDate.substring(0, chosenDate.length() - 6) + ":00:00";
+			calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+		} else {
+			calendar.setTime(new Date());
+		}
+		Date start = null, end = null;
+		switch (dateStatus) {
+		case "day":
+			dateType = "days";
+			formatter = "%Y%m%d%H";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "week":
+			dateType = "weeks";
+			formatter = "%Y%m%d";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			if (Calendar.SUNDAY < Calendar.MONDAY) {
+				calendar.add(Calendar.DATE, 7);
+			}
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "year":
+			dateType = "years";
+			formatter = "%Y%m";
+			calendar.set(calendar.get(Calendar.YEAR), 0, 1, 0, 0, 0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), 11, 31, 23, 59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		}
+		return Utility.fillAppMachineRecordWithZero(Utility.synAppMachineRecord(recordInfos), dateType, chosenDate);
+	}
+
+	/**
+	 * searchUserRecordById
+	 *
+	 * @author Moon Cheng
+	 * @param recordId
+	 * @return Milk Making Record Information
+	 */
+	public MilkMakingRecord searchUserRecordById(Long recordId) {
+		MilkMakingRecord makingRecord = milkMapper.selectMilkMakingRecord(recordId);
+		return makingRecord;
+	}
+
+	/**
+	 * 根据用户，获取冲奶记录的-->总量和次数
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @return
+	 */
+	public RecordCountInfoDTO getTotalMilkVolumeMadeByUser(Long userId) {
+		RecordCountInfoDTO recordcount = milkMapper.getMilkPowderSumByUser(userId);
+		return  recordcount;
+	}
+
+	/**
+	 * setMilkPowderInfo
+	 *
+	 * @author Moon Cheng
+	 * @param entity
+	 * @param token
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo setMilkPowderInfo(MilkPowderInfo entity, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		// change status as user's phone number
+		entity.setStatus_(
+				userInfo.getUsername().length() > 11 ? Constants.MILK_POWDER_NOT_APPROVED : userInfo.getUsername());
+		entity.setCreated_on(new Date());
+		milkMapper.insertMilkPowderInfo(entity);
+		return entity;
+	}
+
+	/**
+	 * searchMilkPowderInfoByBarCode
+	 *
+	 * @author Moon Cheng
+	 * @param barcode
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo searchMilkPowderInfoByBarCode(String barcode) {
+		MilkPowderInfo milkPowderInfo = milkMapper.selectMilkPowderInfo(barcode);
+		return milkPowderInfo;
+	}
+
+	/**
+	 * 
+	 * 通过品牌名获取奶粉信息
+	 * @author Moon Cheng, Yin
+	 * @param brand
+	 * @return Milk Powder List
+	 */
+	public Map<String, List<String>> searchMilkPowderInfosByBrand(String brand) {
+		brand = "%" + brand.trim() + "%";
+		Map<String, List<String>> infos = new IdentityHashMap<String, List<String>>();
+		List<MilkInfoDTO> milkInfo = milkMapper.selectMilkInfoBybrand(brand);
+		for (int i = 0; i < milkInfo.size(); i++) {
+			List<String> list = new LinkedList<String>();
+			list.add(milkInfo.get(i).getLevel() + ":" + milkInfo.get(i).getType() + ":"
+					+ milkInfo.get(i).getPowder_ratio() + ":" + milkInfo.get(i).getId() + ":"
+					+ milkInfo.get(i).getWeight_per_spoon());
+			infos.put(milkInfo.get(i).getSeries(),list);
+		}
+		
+		return infos;
+	}
+
+	/**
+	 * searchMilkPowderBrand
+	 *
+	 * @return Brand List
+	 */
+	public List<String> searchMilkPowderBrand() {
+		List<String> milkPowderInfos = milkMapper.selectMilkPowderBrand();
+		List<String> result = new ArrayList<>();
+		milkPowderInfos.forEach(milk -> {
+			if (NumberUtils.isNumber(milk) && milk.contains(".")) {
+				milk = milk.substring(0, milk.indexOf("."));
+			}
+			result.add(milk);
+		});
+		return result;
+	}
+
+	/**
+	 * searchMilkInfoByBrandSeriesLevel
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo searchMilkInfoByBrandSeriesLevel(String brand, String series, String level) {
+		return milkMapper.selectMilkInfoByBrandSeriesLevel(brand, series, level);
+	}
+
+	// =====================================TuyaHistoryData======================================
+	/**
+	 * getLastRecordDate
+	 *
+	 * @return
+	 */
+	public Date getLastRecordDate() {
+		Date lastDate = milkMapper.selectLastRecordDate();
+		return lastDate == null ? new Date() : lastDate;
+	}
+
+	/**
+	 * addRecordData
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void addRecordData(String devId, String value, Long time, Long userId) {
+		MilkMakingRecord milkMakingRecord = new MilkMakingRecord();
+		milkMakingRecord.setVolume(Integer.parseInt(value));
+		milkMakingRecord.setMachine(devId);
+		milkMakingRecord.setTimestamp_(new Date(time));
+		milkMakingRecord.setUser(userId);
+		milkMapper.insertRecordData(milkMakingRecord);
+	}
+
+	@Override
+	public void setMilkImages(MilkImages images) {
+		// TODO Auto-generated method stub
+		milkMapper.insertMilkImages(images);
+	}
+
+	@Override
+	public MilkPowderInfo selectMilkPowderByBar(String barcode) {
+		// TODO Auto-generated method stub
+		return milkMapper.selectMilkPowderByBar(barcode);
+	}
+}

iamberry-app-international-service/.svn/pristine/f8/f82f947c962674daed06830f08b211b43cd1387d.svn-base

@@ -0,0 +1,374 @@
+package com.iamberry.app.ulitity;
+
+import static com.iamberry.app.config.ImberryConfig.SMS_PASSWORD;
+import static com.iamberry.app.config.ImberryConfig.SMS_TEXT;
+import static com.iamberry.app.config.ImberryConfig.SMS_URL;
+import static com.iamberry.app.config.ImberryConfig.SMS_USERNAME;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONObject;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.core.dto.RecordDTO;
+import com.iamberry.app.tool.dto.AddressDTO;
+import com.iamberry.app.tool.util.HttpUtility;
+import com.iamberry.app.tool.util.JsonParseUtil;
+import com.iamberry.app.tool.util.Result;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+
+public class Utility {
+
+	public static String DATA_STORE = "";
+	private static final String AB = "123456789abcdefghijklmnpqrstuvwxyz";
+
+	private static Random rnd = new Random();
+
+	public static String getDateByDay() {
+		Calendar cal = Calendar.getInstance();
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(cal.get(Calendar.YEAR));
+		buffer.append(cal.get(Calendar.MONTH) + 1);
+		buffer.append(cal.get(Calendar.DAY_OF_MONTH));
+		return buffer.toString();
+	}
+
+	public static boolean contains(String[] array, String item) {
+		try {
+			for (int i = 0; i < array.length; i++) {
+				if (array[i].equals(item)) {
+					return true;
+				}
+			}
+		} catch (Exception ex) {
+
+		}
+		return false;
+	}
+
+	public static String normalizePath(String path) {
+		return path.replace("\\\\", "\\").replace("\\", "/").replace("//", "/").replace("..", ".");
+	}
+
+	public static String getRandomString(int len) {
+		StringBuilder sb = new StringBuilder(len);
+		for (int i = 0; i < len; i++)
+			sb.append(AB.charAt(rnd.nextInt(AB.length())));
+		return sb.toString();
+	}
+
+	public static int CalculateAge(Long date) {
+		Date birthDate = new Date(0);
+		if (date != null)
+			birthDate = new Date(date);
+		SimpleDateFormat format = new SimpleDateFormat("yyyy");
+		int birthYear = Integer.parseInt(format.format(birthDate));
+		int currentYear = Integer.parseInt(format.format(new Date(System.currentTimeMillis())));
+		int age = currentYear - birthYear;
+
+		return age;
+	}
+
+	public static List<RecordDTO> convertMap(List<Map<String, Object>> list, String dateType) {
+		List<RecordDTO> maps = new ArrayList<RecordDTO>();
+		try {
+			SimpleDateFormat sdf = null;
+			for (Map<String, Object> map : list) {
+				switch (dateType) {
+				case "days":
+					sdf = new SimpleDateFormat("yyyyMMddHH");
+					break;
+				case "weeks":
+					sdf = new SimpleDateFormat("yyyyMMdd");
+					break;
+				case "years":
+					sdf = new SimpleDateFormat("yyyyMM");
+					break;
+				}
+				Date key = sdf.parse(map.get(dateType).toString());
+				Double value = Double.parseDouble(map.get("volume").toString());
+				maps.add(new RecordDTO(key.getTime(), value));
+			}
+		} catch (Exception e) {
+		}
+		return maps;
+	}
+
+	public static Map<String, List<RecordDTO>> synAppMachineRecord(Map<String, List<RecordDTO>> oldMap) {
+		Map<String, List<RecordDTO>> synMap = oldMap;
+		int appSize = synMap.get("app").size();
+		int machineSize = synMap.get("machine").size();
+		int signer = 0;
+		long appDate = 0l, machineDate = 0l;
+		RecordDTO appRecord, machineRecord;
+		for (int i = 0; i < appSize && i < machineSize; i++) {
+			appRecord = synMap.get("app").get(i);
+			machineRecord = synMap.get("machine").get(signer);
+			appDate = appRecord.getRecordDate();
+			machineDate = machineRecord.getRecordDate();
+			if (appDate == machineDate) {
+				signer++;
+			} else if (appDate < machineDate) {
+				synMap.get("machine").add(i, new RecordDTO(appDate, 0));
+				machineSize++;
+				signer++;
+			} else {
+				synMap.get("app").add(signer, new RecordDTO(machineDate, 0));
+				appSize++;
+				signer++;
+			}
+		}
+		while (signer < machineSize) {
+			synMap.get("app").add(new RecordDTO(synMap.get("machine").get(signer).getRecordDate(), 0));
+			signer++;
+		}
+		while (signer < appSize) {
+			synMap.get("machine").add(new RecordDTO(synMap.get("app").get(signer).getRecordDate(), 0));
+			signer++;
+		}
+		return synMap;
+	}
+
+	public static Map<String, List<RecordDTO>> fillAppMachineRecordWithZero(Map<String, List<RecordDTO>> synedMap, String dataType,
+			String chosenDate) {
+		Map<String, List<RecordDTO>> fillMap = synedMap;
+		Calendar calendar = Calendar.getInstance();
+		List<Integer> existTimePoint = new ArrayList<Integer>();
+		long timePoint = 0l;
+		switch (dataType) {
+		case "days":
+			if (fillMap.get("app").isEmpty()) {
+				calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+			}
+			fillMap.get("app").forEach(record -> {
+				calendar.setTime(new Date(record.getRecordDate()));
+				existTimePoint.add(calendar.get(Calendar.HOUR_OF_DAY));
+			});
+			for (int i = 0; i < 24; i++) {
+				if (!existTimePoint.remove(new Integer(i))) {
+					calendar.set(Calendar.HOUR_OF_DAY, i);
+					timePoint = calendar.getTimeInMillis();
+					fillMap.get("app").add(i, new RecordDTO(timePoint, 0));
+					fillMap.get("machine").add(i, new RecordDTO(timePoint, 0));
+				}
+			}
+			break;
+		case "weeks":
+			if (fillMap.get("app").isEmpty()) {
+				calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+			}
+			fillMap.get("app").forEach(record -> {
+				calendar.setTime(new Date(record.getRecordDate()));
+				existTimePoint.add(calendar.get(Calendar.DAY_OF_WEEK));
+			});
+			if (existTimePoint.contains(new Integer(1))) {
+				calendar.add(Calendar.DATE, -7);
+			}
+			for (int i = 2; i <= 7; i++) {
+				if (!existTimePoint.remove(new Integer(i))) {
+					calendar.set(Calendar.DAY_OF_WEEK, i);
+					timePoint = calendar.getTimeInMillis();
+					fillMap.get("app").add(i - 2, new RecordDTO(timePoint, 0));
+					fillMap.get("machine").add(i - 2, new RecordDTO(timePoint, 0));
+				}
+			}
+			if (!existTimePoint.contains(new Integer(1))) {
+				calendar.add(Calendar.DATE, 7);
+				calendar.set(Calendar.DAY_OF_WEEK, 1);
+				timePoint = calendar.getTimeInMillis();
+				fillMap.get("app").add(new RecordDTO(timePoint, 0));
+				fillMap.get("machine").add(new RecordDTO(timePoint, 0));
+			}
+			break;
+		case "years":
+			if (fillMap.get("app").isEmpty()) {
+				calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+			}
+			fillMap.get("app").forEach(record -> {
+				calendar.setTime(new Date(record.getRecordDate()));
+				existTimePoint.add(calendar.get(Calendar.MONTH));
+			});
+			for (int i = 0; i <= 11; i++) {
+				if (!existTimePoint.remove(new Integer(i))) {
+					calendar.set(Calendar.MONTH, i);
+					timePoint = calendar.getTimeInMillis();
+					fillMap.get("app").add(i, new RecordDTO(timePoint, 0));
+					fillMap.get("machine").add(i, new RecordDTO(timePoint, 0));
+				}
+			}
+			break;
+		}
+		return fillMap;
+	}
+
+	public static String getRandomCode(int len) {
+		StringBuilder sb = new StringBuilder(len);
+		for (int i = 0; i < len; i++)
+			sb.append("0123456789".charAt(rnd.nextInt("0123456789".length())));
+		return sb.toString();
+	}
+
+	public static String getIp(HttpServletRequest request) {
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
+
+	public static String CDN_WRITE_BASE_64_URL = "http://cms.iamberry.com/open-cdn/ssl/data/write/base64";
+
+	public static String uploadBase64File(String base64Data, String path) {
+		try {
+			if (base64Data != null) {
+				StringBody pic = new StringBody(base64Data, ContentType.DEFAULT_TEXT);
+				StringBody type = new StringBody("jpg", ContentType.TEXT_PLAIN);
+				HttpEntity entity = MultipartEntityBuilder.create().addPart("type", type).addPart("base64data", pic)
+						.build();
+				String result = HttpUtility.httpsPost(CDN_WRITE_BASE_64_URL, entity);
+
+				JSONObject json = new JSONObject(result);
+				int requestSatus = json.getJSONObject("header").getInt("status");
+				if (1000 == requestSatus) {
+					path = json.getJSONObject("data").get("url").toString();
+				}
+
+				return path;
+			}
+		} catch (Exception e) {
+			return null;
+		}
+		return "";
+	}
+
+	public static String readFile(InputStream in) {
+		BufferedReader reader = null;
+		String result = "";
+		try {
+			InputStreamReader inputStreamReader = new InputStreamReader(in, "UTF-8");
+			reader = new BufferedReader(inputStreamReader);
+			String tempString = null;
+			while ((tempString = reader.readLine()) != null) {
+				result += tempString;
+			}
+			reader.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
+
+	public static String sendCodeAsSMS(String phoneNum, Map<String, Integer> status) throws Exception {
+		String code = getRandomCode(4);
+		CloseableHttpClient client = HttpClients.createDefault();
+		Map<String, String> params = new HashMap<String, String>();
+		CloseableHttpResponse response = null;
+		params.put("username", SMS_USERNAME);
+		params.put("password", SMS_PASSWORD);
+		params.put("mobile", phoneNum);
+		params.put("content", MessageFormat.format(SMS_TEXT, code));
+		HttpPost method = new HttpPost(SMS_URL);
+		if (params != null) {
+			List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+			for (Map.Entry<String, String> param : params.entrySet()) {
+				NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+				paramList.add(pair);
+			}
+			method.setEntity(new UrlEncodedFormEntity(paramList, "UTF-8"));
+		}
+		response = client.execute(method);
+		HttpEntity entity = response.getEntity();
+		if (entity != null) {
+			String result = EntityUtils.toString(entity);
+			XStream xs = new XStream(new StaxDriver());
+			xs.alias("result", Result.class);
+			Result object = (Result)xs.fromXML(result);
+			response.close();
+			status.put(Constants.SMS_RETURNCODE, object.getResultcode());
+			if (0 == object.getResultcode()) {
+				return code;
+			}
+		}
+		return null;
+	}
+
+	public static AddressDTO getDefaultAddress(String jsonList) {
+		List<AddressDTO> addressDTOs = JsonParseUtil.parseAddressList(jsonList);
+		for (AddressDTO addressDTO : addressDTOs) {
+			if (addressDTO.getDefaultAddress() == 1) {
+				return addressDTO;
+			}
+		}
+		return null;
+	}
+
+	public static String getOrderSn(Long id) {
+		if (id == null)
+			throw new NullPointerException("id can not be null");
+
+		SimpleDateFormat format = new SimpleDateFormat("yyMMdd");
+		String date = format.format(new Date());
+		String sn = String.format("%0" + 5 + "d", id);
+		return "LTR" + date + sn;
+	}
+
+	public static String formatDateToString(String format, Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat(format);
+		return sdf.format(date);
+	}
+
+	public static Date formatStringToDate(String format, String dateStr) {
+		SimpleDateFormat sdf = new SimpleDateFormat(format);
+		Date date = null;
+		try {
+			date = sdf.parse(dateStr);
+		} catch (ParseException e) {
+			e.printStackTrace();
+			date = new Date();
+		}
+		return date;
+	}
+
+}

iamberry-app-international-service/pom.xml

@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- 父类定义 -->
+	<parent>
+		<groupId>com.iamberry</groupId>
+		<artifactId>iamberry-parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<artifactId>iamberry-app-international-service</artifactId>
+	
+	<!-- 依赖 -->
+	<dependencies>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>iamberry-common-tool</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>iamberry-app-interface</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+	</dependencies>
+</project>

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/CodeMapper.java

@@ -0,0 +1,35 @@
+package com.iamberry.app.mapper;
+
+import com.iamberry.app.core.entity.CodeValid;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月1日
+ * @explain	验证码 SQL Mapper映射
+ */
+public interface CodeMapper {
+
+	/**
+	 * 保存一条发送记录
+	 * @param codeValid
+	 * @return
+	 */
+	public int save(CodeValid codeValid);
+	
+	/**
+	 * 获取某一个手机号码最后的发送记录
+	 * @param phone
+	 * @return
+	 */
+	public CodeValid getLast(String phone);
+	
+	/**
+	 * 更新状态
+	 * @param codeId
+	 * @return
+	 */
+	public int update(Long codeId);
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/LogMapper.java

@@ -0,0 +1,13 @@
+package com.iamberry.app.mapper;
+
+import com.iamberry.app.core.entity.SysLog;
+
+public interface LogMapper {
+
+	/**
+	 * insertSysLog
+	 * @param sysLog
+	 */
+	public void insertSysLog(SysLog log);
+
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/MachineMapper.java

@@ -0,0 +1,76 @@
+package com.iamberry.app.mapper;
+
+import java.util.List;
+
+import com.iamberry.app.core.entity.Machine;
+
+public interface MachineMapper {
+
+	/**
+	 *	添加一台机器
+	 * @param machine
+	 * @return void
+	 */
+	public void insertMachine(Machine machine);
+
+	/**
+	 *	根据id 修改一台机器信息
+	 * @param machine
+	 */
+	public void updateMachine(Machine machine);
+
+	/**
+	 * 根据机器id 修改个人机器状态，增加修改时间为当前时间的字段
+	 * 取消数据库中表machine的时间修改字段自动更新！
+	 * @param status,
+	 *            id
+	 */
+	public int updateMachineStatus(String status,Long id);
+
+	/**
+	 *	根据id 修改一台机器的位置信息
+	 * @param location,
+	 *            id
+	 * @return void
+	 */
+	public int updateMachineLocation(String location,Long id);
+
+	/**
+	 *	按用户，查询所有机器
+	 * @author Moon Cheng
+	 * @param owner
+	 * @return
+	 */
+	public List<Machine> selectMachineByOwner(Long owner);
+
+	/**
+	 * 	根据id 查询一台机器
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public Machine selectMachineById(Long id);
+	
+	/**
+	 * 	根据机器码和所属用户 查一台机器id
+	 * @param devId
+	 * @param userId
+	 * @return
+	 */ 
+	public Long isDevUserPairExist(String devId, Long userId);
+	
+	/**
+	 * 	根据机器码 修改个人机器状态，增加修改时间为当前时间的字段
+	 *
+	 * @param mac
+	 * @param status
+	 */
+	public void updateStatusByMac(String devId, String status);
+
+	/**
+	 * 根据机器的ID，查询最近的一个用户ID
+	 * @param devId
+	 * @return
+	 */
+	public Long selectUserIDByDevId(String devId);
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/MessageMapper.java

@@ -0,0 +1,80 @@
+package com.iamberry.app.mapper;
+
+import java.util.List;
+
+import com.iamberry.app.core.entity.Message;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.core.serch.SerchParam;
+import com.iamberry.wechat.core.entity.PageBean;
+
+public interface MessageMapper {
+	
+	/**
+	 * 查询符合条件的用户列表
+	 * @return
+	 */
+	public List<User> selectUser(PageBean page);
+	
+	/**
+	 * 获取用户总条数	
+	 * @return
+	 */
+	public int selectUserCount(SerchParam params);
+	
+	/**
+	 * 获取符合条件所有消息
+	 * @return 所有的消息
+	 */
+	public List<Message> selectMessageRecoreds(PageBean page);
+	
+	/**
+	 * 修改一条消息		
+	 * @return 影响的行数
+	 */
+	public int updateMessage(Message message);
+	
+	/**
+	 * 添加一条消息		
+	 * @return 影响的行数
+	 */
+	public int insertMessage(Message message);
+	
+	
+
+	/**
+	 * 获取所有消息的总条数
+	 * @return 所有的消息条数
+	 */
+	public int selectMessageCount(SerchParam params);
+	
+	/**
+	 * 获取系统的所有消息(user为空的)
+	 * @param recordId 用户id
+	 * @return 用户的所有消息
+	 */
+	public List<Message> selectSysMessageRecoreds();
+	
+	/**
+	 * 根据信息id获取信息实体类			
+	 * @param id 信息id
+	 * @return 信息实体类
+	 */
+	public Message selectUserMessageByid(Long id);
+	
+	/**
+	 * 根据用户id获取该用户的所有消息		
+	 * @param userid 用户id
+	 * @return 用户下所有的消息
+	 */
+	public List<Message> selectUserMessageRecoreds(Long userid);
+	
+	
+	/**
+	 * 获取某状态的用户消息			
+	 * @param userid 用户id 
+	 * @param isread 1已读，2 未读
+	 * @return 用户消息集合
+	 */
+	public int selectUserMessageByisread(Long userid,Long isread);
+
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/MilkMapper.java

@@ -0,0 +1,252 @@
+package com.iamberry.app.mapper;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectKey;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Repository;
+
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.sqlprovider.DMLProvider;
+
+public interface MilkMapper {
+
+	/**
+	 * 添加信息到milk_making_record表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkMakingRecord(MilkMakingRecord entity);
+
+	/**
+	 * 根据id修改MILK_MAKING_RECORD的start和comments属性
+	 *
+	 * @param stars
+	 * @param comments
+	 * @param id
+	 */
+	public void updateMilkMakingRecord(int stars, String comments, Long id);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param userId
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, Long userId, String devId);
+
+	/**
+	 * 查询冲奶机冲奶时间和冲奶量
+	 *
+	 * @param start
+	 * @param end
+	 * @param controller
+	 * @param dateType
+	 * @param formatter
+	 * @param devids
+	 * @return
+	 */
+	public List<Map<String, Object>> selectMachineMilkMakingRecords(Date start, Date end,
+			String controller, String dateType,
+			String formatter, String devids);
+
+	/**
+	 * 根据id查询MILK_MAKING_RECORD所有信息
+	 *
+	 * @author Moon Cheng
+	 * @param id
+	 * @return
+	 */
+	public MilkMakingRecord selectMilkMakingRecord(Long id);
+
+	/**
+	 * 根据user查询所有冲奶信息
+	 *
+	 * @author Moon Cheng
+	 * @param user
+	 * @return
+	 */
+	public List<MilkMakingRecord> getMilkPowderByUser(Long user);
+	
+	
+	
+	/**
+	 * 根据user查询总冲奶量和次数
+	 * @param user
+	 * @return
+	 */
+	public RecordCountInfoDTO getMilkPowderSumByUser(Long user);
+	
+	/**
+	 * 将奶粉信息插入到奶粉信息表中
+	 *
+	 * @param entity
+	 * @return void
+	 */
+	public void insertMilkPowderInfo(MilkPowderInfo entity);
+
+	/**
+	 * 通过条形码查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderInfo(String barcode);
+
+	/**
+	 * 根据品牌查询奶粉信息的系列
+	 *
+	 * @param brand
+	 * @return
+	 */
+	public List<String> selectSeries(String brand);
+
+	/**
+	 * 根据系列查询奶粉信息的段数
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectLevel(String series);
+
+	
+	/**
+	 * 根据奶粉品牌获取奶粉，详细信息
+	 * @param brand 奶粉品牌
+	 * @return 详细信息
+	 */
+	public List<MilkInfoDTO> selectMilkInfoBybrand(String brand);
+	
+	
+	/**
+	 * 根据系列查询奶粉信息
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<MilkInfoDTO> selectMilkInfo( String series);
+
+	
+
+	/**
+	 * 根据系列查询奶粉类型
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkType(String series);
+
+	/**
+	 * 根据奶粉系列查询奶粉密度
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkDensity(String series);
+
+	/**
+	 * 根据系列查询奶粉比例
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkRatio(String series);
+
+	/**
+	 * 根据系列查询奶粉id
+	 *
+	 * @param series
+	 * @return
+	 */
+	public List<Long> selectMilkId(String series);
+
+	/**
+	 * 根据系列查询奶粉的重量
+	 * @param series
+	 * @return
+	 */
+	public List<String> selectMilkWeightPerSpoon(String series);
+
+	/**
+	 * 查询奶粉品牌
+	 *
+	 * @return
+	 */
+	public List<String> selectMilkPowderBrand();
+
+	/**
+	 * 根据系列段数品牌获取奶粉信息
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkInfoByBrandSeriesLevel(String brand, String series, String level);
+
+	/**
+	 * 查询冲奶记录的冲奶时间
+	 *
+	 * @return
+	 */
+	public Date selectLastRecordDate();
+
+	/**
+	 * 将信息插入到冲奶记录表中
+	 *
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void insertRecordData(MilkMakingRecord milkMakingRecord);
+
+	/**
+	 * 根据用户id查询冲奶机机器码
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public List<String> getMyMachines(Long userId);
+
+	/**
+	 * milk_images表中添加数据
+	 * @param entity
+	 */
+	public void insertMilkImages(MilkImages entity);
+	
+	/**
+	 * 通过barcode查询奶粉信息
+	 *
+	 * @author Moon Cheng
+	 * @param barCode
+	 * @return
+	 */
+	public MilkPowderInfo selectMilkPowderByBar(String barcode);
+	
+	/**
+	 * 根据设备id查询最新一条冲奶记录
+	 * @param machine
+	 * @return
+	 */
+	public Date selectMakingRecordAndmachine(String machine);
+	
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/UserMapper.java

@@ -0,0 +1,159 @@
+package com.iamberry.app.mapper;
+
+import com.iamberry.app.core.entity.User;
+
+/**
+ *
+ * @author Moon Cheng
+ * @date 2016年1月16日 下午12:25:05
+ */
+public interface UserMapper {
+
+	// ================================================================================================
+	// ------------------------------------------User----------------------------------------------
+	// ================================================================================================
+	/**
+	 * 根据id查询user所有信息
+	 *
+	 * @param id
+	 * @return User Information
+	 */
+	public User selectUserById(Long id);
+
+	/**
+	 * 根据username查询user所有信息
+	 *
+	 * @param username
+	 * @return User Information
+	 */
+	public User selectUserByUsername(String username);
+
+	/**
+	 * 通过ext_open_id查询user所有信息
+	 *
+	 * @param extOpenId
+	 * @return User Information
+	 */
+	public User selectUserByExtOpenId(String extOpenId);
+
+	/**
+	 * 添加用户信息到user表中
+	 *
+	 * @param user
+	 */
+	public void insertUser(User user);
+
+	/**
+	 * 根据id修改user表数据
+	 *
+	 * @param user
+	 */
+	public void updateUser(User user);
+
+	/**
+	 * 根据id修改user表的个人头像
+	 *
+	 * @author Moon Cheng
+	 * @param image
+	 * @param id
+	 */
+	public int updateDisplayPicture(String imageUrl, Long id);
+
+	/**
+	 * 根据用户名和密码查询用户表信息
+	 *
+	 * @param username
+	 * @param password
+	 * @return User Information
+	 */
+	public User validateUser(String username, String password);
+
+	/**
+	 * 通过id修改用户表密码
+	 *
+	 * @param id
+	 * @param newPassword
+	 * @return update row count
+	 */
+	public int changePassword(Long id, String newPassword);
+
+	// ================================================================================================
+	// ------------------------------------------UserToken----------------------------------------------
+	// ================================================================================================
+	/**
+	 * 通过token查询user表所有信息
+	 *
+	 * @param userId
+	 * @return
+	 */
+	public User selectUserByToken(String token);
+
+	/**
+	 * 根据id修改token值
+	 *
+	 * @param token
+	 * @param userId
+	 * @return int
+	 */
+	public int updateUserToken(String token, Long userId);
+
+	/**
+	 * 根据id修改user表的用户名
+	 *
+	 * @author Moon Cheng
+	 * @param username
+	 * @param userId
+	 * @return
+	 */
+	public int updateUserName(String username, Long userId);
+	
+	
+	/**
+	 * 根据id修改user表的用户名和国家代码
+	 *
+	 * @author Moon Cheng
+	 * @param username
+	 * @param userId
+	 * @param countryCode
+	 * @return
+	 */
+	public int updateUserNameAndCountry(String username,String countryCode,  Long userId);
+	
+
+	/**
+	 * 通过key_查询sys_config表数据
+	 *
+	 * @param key
+	 * @return String
+	 */
+	public String selectConfig(String key);
+
+	// ================================================================================================
+	// ------------------------------------------UserAvator----------------------------------------------
+	// ================================================================================================
+	/**
+	 * USER_AVATOR表中添加数据
+	 *
+	 * @param id
+	 * @param avator
+	 *            void
+	 */
+	public void insertUserAvator(Long id, String avator);
+
+	/**
+	 * 通过user_id修改USER_AVATOR表数据
+	 *
+	 * @param id
+	 * @param avator
+	 * @return int
+	 */
+	public int updateUserAvator(Long id, String avator);
+
+	/**
+	 * 根据user_id查询USER_AVATOR表数据
+	 *
+	 * @param id
+	 * @return String
+	 */
+	public String selectUserAvator(Long id);
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/codeMapper.xml

@@ -0,0 +1,43 @@
+<?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">
+<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
+<mapper namespace="com.iamberry.app.mapper.CodeMapper">
+	
+	<!-- 保存一个发送记录 -->
+	<insert id="save" parameterType="CodeValid">
+		INSERT INTO
+			CODE_VALID
+				(
+					CODE_PHONE, CODE_VALUE, CODE_SEND_DATE, CODE_VALID_DATE, 
+					CODE_STATUS, CODE_MSG, CODE_CHANNEL, CODE_USE, CODE_SCENARIO
+				)
+		VALUES
+			(
+				#{codePhone}, #{codeValue}, #{codeSendDate}, #{codeValidDate}, 
+				#{codeStatus}, #{codeMsg}, #{codeChannel}, #{codeUse}, #{codeScenario}
+			)
+	</insert>
+	
+	<!-- 获取用户最近的记录 -->
+	<select id="getLast" parameterType="string" resultType="CodeValid">
+		SELECT 
+			*
+		FROM 
+			CODE_VALID 
+		WHERE 
+			CODE_PHONE = #{phone}
+		ORDER BY 
+			CODE_ID DESC
+		LIMIT 0, 1
+	</select>
+	
+	<!-- 根据code_id，更新本次记录状态 -->
+	<update id="update" parameterType="long">
+		UPDATE 
+			CODE_VALID 
+		SET 
+			CODE_USE = 1
+		WHERE 
+			CODE_ID = #{codeID}
+	</update>
+</mapper>

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/logMapper.xml

@@ -0,0 +1,17 @@
+<?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">
+<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
+<mapper namespace="com.iamberry.app.mapper.LogMapper">
+	
+	<insert id="insertSysLog" parameterType="SysLog">
+		INSERT INTO
+			SYS_LOG
+				(
+					LOG_TYPE, OPERATION, DETAIL, TIMESTAMP_
+				)
+		VALUES
+			(
+				#{log_type}, #{operation}, #{detail}, #{timestamp_}
+			)
+	</insert>
+</mapper>

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/machineMapper.xml

@@ -0,0 +1,124 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MachineMapper">
+	<sql id="allMachineField">
+		ID,
+		OWNER,
+		MACHINE_NAME,
+		MACHINE_MAC,
+		MACHINE_INFO,
+		STATUS_,
+		LOCATION,
+		CREATED_ON
+	</sql>
+	
+	<!--通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
+    <resultMap type="Machine" id="machineMap">
+        <!-- 用id属性来映射主键字段 -->
+        <id property="id" column="id"/>
+        <!-- 用result属性来映射非主键字段 -->
+        <result property="owner" column="owner"/>
+        <result property="machine_name" column="machine_name"/>
+        <result property="machine_mac" column="machine_mac"/>
+        <result property="machine_info" column="machine_info"/>
+        <result property="status_" column="status_"/>
+        <result property="location" column="location"/>
+        <result property="created_on" column="created_on"/>
+    </resultMap>
+    
+    
+	<!-- 添加一台机器 -->
+	<insert id="insertMachine" parameterType="Machine"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MACHINE 
+			(MACHINE_NAME,MACHINE_MAC,MACHINE_INFO,OWNER,STATUS_,LOCATION,CREATED_ON)
+		VALUES
+			(
+				#{machine_name},#{machine_mac},#{machine_info},#{owner}
+				,#{status_},#{location},#{created_on}
+			)
+	</insert>
+
+	<!-- 根据id 修改一台机器信息  -->
+	<update id="updateMachine" parameterType="Machine">
+		UPDATE MACHINE
+		<set>
+			<if test="owner != null and owner != ''">
+				OWNER=#{owner},
+			</if>
+			<if test="machine_name != null and machine_name != ''">
+				MACHINE_NAME=#{machine_name},
+			</if>
+			<if test="machine_mac != null and machine_mac != ''">
+				MACHINE_MAC=#{machine_mac},
+			</if>
+			<if test="machine_info != null and machine_info != ''">
+				MACHINE_INFO=#{machine_info},
+			</if>
+			<if test="status_ != null and status_ != ''">
+				STATUS_=#{status_},
+			</if>
+			<if test="location != null and location != ''">
+				LOCATION=#{location},
+			</if>
+			<if test="created_on != null and created_on != ''">
+				CREATED_ON=#{created_on},
+			</if>
+		</set>
+		WHERE ID=#{id}
+	</update>
+	
+	<!-- 根据id 修改一台机器的状态-->
+	<update id="updateMachineStatus" parameterType="Machine">
+		UPDATE MACHINE 
+		SET STATUS_ = #{0},CREATED_ON = NOW() 
+		WHERE ID = #{1}
+	</update>
+	
+	<!-- 根据机器码 修改一台机器的状态-->
+	<update id="updateStatusByMac">
+		UPDATE MACHINE 
+		SET STATUS_ = #{1},CREATED_ON = NOW() 
+		WHERE machine_mac = #{0}
+	</update>
+	
+	<!-- 根据id 修改一台机器的位置信息-->
+	<update id="updateMachineLocation" parameterType="Machine">
+		UPDATE MACHINE 
+		SET LOCATION = #{0} 
+		WHERE ID = #{1}
+	</update>
+	
+	<!-- 按用户，查询所有机器 -->
+	<select id="selectMachineByOwner" parameterType="long" resultMap="machineMap">
+		SELECT 
+			<include refid="allMachineField"></include>
+		FROM MACHINE WHERE OWNER = #{owner}
+	</select>
+	
+	<!-- 根据id 查询一台机器 -->
+	<select id="selectMachineById" parameterType="long" resultMap="machineMap">
+		SELECT 
+			<include refid="allMachineField"></include>
+		FROM MACHINE WHERE ID = #{id}
+	</select>
+	
+	<!-- 根据机器码和所属用户 查一台机器id -->
+	<select id="isDevUserPairExist" resultType="Long">
+		SELECT ID
+		FROM MACHINE WHERE  MACHINE_MAC = #{0} AND OWNER = #{1}
+	</select>
+	
+	<!-- 根据机器的ID，查询最近的一个用户ID -->
+	<select id="selectUserIDByDevId" parameterType="String" resultType="Long">
+		SELECT OWNER 
+		FROM MACHINE 
+		WHERE MACHINE_MAC = #{devid} ORDER BY id DESC LIMIT 0, 1
+	</select>
+</mapper>

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/messageMapper.xml

@@ -0,0 +1,209 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MessageMapper">
+	<sql id="messageAllField">
+		ID,TITLE, CONTENT,URL,
+		FORWORD,IS_NEEDSEND,IS_READ,
+		CREATE_DATE,READ_DATE,SEND_TYPE,
+		USER,REMARK,SEND_RESULT
+	</sql>
+	<!--通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
+    <resultMap type="Message" id="messageMap">
+        <id property="id" column="ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="content" column="CONTENT"/>
+        <result property="url" column="URL"/>
+        <result property="forword" column="FORWORD"/>
+        <result property="is_needsend" column="IS_NEEDSEND"/>
+        
+        <result property="is_read" column="IS_READ"/>
+        <result property="create_date" column="CREATE_DATE"/>
+        <result property="read_date" column="READ_DATE"/>
+        <result property="send_type" column="SEND_TYPE"/>
+        <result property="user" column="USER"/>
+        <result property="remark" column="REMARK"/>
+        <result property="send_result" column="SEND_RESULT"/>
+    </resultMap>
+    
+	<sql id="userAttribute">
+		ID,
+		USERNAME,
+		PASSWORD,
+		TOKEN,
+		DISPLAY_NAME,
+		DISPLAY_PICTURE,
+		CREATED_ON,
+		EXT_OPEN_ID,
+		EXT_NAME,
+		EXT_TYPE,
+		LOCATION,
+		BABY_NICKNAME,
+		BABY_DOB,
+		BABY_GENDER,
+		STATUS_ 
+	</sql>
+	
+	<!-- 查询符合条件的用户列表 -->
+	<select id="selectUser" parameterType="PageBean" resultType="User">
+		SELECT 
+			<include refid="userAttribute"></include>
+		FROM USER
+		WHERE 1=1
+	    <if test="params.username!=null and params.username!=''" >
+			AND USERNAME LIKE CONCAT('%',#{params.username},'%')
+	    </if>
+		<if test='recordBegin>0 and pageSize>0'>
+			limit ${recordBegin},${pageSize}
+	    </if>
+	    <if test='recordBegin==0 and pageSize>0 '>
+			limit ${pageSize}
+	    </if> 
+	</select>
+	
+	<!-- 获取用户总条数 -->
+	<select id="selectUserCount" parameterType="SerchParam" resultType="int">
+		SELECT COUNT(ID) FROM USER WHERE 1=1 
+	 	<if test="username!=null and username!=''">
+    		AND USERNAME LIKE CONCAT('%',#{username},'%')
+    	</if>
+	</select>
+	
+	<!-- 获取符合条件所有消息 -->
+	<select id="selectMessageRecoreds" parameterType="PageBean" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM (
+			SELECT ID,TITLE, CONTENT,URL,FORWORD,IS_NEEDSEND,IS_READ,CREATE_DATE,READ_DATE,SEND_TYPE,
+			(SELECT USERNAME FROM USER WHERE ID = a.user) USER,REMARK,SEND_RESULT  FROM MESSAGE a 
+		) a
+    	WHERE 1=1
+    	<if test="params.title!=null and params.title!=''" >
+			AND TITLE LIKE CONCAT('%',#{params.title},'%') 
+    	</if>
+		<if test="params.username!=null and params.username!=''">
+			AND USER LIKE CONCAT('%',#{params.username},'%') 
+		</if>
+		<if test="params.beginDate!= null and  params.beginDate!= ''" >
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') >= DATE_FORMAT(#{params.beginDate},'%Y-%m-%d')]]>
+		</if>
+		<if test="params.endDate!= null and params.endDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') <= DATE_FORMAT(#{params.endDate},'%Y-%m-%d')]]>
+    	</if>
+		ORDER BY CREATE_DATE DESC,USER 
+	    <if test='recordBegin>0 and pageSize>0'>
+			LIMIT ${recordBegin},${pageSize}
+	    </if>
+	    <if test='recordBegin==0 and pageSize>0 '>
+			LIMIT ${pageSize}
+	    </if>
+	</select>
+	
+	<!-- 获取所有消息的总条数 -->
+	<select id="selectMessageCount" parameterType="SerchParam" resultType="int">
+		SELECT COUNT(1) FROM MESSAGE
+		WHERE 1=1
+	    <if test="title!=null and title!=''">
+			AND TITLE LIKE CONCAT('%',#{title},'%') 
+	    </if>
+	    <if test="beginDate!= null and  beginDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') >= DATE_FORMAT(#{beginDate},'%Y-%m-%d')]]>
+	    </if>
+	    <if test="endDate!= null and endDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') <= DATE_FORMAT(#{endDate},'%Y-%m-%d')]]>
+	    </if>
+	</select>
+	
+	<!-- 根据id 修改一条消息 -->
+	<update id="updateMessage" parameterType="Message">
+		UPDATE MESSAGE 
+		<set>
+			<if test="title != null and title != ''">
+				TITLE=#{title},
+			</if>
+			<if test="content != null and content != ''">
+				CONTENT=#{content},
+			</if>
+			<if test="url != null and url != ''">
+				URL=#{url},
+			</if>
+			<if test="forword != null and forword != ''">
+				FORWORD=#{forword},
+			</if>
+			<if test="is_needsend != null and is_needsend != ''">
+				IS_NEEDSEND=#{is_needsend},
+			</if>
+			<if test="is_read != null and is_read != ''">
+				IS_READ=#{is_read},
+			</if>
+			<if test="create_date != null and create_date != ''">
+				CREATE_DATE=#{create_date},
+			</if>
+			<if test="read_date != null and read_date != ''">
+				READ_DATE=#{read_date},
+			</if>
+			<if test="send_type != null and send_type != ''">
+				SEND_TYPE=#{send_type},
+			</if>
+			<if test="user != null and user != ''">
+				USER=#{user},
+			</if>
+			<if test="remark != null and remark != ''">
+				REMARK=#{remark},
+			</if>
+			<if test="send_result != null and send_result != ''">
+				SEND_RESULT=#{send_result}
+			</if>
+		</set>
+		WHERE ID=#{id}
+	</update>
+	
+	<!-- 添加一条消息 -->
+	<insert id="insertMessage" parameterType="Message"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MESSAGE
+			(
+				TITLE, CONTENT,URL, FORWORD,IS_NEEDSEND,IS_READ,
+				CREATE_DATE,READ_DATE,SEND_TYPE, USER,REMARK,SEND_RESULT
+			)
+		VALUES
+			(
+				#{title},#{content},#{url},#{forword},#{is_needsend},#{is_read},
+				#{create_date},#{read_date},#{send_type},#{user},
+				#{remark},#{send_result}
+			)
+	</insert>
+	
+	<!-- 获取系统的所有消息 -->
+	<select id="selectSysMessageRecoreds" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM MESSAGE 
+		WHERE USER IS NULL 
+		ORDER BY CREATE_DATE DESC
+	</select>
+	
+	<!-- 根据id获取一条信息  -->
+	<select id="selectUserMessageByid" parameterType="Long" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM MESSAGE WHERE ID = #{id}
+	</select>
+	
+	<!-- 根据用户id获取该用户的所有消息 -->
+	<select id="selectUserMessageRecoreds" parameterType="Long" resultMap="messageMap">
+		SELECT
+			<include refid="messageAllField"></include>
+		FROM MESSAGE WHERE USER=#{userid}  ORDER BY CREATE_DATE DESC
+	</select>
+	
+	<!--  获取某状态的用户消息 -->
+	<select id="selectUserMessageByisread" resultType="int">
+		SELECT COUNT(1)  FROM message where is_read = #{1} and user=#{0}	
+	</select>
+</mapper>

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/milkMapper.xml

@@ -0,0 +1,285 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MilkMapper">
+
+	<sql id="milkAttribute">
+		id,
+		volume,
+		controller,
+		stars,
+		comments,
+		brand,
+		powder_info,
+		machine_name,
+		machine,
+		user,
+		timestamp_
+	</sql>
+	
+	<sql id="powderAttribute">
+		id,
+		powder_number,
+		spoon_picture,
+		bar_code,
+		brand,
+		series,
+		level,
+		version_,
+		age_range,
+		weight_per_spoon,
+		milk_volume_per_spoon,
+		powder_ratio,
+		density,
+		type,
+		status_,
+		created_on
+	</sql>
+	
+	<resultMap type="MilkMakingRecord" id="milkMap">
+		<id property="id" column="id"/>
+		<result property="volume" column="volume"/>
+		<result property="controller" column="controller"/>
+		<result property="stars" column="stars"/>
+		<result property="comments" column="comments"/>
+		<result property="brand" column="brand"/>
+		<result property="powder_info" column="powder_info"/>
+		<result property="machine_name" column="machine_name"/>
+		<result property="machine" column="machine"/>
+		<result property="user" column="user"/>
+		<result property="timestamp_" column="timestamp_"/>
+	</resultMap>
+	
+	<resultMap type="MilkPowderInfo" id="powderMap">
+		<id property="id" column="id"/>
+		<result property="powder_number" column="powder_number"/>
+		<result property="spoon_picture" column="spoon_picture"/>
+		<result property="bar_code" column="bar_code"/>
+		<result property="brand" column="brand"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="version_" column="version_"/>
+		<result property="age_range" column="age_range"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+		<result property="milk_volume_per_spoon" column="milk_volume_per_spoon"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="density" column="density"/>
+		<result property="type" column="type"/>
+		<result property="status_" column="status_"/>
+		<result property="created_on" column="created_on"/>
+	</resultMap>
+	
+	<resultMap type="com.iamberry.app.core.dto.MilkInfoDTO" id="milkInfoDtoMap">
+		<id property="id" column="id"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="type" column="type"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+	</resultMap>
+	
+	<!-- 添加信息到milk_making_record表中 -->
+	<insert id="insertMilkMakingRecord" parameterType="MilkMakingRecord" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_MAKING_RECORD
+		(VOLUME,CONTROLLER,STARS,COMMENTS,BRAND,POWDER_INFO,MACHINE_NAME,MACHINE,USER,TIMESTAMP_) 
+		VALUES
+		(#{volume},#{controller},#{stars},#{comments},#{brand},#{powder_info},#{machine_name},#{machine},#{user},NOW())
+	</insert>
+	
+	<!-- 根据id修改MILK_MAKING_RECORD的start和comments属性 -->
+	<update id="updateMilkMakingRecord">
+		UPDATE MILK_MAKING_RECORD SET STARS = #{0}, COMMENTS = #{1} WHERE ID = #{2}
+	</update>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			user = #{5} 
+		AND 
+			machine = #{6} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMachineMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			machine = #{5} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 根据id查询MILK_MAKING_RECORD所有信息 -->
+	<select id="selectMilkMakingRecord" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据user查询所有冲奶信息 -->
+	<select id="getMilkPowderByUser" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE USER = #{0}
+	</select>
+	
+	<!-- 根据user查询总冲奶量和次数 -->
+	<select id="getMilkPowderSumByUser" parameterType="java.lang.Long" resultType="com.iamberry.app.core.dto.RecordCountInfoDTO">
+		SELECT COUNT(1) count,SUM(VOLUME) total FROM MILK_MAKING_RECORD WHERE USER = #{0} 
+	</select>
+	
+	<!-- 将奶粉信息插入到奶粉信息表中 -->
+	<insert id="insertMilkPowderInfo" parameterType="MilkPowderInfo" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_POWDER_INFO
+			(POWDER_NUMBER,SPOON_PICTURE,BAR_CODE,BRAND,SERIES,LEVEL,VERSION_,AGE_RANGE,
+			WEIGHT_PER_SPOON,MILK_VOLUME_PER_SPOON,POWDER_RATIO,DENSITY,TYPE,STATUS_,CREATED_ON) 
+		VALUES
+			(#{powder_number},#{spoon_picture},#{bar_code},#{brand},#{series},#{level},#{version_},#{age_range},#{weight_per_spoon},
+			#{milk_volume_per_spoon},#{powder_ratio},#{density},#{type},#{status_},NOW())
+	</insert>
+	
+	<!-- 通过条形码查询奶粉信息 -->
+	<select id="selectMilkPowderInfo" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} AND UPPER(STATUS_) = 'APPROVED' 
+	</select>
+	
+	<!-- 根据品牌查询奶粉信息的系列 -->
+	<select id="selectSeries" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT 
+			series 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{brand} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息的段数 -->
+	<select id="selectLevel" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT level FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC 
+	</select>
+	
+	<!-- 根据奶粉品牌获取奶粉，详细信息 -->
+	<select id="selectMilkInfoBybrand" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			series,
+			level,
+			type,
+			id,
+			powder_ratio,
+			weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{0} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息 -->
+	<select id="selectMilkInfo" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			level,type,id,powder_ratio,weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			SERIES LIKE #{0} 
+		ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉类型 -->
+	<select id="selectMilkType" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT type FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据奶粉系列查询奶粉密度 -->
+	<select id="selectMilkDensity" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT density FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉比例 -->
+	<select id="selectMilkRatio" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT powder_ratio FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉id -->
+	<select id="selectMilkId" parameterType="java.lang.String" resultType="java.lang.Long">
+		SELECT id FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉的重量 -->
+	<select id="selectMilkWeightPerSpoon" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT weight_per_spoon FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 查询奶粉品牌 -->
+	<select id="selectMilkPowderBrand" resultType="java.lang.String">
+		SELECT brand FROM MILK_POWDER_INFO WHERE STATUS_ = 'approved' GROUP BY BRAND
+	</select>
+	
+	<!-- 根据系列段数品牌获取奶粉信息 -->
+	<select id="selectMilkInfoByBrandSeriesLevel" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BRAND = #{0} AND SERIES = #{1} AND LEVEL = #{2} 
+	</select>
+	
+	<!-- 查询冲奶记录的冲奶时间 -->
+	<select id="selectLastRecordDate" resultType="java.util.Date">
+		SELECT timestamp_ FROM MILK_MAKING_RECORD WHERE CONTROLLER = 'machine' ORDER BY ID DESC LIMIT 1 
+	</select>
+	
+	<!-- 根据用户id查询冲奶机机器码 -->
+	<select id="getMyMachines" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT machine_mac FROM MACHINE WHERE OWNER = #{0}
+	</select>
+	
+	<!-- 将信息插入到冲奶记录表中 -->
+	<insert id="insertRecordData" parameterType="MilkMakingRecord">
+		INSERT INTO milk_making_record (volume, controller, machine, timestamp_, user) VALUE (#{volume}, 'machine', #{machine}, #{timestamp_}, #{user})
+	</insert>
+	
+	<!-- milk_images表中添加数据 -->
+	<insert id="insertMilkImages" parameterType="MilkImages" useGeneratedKeys="true" keyProperty="image_id">
+		INSERT INTO MILK_IMAGES
+		(
+			IMAGE_MILK_ID,IMAGE_FRONT,IMAGE_BAR,IMAGE_FEED
+		) 
+		VALUES 
+		(
+			#{image_Milk_ID},#{image_Front},#{image_Bar},#{image_Feed}
+		)
+	</insert>
+	
+	<!-- 通过bar_code查询奶粉信息 -->
+	<select id="selectMilkPowderByBar" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} 
+	</select>
+	
+	<!-- 根据设备id查询最新一条冲奶记录 -->
+	<select id="selectMakingRecordAndmachine" parameterType="String" resultType="java.util.Date">
+		SELECT timestamp_ from milk_making_record where machine = #{machine} order by timestamp_ desc LIMIT 1
+	</select>
+</mapper>

iamberry-app-international-service/src/main/java/com/iamberry/app/mapper/userMapper.xml

@@ -0,0 +1,181 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.UserMapper">
+
+	<sql id="userAttribute">
+		id,
+		username,
+		password,
+		token,
+		display_name,
+		display_picture,
+		created_on,
+		ext_open_id,
+		ext_name,
+		ext_type,
+		location,
+		baby_nickname,
+		baby_dob,
+		baby_gender,
+		status_,
+		country_code,
+		is_perfect_user
+	</sql>
+	
+	<resultMap type="User" id="userMap">
+		<id property="id" column="id"/>
+		<result property="username" column="username"/>
+		<result property="password" column="password"/>
+		<result property="token" column="token"/>
+		<result property="display_name" column="display_name"/>
+		<result property="display_picture" column="display_picture"/>
+		<result property="created_on" column="created_on"/>
+		<result property="ext_open_id" column="ext_open_id"/>
+		<result property="ext_name" column="ext_name"/>
+		<result property="ext_type" column="ext_type"/>
+		<result property="location" column="location"/>
+		<result property="baby_nickname" column="baby_nickname"/>
+		<result property="baby_dob" column="baby_dob"/>
+		<result property="baby_gender" column="baby_gender"/>
+		<result property="status_" column="status_"/>
+		<result property="is_perfect_user" column="is_perfect_user"/>
+		<result property="country_code" column="country_code"/>
+	</resultMap>
+	
+	<!-- 根据id查询user所有信息 -->
+	<select id="selectUserById"  parameterType="java.lang.Long" resultMap="userMap">
+		SELECT 
+			<include refid="userAttribute" />
+		FROM USER WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据username查询user所有信息 -->
+	<select id="selectUserByUsername" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute" /> FROM USER WHERE USERNAME = #{0}
+	</select>
+	
+	<!-- 通过ext_open_id查询user所有信息 -->
+	<select id="selectUserByExtOpenId" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute" /> FROM USER WHERE EXT_OPEN_ID = #{0}
+	</select>
+	
+	<!-- 添加用户信息到user表中 -->
+	<insert id="insertUser" parameterType="User" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO USER 
+		(USERNAME,PASSWORD,TOKEN,DISPLAY_NAME,DISPLAY_PICTURE,CREATED_ON,EXT_OPEN_ID,EXT_NAME,EXT_TYPE,
+		LOCATION,BABY_NICKNAME,BABY_DOB,BABY_GENDER,STATUS_,country_code,is_perfect_user) 
+		VALUES 
+		(#{username},#{password},#{token},#{display_name},#{display_picture},NOW(),#{ext_open_id},#{ext_name},#{ext_type},
+		#{location},#{baby_nickname},#{baby_dob},#{baby_gender},#{status_},#{country_code},#{is_perfect_user})
+	</insert>
+	
+	<!-- 根据id修改user表数据 -->
+	<update id="updateUser" parameterType="User">
+		UPDATE USER 
+		<set>
+			<if test="username != null and username != ''">
+				USERNAME = #{username}, 
+			</if>
+			<if test="password != null and password != ''">
+				PASSWORD = #{password}, 
+			</if>
+			<if test="token != null and token != ''">
+				TOKEN = #{token}, 
+			</if>
+			<if test="display_name != null and display_name != ''">
+				DISPLAY_NAME = #{display_name}, 
+			</if>
+			<if test="display_picture != null and display_picture != ''">
+				DISPLAY_PICTURE = #{display_picture}, 
+			</if>
+			<if test="ext_open_id != null and ext_open_id != ''">
+				EXT_OPEN_ID = #{ext_open_id}, 
+			</if>
+			<if test="ext_name != null and ext_name != ''">
+				EXT_NAME = #{ext_name}, 
+			</if>
+			<if test="ext_type != null and ext_type != ''">
+				EXT_TYPE = #{ext_type}, 
+			</if>
+			<if test="location != null and location != ''">
+				LOCATION = #{location}, 
+			</if>
+			<if test="baby_nickname != null and baby_nickname != ''">
+				BABY_NICKNAME = #{baby_nickname}, 
+			</if>
+			<if test="baby_dob != null and baby_dob != ''">
+				BABY_DOB = #{baby_dob}, 
+			</if>
+			<if test="baby_gender != null and baby_gender != ''">
+				BABY_GENDER = #{baby_gender}, 
+			</if>
+			<if test="status_ != null and status_ != ''">
+				STATUS_ = #{status_} 
+			</if>
+		</set>
+		WHERE 
+			ID = #{id} 
+	</update>
+	
+	<!-- 根据id修改user表的个人头像 -->
+	<update id="updateDisplayPicture">
+		UPDATE USER SET DISPLAY_PICTURE = #{0} WHERE ID = #{1} 
+	</update>
+	
+	<!-- 根据用户名和密码查询用户表信息 -->
+	<select id="validateUser" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute"/> FROM USER WHERE USERNAME=#{0} AND PASSWORD=#{1} 
+	</select>
+	
+	<!-- 通过id修改用户表密码 -->
+	<update id="changePassword">
+		UPDATE USER SET PASSWORD=#{1} WHERE ID=#{0}
+	</update>
+	
+	<!-- 通过token查询user表所有信息 -->
+	<select id="selectUserByToken" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute"/> FROM USER WHERE TOKEN=#{0} 
+	</select>
+	
+	<!-- 根据id修改token值 -->
+	<update id="updateUserToken">
+		UPDATE USER SET TOKEN=#{0} WHERE ID=#{1}
+	</update>
+	
+	<!-- 根据id修改user表的用户名 修改IS_PERFECT_USER字段未已完善状态-->
+	<update id="updateUserName">
+	
+		UPDATE USER SET USERNAME=#{0},IS_PERFECT_USER=2 WHERE ID=#{1}                  
+	</update>
+	
+	<!-- 根据id修改user表的用户名和国家代码 -->
+	<update id="updateUserNameAndCountry">
+		UPDATE USER SET USERNAME=#{0},country_code=#{1},IS_PERFECT_USER=2 WHERE ID=#{2}                  
+	</update>
+	
+	<!-- 通过key_查询sys_config表数据 -->
+	<select id="selectConfig" parameterType="java.lang.String" resultType="String">
+		SELECT VALUE_ FROM SYS_CONFIG WHERE KEY_ = #{0}
+	</select>
+	
+	<!-- USER_AVATOR表中添加数据 -->
+	<insert id="insertUserAvator">
+		INSERT INTO USER_AVATOR (USER_ID, AVATOR) VALUE (#{0}, #{1})
+	</insert>
+	
+	<!-- 通过user_id修改USER_AVATOR表数据 -->
+	<update id="updateUserAvator">
+		UPDATE USER_AVATOR SET AVATOR = #{1} WHERE USER_ID = #{0}
+	</update>
+	
+	<!-- 根据user_id查询USER_AVATOR表数据 -->
+	<select id="selectUserAvator" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT avator FROM USER_AVATOR WHERE USER_ID = #{id}
+	</select>
+</mapper>

iamberry-app-international-service/src/main/java/com/iamberry/app/service/BaseService.java

@@ -0,0 +1,53 @@
+package com.iamberry.app.service;
+
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.jpush.api.JPushClient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.mapper.LogMapper;
+import com.iamberry.app.mapper.MachineMapper;
+import com.iamberry.app.mapper.MessageMapper;
+import com.iamberry.app.mapper.MilkMapper;
+import com.iamberry.app.mapper.UserMapper;
+import com.iamberry.app.ulitity.Utility;
+
+@Service
+public class BaseService {
+
+	@Autowired
+	protected UserMapper userMapper;
+	@Autowired
+	protected MachineMapper machineMapper;
+	@Autowired
+	protected MilkMapper milkMapper;
+	@Autowired
+	protected LogMapper logMapper;
+	@Autowired
+	protected MessageMapper messageMapper;
+
+	protected static final ObjectMapper mapper = new ObjectMapper();
+
+	public static JPushClient jpushClient = new JPushClient(ImberryConfig.MASTERSECRET, ImberryConfig.APPKEY);
+
+	protected static final int PAGE_SIZE = 10;
+
+	protected String getEncToken(long userId) {
+		String tokenKey = Utility.getRandomString(10);
+		String base64 = userId + "|" + tokenKey + "|" + System.currentTimeMillis();
+		return new String(Base64.encodeBase64(base64.getBytes()));
+	}
+
+	public User validateUserToken(String token) {
+		User userInfo = userMapper.selectUserByToken(token);
+
+		if (userInfo == null) {
+			return null;
+		}
+		return userInfo;
+	}
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/service/CodeServiceImpl.java

@@ -0,0 +1,289 @@
+package com.iamberry.app.service;
+
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_KEY;
+import static com.iamberry.app.config.ImberryConfig.SMS_PASSWORD;
+import static com.iamberry.app.config.ImberryConfig.SMS_TEXT;
+import static com.iamberry.app.config.ImberryConfig.SMS_URL;
+import static com.iamberry.app.config.ImberryConfig.SMS_USERNAME;
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_KEY;
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_TEXT;
+import static com.iamberry.app.config.ImberryConfig.INTER_SMS_URL;
+
+
+
+
+
+
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.core.entity.CodeValid;
+import com.iamberry.app.face.CodeService;
+import com.iamberry.app.mapper.CodeMapper;
+import com.iamberry.app.tool.util.Result;
+import com.iamberry.app.ulitity.Utility;
+import com.iamberry.wechat.tools.ResponseJson;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年11月1日
+ * @explain	验证码业务实现类
+ */
+@SuppressWarnings("unused")
+@Service
+public class CodeServiceImpl implements CodeService {
+
+	@Autowired
+	private CodeMapper codeMapper;
+	
+	private static String ENCODING = "UTF-8";
+
+	@Override
+	public ResponseJson sendCode(String phone, int codeScenario) {
+		// TODO Auto-generated method stub
+		// 第一步,判断使用通道，如果是+86开头，优先使用国内通道,否则默认使用国外通道
+		ResponseJson json = new ResponseJson();
+		if (StringUtils.isEmpty(phone)) {
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Phone Empty!");
+			return json;
+		}
+	
+		String phones = StringUtils.substringAfter(phone, ","); //截取
+		// 第二步,如果是国内，判断是否存在
+		CodeValid codeValid = codeMapper.getLast(phones);
+		
+		// 通道是否是中国的
+		boolean IS_CHANNEL_ZH = false;
+		if (StringUtils.startsWith(phone, "86,")) {
+				/*IS_CHANNEL_ZH = true;*/
+				//不管是否是国内号码统一使用备用通道发送验证码 （2017年10月16日 修改）
+				IS_CHANNEL_ZH = false;
+		} else {
+			IS_CHANNEL_ZH = false;
+		}
+		// 判断通道
+		Date now = new Date();
+		if (IS_CHANNEL_ZH && codeValid != null) {
+			// ** 切换通道需求：每次请求验证码，如果上一次验证码在一分钟以后，三分钟以内没有使用，那么切换通道 **//
+			if (now.getTime() <= (codeValid.getCodeValidDate().getTime()) && 
+					(now.getTime() - 60000) >= codeValid.getCodeSendDate().getTime() && codeValid.getCodeUse() == 2 && codeValid.getCodeScenario() == codeScenario) {
+				// 如果等待三分钟后，那么切换通道
+				IS_CHANNEL_ZH = false;
+			}
+		}
+		// 获取验证码
+		String code = Utility.getRandomCode(4);
+		json = sendCMS(phone, code, IS_CHANNEL_ZH ? 1 : 2);
+		if (json.getReturnCode() != 200) {
+			json = sendCMS(phone, code, IS_CHANNEL_ZH ? 1 : 2);
+		}
+		// 保存发送记录
+		codeValid = new CodeValid();
+		codeValid.setCodeChannel(IS_CHANNEL_ZH ? 1 : 2);
+		codeValid.setCodeMsg(json.getReturnMsg().get("returnMsg").toString());
+		codeValid.setCodePhone(phones);
+		codeValid.setCodeScenario(codeScenario);
+		codeValid.setCodeSendDate(now);
+		codeValid.setCodeValidDate(new Date(now.getTime() + 180000));
+		codeValid.setCodeStatus(json.getReturnCode() == 200 ? 3 : 4);
+		codeValid.setCodeUse(2);
+		codeValid.setCodeValue(Integer.parseInt(code));
+		codeMapper.save(codeValid);
+		return json;
+	}
+	
+	/**
+	 * @param phone		手机号码
+	 * @param code		短信验证码
+	 * @param channel	通道 1：主通道；2：备用通道(国外的电话通通使用此)
+	 * @return
+	 */
+	private ResponseJson sendCMS(String phone, String code, int channel) {
+		
+		// 国内号码
+		ResponseJson json = new ResponseJson();
+		json.setReturnCode(500);
+		String result = null;
+		try {
+			if (channel == 1) {
+				phone = StringUtils.substringAfter(phone, ","); //截取
+
+				// 使用主通道
+				result = sendZHCMS(phone, code);
+			} else {
+				phone = StringUtils.replace(phone,",",""); //替换
+				// 使用备用通道
+				result = sendOtherCMS(phone, code);
+			}
+		} catch (Exception e) {
+			result = e.getMessage();
+		}
+		if (StringUtils.equals(result, "SUCCESS")) {
+			json.setReturnCode(200);
+		}
+		json.addResponseKeyValue(result);
+		return json;
+	}
+	
+	private String sendOtherCMS(String phone, String code) {
+		String text = MessageFormat.format(INTER_SMS_TEXT, code);
+		String results = sendSms(text, "+"+phone);
+        JSONObject json =  JSONObject.fromObject(results);
+        String resultcod  = json.get("code").toString();
+        if(resultcod.equals("0")){
+        	System.out.println("使用备用通道，发送验证码成功!" + code);
+        	return "SUCCESS";
+        }else{
+        	System.out.println("使用备用通道，发送失败...!" + code);
+        	return results;
+        }
+		
+	}
+	
+	public static String sendSms(String text, String mobile)  {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("apikey", INTER_SMS_KEY);
+        params.put("text", text);
+        params.put("mobile", mobile);
+        return post(INTER_SMS_URL, params);
+    }
+    /** 基于HttpClient 4.3的通用POST方法
+    * @param url       提交的URL
+    * @param paramsMap 提交<参数，值>Map
+    * @return 提交响应
+    */
+
+    public static String post(String url, Map<String, String> paramsMap) {
+    	
+        CloseableHttpClient client = HttpClients.createDefault();
+        String responseText = "";
+        CloseableHttpResponse response = null;
+            try {
+                HttpPost method = new HttpPost(url);
+                if (paramsMap != null) {
+                    List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+                    for (Map.Entry<String, String> param : paramsMap.entrySet()) {
+                        NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+                        paramList.add(pair);
+                    }
+                    method.setEntity(new UrlEncodedFormEntity(paramList, ENCODING));
+                }
+                response = client.execute(method);
+                HttpEntity entity = response.getEntity();
+                if (entity != null) {
+                    responseText = EntityUtils.toString(entity);
+                }
+                
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    response.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            return responseText;
+        }
+	
+	
+	private String sendZHCMS(String phone, String code) throws Exception {
+
+		CloseableHttpClient client = HttpClients.createDefault();
+		Map<String, String> params = new HashMap<String, String>();
+		CloseableHttpResponse response = null;
+		params.put("username", SMS_USERNAME);
+		params.put("password", SMS_PASSWORD);
+		params.put("mobile", phone);
+		params.put("content", MessageFormat.format(SMS_TEXT, code));
+		HttpPost method = new HttpPost(SMS_URL);
+		if (params != null) {
+			List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+			for (Map.Entry<String, String> param : params.entrySet()) {
+				NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+				paramList.add(pair);
+			}
+			method.setEntity(new UrlEncodedFormEntity(paramList, "UTF-8"));
+		}
+		response = client.execute(method);
+		HttpEntity entity = response.getEntity();
+		if (entity != null) {
+			String result = EntityUtils.toString(entity);
+			XStream xs = new XStream(new StaxDriver());
+			xs.alias("result", Result.class);
+			Result object = (Result)xs.fromXML(result);
+			response.close();
+			if (0 == object.getResultcode()) {
+				return "SUCCESS";
+			} else {
+				return object.getResultcode() + ":" + object.getErrordescription();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public ResponseJson validCode(String phone, String code, int codeScenario) {
+		ResponseJson json = new ResponseJson();
+		// 校验
+		CodeValid codeValid = codeMapper.getLast(phone);
+		if (codeValid == null) {
+			// 操作有误
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Wrong operation");
+			return json;
+		}
+		Date now = new Date();
+		if (now.getTime() >= codeValid.getCodeValidDate().getTime()) {
+			// 验证码无效
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Verification code is invalid");
+			return json;
+		}
+		// 必须 验证码正确，并且场景正确
+		if (!(codeValid.getCodeValue() == (Integer.parseInt(code)) 
+				&& codeScenario == codeValid.getCodeScenario())) {
+			// 验证码错误
+			json.setReturnCode(404);
+			json.addResponseKeyValue("Verification code error");
+			return json;
+		}
+		// 只要校验，表示本次验证码使用
+		codeMapper.update(codeValid.getCodeId());
+		json.setReturnCode(200);
+		json.addResponseKeyValue("SUCCESS");
+		return json;
+	}
+	
+	
+	
+	
+	
+	
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/service/LogServiceImpl.java

@@ -0,0 +1,28 @@
+package com.iamberry.app.service;
+
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.core.entity.SysLog;
+import com.iamberry.app.face.LogService;
+
+/**
+ * LogService
+ * 
+ * @author Moon Cheng
+ * @date 2016年3月23日 下午2:34:45
+ */
+@Service
+public class LogServiceImpl extends BaseService implements LogService  {
+
+	/**
+	 * saveSystemLog
+	 * 
+	 * @author Moon Cheng
+	 * @param log
+	 * @return
+	 */
+	public SysLog saveSystemLog(SysLog log) {
+		logMapper.insertSysLog(log);
+		return log;
+	}
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/service/MachineServiceImpl.java

@@ -0,0 +1,173 @@
+package com.iamberry.app.service;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.http.ParseException;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.entity.Machine;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.MachineService;
+import com.iamberry.app.tool.util.HttpUtility;
+
+/**
+ * MachineService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 下午12:27:32
+ */
+@Service
+public class MachineServiceImpl extends BaseService implements MachineService {
+
+	private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+	
+	/**
+	 * setMachine
+	 * @author Moon Cheng
+	 * @param machine
+	 * @param token
+	 * @return Machine Information
+	 */
+	@Transactional
+	public Machine setMachine(Machine machine, String token, String ip) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		if (ip.indexOf(",") != -1) {
+			ip = ip.split(",")[0];
+		}
+		logger.info("IP为:" + ip);
+
+		String location = null;
+		try {
+			location = new JSONObject(
+					HttpUtility.httpsGet(MessageFormat.format(ImberryConfig.SINA_IP_URL,ip)))
+							.getString("city");
+		} catch (ParseException | IOException | JSONException e) {
+			e.printStackTrace();
+		}
+		machine.setLocation(location);
+
+		machine.setOwner(userInfo.getId());
+		Long machineId = machineMapper.isDevUserPairExist(machine.getMachine_mac(), userInfo.getId());
+		machine.setCreated_on(new Date());
+		if (machineId == null) {
+			machineMapper.insertMachine(machine);
+		} else {
+			machine.setId(machineId);
+			machineMapper.updateMachine(machine);
+		}
+		return machine;
+	}
+
+	/**
+	 * updateMachineStatus
+	 *
+	 * @author Moon Cheng
+	 * @param machineId
+	 * @param status
+	 * @param token
+	 * @return
+	 */
+	public int updateMachineStatus(Long machineId, String status, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+		return machineMapper.updateMachineStatus(status, machineId);
+	}
+
+	/**
+	 * updateMachineLocation
+	 *
+	 * @author Moon Cheng
+	 * @param machineId
+	 * @param location
+	 * @param token
+	 * @return
+	 */
+	public int updateMachineLocation(Long machineId, String location, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+		return machineMapper.updateMachineLocation(location, machineId);
+	}
+
+	/**
+	 * 	按用户，查询所有机器
+	 * @param owner
+	 * @param token
+	 * @return
+	 */
+	public List<Machine> searchMachineByOwner(Long owner, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		List<Machine> machines = machineMapper.selectMachineByOwner(owner);
+		return machines;
+	}
+
+	/**
+	 * searchMachineById
+	 *
+	 * @author Moon Cheng
+	 * @param machineId
+	 * @param token
+	 * @return
+	 */
+	public Machine searchMachineById(Long machineId, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		Machine machine = machineMapper.selectMachineById(machineId);
+		return machine;
+	}
+
+	/**
+	 * updateStatus
+	 *
+	 * @param status
+	 */
+	@SuppressWarnings("unchecked")
+	@Transactional
+	public void updateStatus(String status) {
+		// the method is expensive!
+		Map<String, Object> map = new HashMap<>();
+		try {
+			map = mapper.readValue(status,new HashMap<String, Object>().getClass());
+			
+		} catch (IOException e) {
+			logger.error(e.getMessage());
+			e.printStackTrace();
+		}
+		for (Entry<String, Object> entry : map.entrySet()) {
+			if (entry.getValue() instanceof String) {
+				machineMapper.updateStatusByMac(entry.getKey(),  entry.getValue().equals("0") ? "online" : "offline");
+			} else {
+				machineMapper.updateStatusByMac(entry.getKey(),  (Integer)entry.getValue() == 0 ? "online" : "offline");
+			}
+		}
+	}
+
+	@Override
+	public Long selectUserIDByDevId(String devId) {
+		// TODO Auto-generated method stub
+		return machineMapper.selectUserIDByDevId(devId);
+	}
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/service/MessageServiceImpl.java

@@ -0,0 +1,132 @@
+package com.iamberry.app.service;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.core.entity.Message;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.core.serch.SerchParam;
+import com.iamberry.app.face.MessageService;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * LogService
+ * 
+ * @author Moon Cheng
+ * @date 2016年3月23日 下午2:34:45
+ */
+@Service
+public class MessageServiceImpl extends BaseService implements MessageService  {
+
+	/**
+	 * 查询符合条件的用户列表
+	 * @return
+	 */
+	public List<User> selectUser(PageBean page){
+		page.initRecordBegin();
+		return messageMapper.selectUser(page);
+	}
+	
+	/**
+	 * 获取用户总条数
+	 * @return
+	 */
+	public int selectUserCount(SerchParam params){
+		return messageMapper.selectUserCount(params);
+	}
+
+	
+	/**
+	 * 修改一条消息
+	 * @return 影响的行数
+	 */
+	public int updateMessage(Message message){
+		return messageMapper.updateMessage(message);
+	}
+	
+	/**
+	 * 添加一条消息
+	 * @return 影响的行数
+	 */
+	public int insertMessage(Message message){
+		message.setCreate_date(new Date());//添加时间
+		message.setIs_read(Long.valueOf("2"));//未读
+		return messageMapper.insertMessage(message);
+	}
+	
+	/**
+	 * 获取符合条件所有消息的总条数
+	 * @return 所有的消息条数
+	 */
+	public int selectMessageCount(SerchParam params){
+		return messageMapper.selectMessageCount(params);
+	}
+	
+	/**
+	 * 获取符合条件所有消息
+	 * @return 所有的消息
+	 */
+	public List<Message> selectMessageRecoreds(PageBean page){
+		page.initRecordBegin();
+		return messageMapper.selectMessageRecoreds(page);
+	}
+
+	
+	/**
+	 * 获取系统的所有消息
+	 * @param userid 用户id
+	 * @return 用户下所有的消息
+	 */
+	public List<Message> selectSysMessageRecoreds(){
+		return messageMapper.selectSysMessageRecoreds();
+	}
+	
+	/**
+	 * 根据信息id获取信息实体类
+	 * @param id 信息id
+	 * @return 信息实体类
+	 */
+	public Message selectUserMessageByid(Long id){
+		Message message = messageMapper.selectUserMessageByid(id);
+		if (message == null) {
+			return null;
+		}
+		//修改为已读
+		message.setRead_date(new Date());
+		message.setIs_read(Long.valueOf("1"));
+		messageMapper.updateMessage(message);
+		return message;
+	}
+	
+	/**
+	 * 根据用户id获取该用户的所有消息
+	 * @param userid 用户id
+	 * @return 用户下所有的消息
+	 */
+	public List<Message> selectUserMessageRecoreds(String token){
+		
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		return messageMapper.selectUserMessageRecoreds(userInfo.getId());
+	}
+	
+	/**
+	 * 获取用户消息
+	 * @param userid 用户id 
+	 * @param isread 1已读，2 未读
+	 * @return 用户消息集合
+	 */
+	public int selectUserMessageByisread(String token,
+			 Long isread){
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+		
+		return messageMapper.selectUserMessageByisread(userInfo.getId(),isread);
+	}
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/service/MilkServiceImpl.java

@@ -0,0 +1,291 @@
+package com.iamberry.app.service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.stereotype.Service;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.core.dto.MilkInfoDTO;
+import com.iamberry.app.core.dto.RecordCountInfoDTO;
+import com.iamberry.app.core.dto.RecordDTO;
+import com.iamberry.app.core.entity.MilkImages;
+import com.iamberry.app.core.entity.MilkMakingRecord;
+import com.iamberry.app.core.entity.MilkPowderInfo;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.MilkService;
+import com.iamberry.app.ulitity.Utility;
+
+/**
+ * MilkService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:10
+ */
+@Service
+public class MilkServiceImpl extends BaseService implements MilkService {
+
+	/**
+	 * setMilkMakingRecord
+	 * @param makingRecord
+	 * @param token
+	 * @param recordId
+	 * @return
+	 */
+	public MilkMakingRecord setMilkMakingRecord(MilkMakingRecord makingRecord, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		makingRecord.setUser(userInfo.getId());
+		makingRecord.setTimestamp_(new Date());
+		milkMapper.insertMilkMakingRecord(makingRecord);
+		return makingRecord;
+	}
+
+	/**
+	 * searchUserRecordsBytime
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @param startTime
+	 * @param endTime
+	 * @return Milk Making Record List
+	 */
+	public Map<String, List<RecordDTO>> searchUserRecordsByTime(Long userId, String dateStatus, String chosenDate,
+			String machineMac) {
+
+		Map<String, List<RecordDTO>> recordInfos = new LinkedHashMap<String, List<RecordDTO>>();
+		String dateType = null, formatter = null;
+		Calendar calendar = Calendar.getInstance();
+		if (chosenDate != null) {
+			// calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd
+			// HH:mm:ss", chosenDate));
+			// 防止无数据时显示分钟错误
+			chosenDate = chosenDate.substring(0, chosenDate.length() - 6) + ":00:00";
+			calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+		} else {
+			calendar.setTime(new Date());
+		}
+		Date start = null, end = null;
+		switch (dateStatus) {
+		case "day":
+			dateType = "days";
+			formatter = "%Y%m%d%H";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "week":
+			dateType = "weeks";
+			formatter = "%Y%m%d";
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 0, 0,
+					0);
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONDAY), calendar.get(Calendar.DATE), 23,
+					59, 59);
+			if (Calendar.SUNDAY < Calendar.MONDAY) {
+				calendar.add(Calendar.DATE, 7);
+			}
+			calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		case "year":
+			dateType = "years";
+			formatter = "%Y%m";
+			calendar.set(calendar.get(Calendar.YEAR), 0, 1, 0, 0, 0);
+			start = calendar.getTime();
+			calendar.set(calendar.get(Calendar.YEAR), 11, 31, 23, 59, 59);
+			end = calendar.getTime();
+			recordInfos.put("app", Utility.convertMap(
+					milkMapper.selectMilkMakingRecords(start, end, "app", dateType, formatter, userId, machineMac),
+					dateType));
+			recordInfos.put("machine", Utility.convertMap(
+					milkMapper.selectMachineMilkMakingRecords(start, end, "machine", dateType, formatter, machineMac),
+					dateType));
+			break;
+		}
+		return Utility.fillAppMachineRecordWithZero(Utility.synAppMachineRecord(recordInfos), dateType, chosenDate);
+	}
+
+	/**
+	 * searchUserRecordById
+	 *
+	 * @author Moon Cheng
+	 * @param recordId
+	 * @return Milk Making Record Information
+	 */
+	public MilkMakingRecord searchUserRecordById(Long recordId) {
+		MilkMakingRecord makingRecord = milkMapper.selectMilkMakingRecord(recordId);
+		return makingRecord;
+	}
+
+	/**
+	 * 根据用户，获取冲奶记录的-->总量和次数
+	 *
+	 * @author Moon Cheng
+	 * @param userId
+	 * @return
+	 */
+	public RecordCountInfoDTO getTotalMilkVolumeMadeByUser(Long userId) {
+		RecordCountInfoDTO recordcount = milkMapper.getMilkPowderSumByUser(userId);
+		return  recordcount;
+	}
+
+	/**
+	 * setMilkPowderInfo
+	 *
+	 * @author Moon Cheng
+	 * @param entity
+	 * @param token
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo setMilkPowderInfo(MilkPowderInfo entity, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		// change status as user's phone number
+		entity.setStatus_(
+				userInfo.getUsername().length() > 11 ? Constants.MILK_POWDER_NOT_APPROVED : userInfo.getUsername());
+		entity.setCreated_on(new Date());
+		milkMapper.insertMilkPowderInfo(entity);
+		return entity;
+	}
+
+	/**
+	 * searchMilkPowderInfoByBarCode
+	 *
+	 * @author Moon Cheng
+	 * @param barcode
+	 * @return Milk Powder Information
+	 */
+	public MilkPowderInfo searchMilkPowderInfoByBarCode(String barcode) {
+		MilkPowderInfo milkPowderInfo = milkMapper.selectMilkPowderInfo(barcode);
+		return milkPowderInfo;
+	}
+
+	/**
+	 * 
+	 * 通过品牌名获取奶粉信息
+	 * @author Moon Cheng, Yin
+	 * @param brand
+	 * @return Milk Powder List
+	 */
+	public Map<String, List<String>> searchMilkPowderInfosByBrand(String brand) {
+		brand = "%" + brand.trim() + "%";
+		Map<String, List<String>> infos = new IdentityHashMap<String, List<String>>();
+		List<MilkInfoDTO> milkInfo = milkMapper.selectMilkInfoBybrand(brand);
+		for (int i = 0; i < milkInfo.size(); i++) {
+			List<String> list = new LinkedList<String>();
+			list.add(milkInfo.get(i).getLevel() + ":" + milkInfo.get(i).getType() + ":"
+					+ milkInfo.get(i).getPowder_ratio() + ":" + milkInfo.get(i).getId() + ":"
+					+ milkInfo.get(i).getWeight_per_spoon());
+			infos.put(milkInfo.get(i).getSeries(),list);
+		}
+		
+		return infos;
+	}
+
+	/**
+	 * searchMilkPowderBrand
+	 *
+	 * @return Brand List
+	 */
+	public List<String> searchMilkPowderBrand() {
+		List<String> milkPowderInfos = milkMapper.selectMilkPowderBrand();
+		List<String> result = new ArrayList<>();
+		milkPowderInfos.forEach(milk -> {
+			if (NumberUtils.isNumber(milk) && milk.contains(".")) {
+				milk = milk.substring(0, milk.indexOf("."));
+			}
+			result.add(milk);
+		});
+		return result;
+	}
+
+	/**
+	 * searchMilkInfoByBrandSeriesLevel
+	 *
+	 * @param brand
+	 * @param series
+	 * @param level
+	 * @return
+	 */
+	public MilkPowderInfo searchMilkInfoByBrandSeriesLevel(String brand, String series, String level) {
+		return milkMapper.selectMilkInfoByBrandSeriesLevel(brand, series, level);
+	}
+
+	// =====================================TuyaHistoryData======================================
+	/**
+	 * getLastRecordDate
+	 *
+	 * @return
+	 */
+	public Date getLastRecordDate() {
+		Date lastDate = milkMapper.selectLastRecordDate();
+		return lastDate == null ? new Date() : lastDate;
+	}
+
+	/**
+	 * addRecordData
+	 * @param devId
+	 * @param value
+	 * @param time
+	 */
+	public void addRecordData(String devId, String value, Long time, Long userId) {
+		//判断当前机器30秒内是否有数据上传
+		System.out.println(devId+"机器正在在冲奶...");
+		Date timestamp_ = milkMapper.selectMakingRecordAndmachine(devId);
+		boolean msg = true;
+		if(timestamp_ != null){
+			if((new Date().getTime() - timestamp_.getTime()) <= 30000){
+				msg = false;
+			}
+		}
+		if(msg){
+			MilkMakingRecord milkMakingRecord = new MilkMakingRecord();
+			milkMakingRecord.setVolume(Integer.parseInt(value));
+			milkMakingRecord.setMachine(devId);
+			milkMakingRecord.setTimestamp_(new Date(time));
+			milkMakingRecord.setUser(userId);
+			milkMapper.insertRecordData(milkMakingRecord);
+		}
+	}
+
+	@Override
+	public void setMilkImages(MilkImages images) {
+		// TODO Auto-generated method stub
+		milkMapper.insertMilkImages(images);
+	}
+
+	@Override
+	public MilkPowderInfo selectMilkPowderByBar(String barcode) {
+		// TODO Auto-generated method stub
+		return milkMapper.selectMilkPowderByBar(barcode);
+	}
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/service/UserServiceImpl.java

@@ -0,0 +1,360 @@
+package com.iamberry.app.service;
+
+
+import static com.iamberry.app.config.ImberryConfig.BASE_URL;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.core.dto.RemoteIpInfoDTO;
+import com.iamberry.app.core.dto.UserDTO;
+import com.iamberry.app.core.entity.User;
+import com.iamberry.app.face.UserService;
+import com.iamberry.app.tool.util.AES;
+import com.iamberry.app.tool.util.HttpUtility;
+import com.iamberry.app.tool.util.MD5;
+import com.iamberry.app.tool.util.TuyaConnector;
+import com.iamberry.app.ulitity.Utility;
+/**
+ * UserService
+ *
+ * @author Moon Cheng
+ * @date 2016年3月23日 上午11:33:29
+ */
+@Service
+public class UserServiceImpl extends BaseService implements UserService {
+	
+	private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
+	/**
+	 * register
+	 *
+	 * @author Moon Cheng
+	 * @param phone 电话号码
+	 * @param password 密码
+	 * @param ip ip地址
+	 * @return User Information
+	 */
+	@Transactional
+	public User register(String phone, String password, String ip) {
+		String areacode = StringUtils.substringBefore(phone, ","); 
+		phone = StringUtils.substringAfter(phone, ",");
+		User user = new User(phone, MD5.md5(password), new Date(), Constants.USER_ACTIVE);
+		
+		user.setDisplay_name("Iamberry");
+		user.setStatus_(Constants.USER_ACTIVE);
+		user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+		RemoteIpInfoDTO dto = getLocation(ip);
+		if (dto != null) {
+			try {
+				user.setLocation(dto.getCity());
+			} catch (Exception e) {
+				user.setLocation("未知");
+			}
+		}
+		user.setCountry_code(areacode);
+		user.setCreated_on(new Date());
+		user.setIs_perfect_user(1);//标示用户有没有绑定手机号 1未绑定 2绑定
+		userMapper.insertUser(user);
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * thirdPartBindingPhone
+	 * @param phone
+	 * @param openId
+	 * @return
+	 */
+	public User thirdPartBindingPhone(String phone, String openId) {
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			return null;
+		}
+		
+		String areacode = StringUtils.substringBefore(phone, ",");
+		phone = StringUtils.substringAfter(phone, ",");
+		
+		try {
+			int status = userMapper.updateUserNameAndCountry(phone,areacode, user.getId());
+			if (status > 0) {
+				
+				user.setUsername(phone);
+				user.setPassword(null);
+			} else {
+				return null;
+			}
+			return user;
+		} catch (DuplicateKeyException e) { // 报错，触发数据库唯一约束错误，系统捕获，而后对获取数据重头再来
+			user.setPassword("EXTIES");
+			logger.info("userinfo:" + user.toString());
+			return user;
+		}
+	}
+
+	/**
+	 * findById
+	 * @param id
+	 * @return User
+	 */
+	public User findById(Long id) {
+		User user = userMapper.selectUserById(id);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * login
+	 *
+	 * @param phone
+	 * @param password
+	 * @param userAgent
+	 * @return
+	 */
+	public Object login(String phone, String password) {
+		User user = userMapper.selectUserByUsername(phone);
+		if (user == null) {
+			return -1;
+		}
+		user = userMapper.validateUser(phone, MD5.md5(password));
+		if (user == null) {
+			return -2;
+		}
+		if (Constants.USER_INACTIVE.equals(user.getStatus_())) {
+			return -3;
+		}
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return tuyaConnect(user);
+	}
+
+	/**
+	 * thirdPartLogin
+	 *
+	 * @param openId
+	 * @param extType
+	 * @param extName
+	 * @param extPicture
+	 * @return
+	 */
+	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) {
+		
+		User user = userMapper.selectUserByExtOpenId(openId);
+		if (user == null) {
+			user = new User(openId, MD5.md5(String.valueOf(System.currentTimeMillis())), new Date(), Constants.USER_ACTIVE);
+			user.setExt_open_id(openId);
+			user.setExt_type(extType);
+			user.setBaby_dob(Utility.formatStringToDate("yyyy-MM-dd", "1970-1-1"));
+			user.setIs_perfect_user(1);//是否完善用户信息 1.未完善。2.已完善
+			user.setCountry_code("86");
+			user.setDisplay_name(extName.replaceAll("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]", "*"));
+
+			RemoteIpInfoDTO dto = getLocation(ip);
+			if (dto != null) {
+				user.setLocation(dto.getCity());
+			}
+			//user.setCountry_code(areacode);
+			user.setDisplay_picture(extPicture);
+			userMapper.insertUser(user);
+		}
+
+		String token = getEncToken(user.getId());
+		userMapper.updateUserToken(token, user.getId());
+
+		user.setToken(token);
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateUserInfo
+	 *
+	 * @param user
+	 * @param token
+	 * @return
+	 */
+	public User updateUserInfo(User user, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		user.setId(userInfo.getId());
+		userMapper.updateUser(user);
+		user = userMapper.selectUserById(user.getId());
+
+		user.setPassword(null);
+		return user;
+	}
+
+	/**
+	 * updateDisplayPicture
+	 *
+	 * @author Moon Cheng
+	 * @param base64
+	 * @param token
+	 * @return
+	 */
+	public String updateDisplayPicture(String imageURL, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+
+		/*if (userMapper.updateUserAvator(userInfo.getId(), base64) < 1) {
+			userMapper.insertUserAvator(userInfo.getId(), base64);
+		}*/
+	
+
+		// final String BASE_URL = "http://localhost/imberry-api";
+		int status = userMapper.updateDisplayPicture(imageURL, userInfo.getId());
+		if (status < 1) {
+			return "";
+		}
+		return imageURL;
+	}
+
+	/**
+	 * changePhone
+	 *
+	 * @author Moon Cheng
+	 * @param phone
+	 * @param token
+	 * @return
+	 */
+	public User changePhone(String phone, String token) {
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return null;
+		}
+		userMapper.updateUserName(phone, userInfo.getId());
+		userInfo = userMapper.selectUserById(userInfo.getId());
+		userInfo.setPassword(null);
+		return userInfo;
+	}
+
+	/**
+	 * resetPassWord
+	 *
+	 * @param oldPassword
+	 * @param newPassword
+	 * @param token
+	 * @return
+	 */
+	public int changePassword(String oldPassword, String newPassword, String token) {
+		int status = -1;
+		User userInfo = validateUserToken(token);
+		if (userInfo == null) {
+			return -1;
+		}
+
+		User user = userMapper.validateUser(userInfo.getUsername(), MD5.md5(oldPassword));
+		if (user == null) {
+			return 0;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	/**
+	 * changePassWord
+	 *
+	 * @param username,
+	 *            newPassword
+	 * @param session
+	 * @return int
+	 */
+	public int resetPassWord(String username, String newPassword) {
+		int status = 0;
+		User user = userMapper.selectUserByUsername(username);
+		if (user == null) {
+			return -3;
+		}
+		status = userMapper.changePassword(user.getId(), MD5.md5(newPassword));
+		return status;
+	}
+
+	public UserDTO tuyaConnect(User user) {
+		UserDTO userInfo = new UserDTO(user.getId(), user.getUsername(), user.getPassword(), user.getToken(), user.getDisplay_name(),
+				user.getDisplay_picture(), user.getCreated_on(), user.getExt_open_id(), user.getExt_name(), user.getExt_type(),
+				user.getLocation(), user.getBaby_nickname(), user.getBaby_dob(), user.getBaby_gender(), user.getStatus_());
+		userInfo.setPassword(null);
+		userInfo.setCountry_code(user.getCountry_code());
+		userInfo.setIs_perfect_user(user.getIs_perfect_user());
+		try {
+			userInfo.setEncryptUsername(AES.encrypt(user.getUsername()));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		userInfo.setUserCode("iamberry123");
+		// Tuya connection
+		TuyaConnector.TuyaSyncConnect(user.getCountry_code()+","+userInfo.getEncryptUsername(), userInfo.getUserCode());
+		return userInfo;
+	}
+
+	/**
+	 * getStartPage
+	 *
+	 * @return String
+	 */
+	public String getStartPage() {
+		return userMapper.selectConfig("start_page");
+	}
+
+	/**
+	 * getLocation
+	 *
+	 * @param ip
+	 * @return String
+	 */
+	public RemoteIpInfoDTO getLocation(String ip) {
+		RemoteIpInfoDTO remoteIpInfoDTO = new RemoteIpInfoDTO();
+//		if (ip.indexOf(",") != -1) {
+//			ip = ip.split(",")[0];
+//		}
+//		logger.info("IP为:" + ip);
+//		try {
+//			String result = HttpUtility.httpsGet(MessageFormat.format(ImberryConfig.SINA_IP_URL, ip));
+//			remoteIpInfoDTO = mapper.readValue(result, RemoteIpInfoDTO.class);
+//		} catch (Exception e) {
+//		}
+		return remoteIpInfoDTO;
+	}
+
+	/**
+	 * getApkVersion
+	 *
+	 * @return
+	 */
+	public String getApkVersion(){
+		return userMapper.selectConfig("apk_version");
+	}
+
+	@Override
+	public String selectUserAvator(Long id) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserAvator(id);
+	}
+
+	@Override
+	public User selectUserByUsername(String username) {
+		// TODO Auto-generated method stub
+		return userMapper.selectUserByUsername(username);
+	}
+
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/sqlprovider/DMLProvider.java

@@ -0,0 +1,134 @@
+package com.iamberry.app.sqlprovider;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import org.apache.ibatis.jdbc.SQL;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+/**
+ * 
+ * @author Sikandar
+ * @date 2016年1月18日 下午9:34:48
+ */
+public class DMLProvider {
+
+	/**
+	 * update
+	 * 
+	 * @param map
+	 * @return String
+	 * @throws Exception
+	 */
+	public String update(Map<String, Object> map) {
+		try {
+			final String entityName = getEntityName(map);
+			final Object object_ = map.get(entityName);
+			final Class<?> cls = Class.forName(object_.getClass().getName());
+			SQL sql = new SQL() {
+				{
+					Object id = null;
+					UPDATE(entityName);
+					for (Method method : cls.getDeclaredMethods()) {
+						String mName = method.getName();
+						if (mName.startsWith("get")) {
+							Object rValue = method.invoke(object_);
+							if (mName.equalsIgnoreCase("getId")) {
+								id = rValue;
+							} else {
+								if (method.getReturnType() == String.class) {
+									if (rValue != null)
+										SET(mName.substring(mName.indexOf("get") + 3).toLowerCase() + " = '" + rValue + "'");
+								} else if (method.getReturnType() == Date.class) {
+
+									SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+									if (rValue != null)
+										SET(mName.substring(mName.indexOf("get") + 3).toLowerCase() + " = '" + format.format(rValue) + "'");
+								} else {
+									if (rValue != null)
+										SET(mName.substring(mName.indexOf("get") + 3).toLowerCase() + "=" + rValue.toString());
+								}
+							}
+						}
+					}
+
+					WHERE("id = " + id);
+				}
+			};
+
+			return sql.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * insert
+	 * 
+	 * @param map
+	 * @return String
+	 */
+	public String insert(Map<String, Object> map) {
+		try {
+
+			final String entityName = getEntityName(map);
+			final Object object_ = map.get(entityName);
+			final Class<?> cls = Class.forName(object_.getClass().getName());
+			SQL sql = new SQL() {
+				{
+					INSERT_INTO(entityName);
+					for (Method method : cls.getDeclaredMethods()) {
+						String mName = method.getName();
+						if (mName.startsWith("get")) {
+							Object rValue = method.invoke(object_);
+							if (method.getReturnType() == String.class) {
+								if (rValue == null)
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "" + rValue + "");
+								else
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "'" + rValue + "'");
+							} else if (method.getReturnType() == Date.class) {
+
+								SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+								if (rValue != null)
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "'" + format.format(rValue) + "'");
+								else
+									VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), "" + null + "");
+							} else
+								VALUES(mName.substring(mName.indexOf("get") + 3).toLowerCase(), rValue == null ? "0" : rValue.toString());
+						}
+					}
+				}
+			};
+
+			return sql.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+
+	}
+
+	private String getEntityName(Map<String, Object> map) throws Exception {
+		String entityName = null;
+		for (Object object_ : map.values()) {
+			Class<?> cls = Class.forName(object_.getClass().getName());
+			for (Annotation annotation : cls.getAnnotations()) {
+				if (annotation instanceof Qualifier) {
+					Qualifier myAnnotation = (Qualifier) annotation;
+					entityName = myAnnotation.value();
+				}
+			}
+		}
+
+		if (entityName == null)
+			throw new Exception(
+					"@Qualifier not found, Entity should be defined with @Qualifier name, @Qualifier name must match DataBase table name");
+		return entityName;
+
+	}
+
+}

iamberry-app-international-service/src/main/java/com/iamberry/app/ulitity/Utility.java

@@ -0,0 +1,374 @@
+package com.iamberry.app.ulitity;
+
+import static com.iamberry.app.config.ImberryConfig.SMS_PASSWORD;
+import static com.iamberry.app.config.ImberryConfig.SMS_TEXT;
+import static com.iamberry.app.config.ImberryConfig.SMS_URL;
+import static com.iamberry.app.config.ImberryConfig.SMS_USERNAME;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONObject;
+
+import com.iamberry.app.config.Constants;
+import com.iamberry.app.core.dto.RecordDTO;
+import com.iamberry.app.tool.dto.AddressDTO;
+import com.iamberry.app.tool.util.HttpUtility;
+import com.iamberry.app.tool.util.JsonParseUtil;
+import com.iamberry.app.tool.util.Result;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+
+public class Utility {
+
+	public static String DATA_STORE = "";
+	private static final String AB = "123456789abcdefghijklmnpqrstuvwxyz";
+
+	private static Random rnd = new Random();
+
+	public static String getDateByDay() {
+		Calendar cal = Calendar.getInstance();
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(cal.get(Calendar.YEAR));
+		buffer.append(cal.get(Calendar.MONTH) + 1);
+		buffer.append(cal.get(Calendar.DAY_OF_MONTH));
+		return buffer.toString();
+	}
+
+	public static boolean contains(String[] array, String item) {
+		try {
+			for (int i = 0; i < array.length; i++) {
+				if (array[i].equals(item)) {
+					return true;
+				}
+			}
+		} catch (Exception ex) {
+
+		}
+		return false;
+	}
+
+	public static String normalizePath(String path) {
+		return path.replace("\\\\", "\\").replace("\\", "/").replace("//", "/").replace("..", ".");
+	}
+
+	public static String getRandomString(int len) {
+		StringBuilder sb = new StringBuilder(len);
+		for (int i = 0; i < len; i++)
+			sb.append(AB.charAt(rnd.nextInt(AB.length())));
+		return sb.toString();
+	}
+
+	public static int CalculateAge(Long date) {
+		Date birthDate = new Date(0);
+		if (date != null)
+			birthDate = new Date(date);
+		SimpleDateFormat format = new SimpleDateFormat("yyyy");
+		int birthYear = Integer.parseInt(format.format(birthDate));
+		int currentYear = Integer.parseInt(format.format(new Date(System.currentTimeMillis())));
+		int age = currentYear - birthYear;
+
+		return age;
+	}
+
+	public static List<RecordDTO> convertMap(List<Map<String, Object>> list, String dateType) {
+		List<RecordDTO> maps = new ArrayList<RecordDTO>();
+		try {
+			SimpleDateFormat sdf = null;
+			for (Map<String, Object> map : list) {
+				switch (dateType) {
+				case "days":
+					sdf = new SimpleDateFormat("yyyyMMddHH");
+					break;
+				case "weeks":
+					sdf = new SimpleDateFormat("yyyyMMdd");
+					break;
+				case "years":
+					sdf = new SimpleDateFormat("yyyyMM");
+					break;
+				}
+				Date key = sdf.parse(map.get(dateType).toString());
+				Double value = Double.parseDouble(map.get("volume").toString());
+				maps.add(new RecordDTO(key.getTime(), value));
+			}
+		} catch (Exception e) {
+		}
+		return maps;
+	}
+
+	public static Map<String, List<RecordDTO>> synAppMachineRecord(Map<String, List<RecordDTO>> oldMap) {
+		Map<String, List<RecordDTO>> synMap = oldMap;
+		int appSize = synMap.get("app").size();
+		int machineSize = synMap.get("machine").size();
+		int signer = 0;
+		long appDate = 0l, machineDate = 0l;
+		RecordDTO appRecord, machineRecord;
+		for (int i = 0; i < appSize && i < machineSize; i++) {
+			appRecord = synMap.get("app").get(i);
+			machineRecord = synMap.get("machine").get(signer);
+			appDate = appRecord.getRecordDate();
+			machineDate = machineRecord.getRecordDate();
+			if (appDate == machineDate) {
+				signer++;
+			} else if (appDate < machineDate) {
+				synMap.get("machine").add(i, new RecordDTO(appDate, 0));
+				machineSize++;
+				signer++;
+			} else {
+				synMap.get("app").add(signer, new RecordDTO(machineDate, 0));
+				appSize++;
+				signer++;
+			}
+		}
+		while (signer < machineSize) {
+			synMap.get("app").add(new RecordDTO(synMap.get("machine").get(signer).getRecordDate(), 0));
+			signer++;
+		}
+		while (signer < appSize) {
+			synMap.get("machine").add(new RecordDTO(synMap.get("app").get(signer).getRecordDate(), 0));
+			signer++;
+		}
+		return synMap;
+	}
+
+	public static Map<String, List<RecordDTO>> fillAppMachineRecordWithZero(Map<String, List<RecordDTO>> synedMap, String dataType,
+			String chosenDate) {
+		Map<String, List<RecordDTO>> fillMap = synedMap;
+		Calendar calendar = Calendar.getInstance();
+		List<Integer> existTimePoint = new ArrayList<Integer>();
+		long timePoint = 0l;
+		switch (dataType) {
+		case "days":
+			if (fillMap.get("app").isEmpty()) {
+				calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+			}
+			fillMap.get("app").forEach(record -> {
+				calendar.setTime(new Date(record.getRecordDate()));
+				existTimePoint.add(calendar.get(Calendar.HOUR_OF_DAY));
+			});
+			for (int i = 0; i < 24; i++) {
+				if (!existTimePoint.remove(new Integer(i))) {
+					calendar.set(Calendar.HOUR_OF_DAY, i);
+					timePoint = calendar.getTimeInMillis();
+					fillMap.get("app").add(i, new RecordDTO(timePoint, 0));
+					fillMap.get("machine").add(i, new RecordDTO(timePoint, 0));
+				}
+			}
+			break;
+		case "weeks":
+			if (fillMap.get("app").isEmpty()) {
+				calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+			}
+			fillMap.get("app").forEach(record -> {
+				calendar.setTime(new Date(record.getRecordDate()));
+				existTimePoint.add(calendar.get(Calendar.DAY_OF_WEEK));
+			});
+			if (existTimePoint.contains(new Integer(1))) {
+				calendar.add(Calendar.DATE, -7);
+			}
+			for (int i = 2; i <= 7; i++) {
+				if (!existTimePoint.remove(new Integer(i))) {
+					calendar.set(Calendar.DAY_OF_WEEK, i);
+					timePoint = calendar.getTimeInMillis();
+					fillMap.get("app").add(i - 2, new RecordDTO(timePoint, 0));
+					fillMap.get("machine").add(i - 2, new RecordDTO(timePoint, 0));
+				}
+			}
+			if (!existTimePoint.contains(new Integer(1))) {
+				calendar.add(Calendar.DATE, 7);
+				calendar.set(Calendar.DAY_OF_WEEK, 1);
+				timePoint = calendar.getTimeInMillis();
+				fillMap.get("app").add(new RecordDTO(timePoint, 0));
+				fillMap.get("machine").add(new RecordDTO(timePoint, 0));
+			}
+			break;
+		case "years":
+			if (fillMap.get("app").isEmpty()) {
+				calendar.setTime(Utility.formatStringToDate("yyyy-MM-dd HH:mm:ss", chosenDate));
+			}
+			fillMap.get("app").forEach(record -> {
+				calendar.setTime(new Date(record.getRecordDate()));
+				existTimePoint.add(calendar.get(Calendar.MONTH));
+			});
+			for (int i = 0; i <= 11; i++) {
+				if (!existTimePoint.remove(new Integer(i))) {
+					calendar.set(Calendar.MONTH, i);
+					timePoint = calendar.getTimeInMillis();
+					fillMap.get("app").add(i, new RecordDTO(timePoint, 0));
+					fillMap.get("machine").add(i, new RecordDTO(timePoint, 0));
+				}
+			}
+			break;
+		}
+		return fillMap;
+	}
+
+	public static String getRandomCode(int len) {
+		StringBuilder sb = new StringBuilder(len);
+		for (int i = 0; i < len; i++)
+			sb.append("0123456789".charAt(rnd.nextInt("0123456789".length())));
+		return sb.toString();
+	}
+
+	public static String getIp(HttpServletRequest request) {
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
+
+	public static String CDN_WRITE_BASE_64_URL = "http://cms.iamberry.com/open-cdn/ssl/data/write/base64";
+
+	public static String uploadBase64File(String base64Data, String path) {
+		try {
+			if (base64Data != null) {
+				StringBody pic = new StringBody(base64Data, ContentType.DEFAULT_TEXT);
+				StringBody type = new StringBody("jpg", ContentType.TEXT_PLAIN);
+				HttpEntity entity = MultipartEntityBuilder.create().addPart("type", type).addPart("base64data", pic)
+						.build();
+				String result = HttpUtility.httpsPost(CDN_WRITE_BASE_64_URL, entity);
+
+				JSONObject json = new JSONObject(result);
+				int requestSatus = json.getJSONObject("header").getInt("status");
+				if (1000 == requestSatus) {
+					path = json.getJSONObject("data").get("url").toString();
+				}
+
+				return path;
+			}
+		} catch (Exception e) {
+			return null;
+		}
+		return "";
+	}
+
+	public static String readFile(InputStream in) {
+		BufferedReader reader = null;
+		String result = "";
+		try {
+			InputStreamReader inputStreamReader = new InputStreamReader(in, "UTF-8");
+			reader = new BufferedReader(inputStreamReader);
+			String tempString = null;
+			while ((tempString = reader.readLine()) != null) {
+				result += tempString;
+			}
+			reader.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
+
+	public static String sendCodeAsSMS(String phoneNum, Map<String, Integer> status) throws Exception {
+		String code = getRandomCode(4);
+		CloseableHttpClient client = HttpClients.createDefault();
+		Map<String, String> params = new HashMap<String, String>();
+		CloseableHttpResponse response = null;
+		params.put("username", SMS_USERNAME);
+		params.put("password", SMS_PASSWORD);
+		params.put("mobile", phoneNum);
+		params.put("content", MessageFormat.format(SMS_TEXT, code));
+		HttpPost method = new HttpPost(SMS_URL);
+		if (params != null) {
+			List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+			for (Map.Entry<String, String> param : params.entrySet()) {
+				NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+				paramList.add(pair);
+			}
+			method.setEntity(new UrlEncodedFormEntity(paramList, "UTF-8"));
+		}
+		response = client.execute(method);
+		HttpEntity entity = response.getEntity();
+		if (entity != null) {
+			String result = EntityUtils.toString(entity);
+			XStream xs = new XStream(new StaxDriver());
+			xs.alias("result", Result.class);
+			Result object = (Result)xs.fromXML(result);
+			response.close();
+			status.put(Constants.SMS_RETURNCODE, object.getResultcode());
+			if (0 == object.getResultcode()) {
+				return code;
+			}
+		}
+		return null;
+	}
+
+	public static AddressDTO getDefaultAddress(String jsonList) {
+		List<AddressDTO> addressDTOs = JsonParseUtil.parseAddressList(jsonList);
+		for (AddressDTO addressDTO : addressDTOs) {
+			if (addressDTO.getDefaultAddress() == 1) {
+				return addressDTO;
+			}
+		}
+		return null;
+	}
+
+	public static String getOrderSn(Long id) {
+		if (id == null)
+			throw new NullPointerException("id can not be null");
+
+		SimpleDateFormat format = new SimpleDateFormat("yyMMdd");
+		String date = format.format(new Date());
+		String sn = String.format("%0" + 5 + "d", id);
+		return "LTR" + date + sn;
+	}
+
+	public static String formatDateToString(String format, Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat(format);
+		return sdf.format(date);
+	}
+
+	public static Date formatStringToDate(String format, String dateStr) {
+		SimpleDateFormat sdf = new SimpleDateFormat(format);
+		Date date = null;
+		try {
+			date = sdf.parse(dateStr);
+		} catch (ParseException e) {
+			e.printStackTrace();
+			date = new Date();
+		}
+		return date;
+	}
+
+}

iamberry-app-international-service/target/classes/com/iamberry/app/mapper/codeMapper.xml

@@ -0,0 +1,43 @@
+<?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">
+<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
+<mapper namespace="com.iamberry.app.mapper.CodeMapper">
+	
+	<!-- 保存一个发送记录 -->
+	<insert id="save" parameterType="CodeValid">
+		INSERT INTO
+			CODE_VALID
+				(
+					CODE_PHONE, CODE_VALUE, CODE_SEND_DATE, CODE_VALID_DATE, 
+					CODE_STATUS, CODE_MSG, CODE_CHANNEL, CODE_USE, CODE_SCENARIO
+				)
+		VALUES
+			(
+				#{codePhone}, #{codeValue}, #{codeSendDate}, #{codeValidDate}, 
+				#{codeStatus}, #{codeMsg}, #{codeChannel}, #{codeUse}, #{codeScenario}
+			)
+	</insert>
+	
+	<!-- 获取用户最近的记录 -->
+	<select id="getLast" parameterType="string" resultType="CodeValid">
+		SELECT 
+			*
+		FROM 
+			CODE_VALID 
+		WHERE 
+			CODE_PHONE = #{phone}
+		ORDER BY 
+			CODE_ID DESC
+		LIMIT 0, 1
+	</select>
+	
+	<!-- 根据code_id，更新本次记录状态 -->
+	<update id="update" parameterType="long">
+		UPDATE 
+			CODE_VALID 
+		SET 
+			CODE_USE = 1
+		WHERE 
+			CODE_ID = #{codeID}
+	</update>
+</mapper>

iamberry-app-international-service/target/classes/com/iamberry/app/mapper/logMapper.xml

@@ -0,0 +1,17 @@
+<?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">
+<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
+<mapper namespace="com.iamberry.app.mapper.LogMapper">
+	
+	<insert id="insertSysLog" parameterType="SysLog">
+		INSERT INTO
+			SYS_LOG
+				(
+					LOG_TYPE, OPERATION, DETAIL, TIMESTAMP_
+				)
+		VALUES
+			(
+				#{log_type}, #{operation}, #{detail}, #{timestamp_}
+			)
+	</insert>
+</mapper>

iamberry-app-international-service/target/classes/com/iamberry/app/mapper/machineMapper.xml

@@ -0,0 +1,124 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MachineMapper">
+	<sql id="allMachineField">
+		ID,
+		OWNER,
+		MACHINE_NAME,
+		MACHINE_MAC,
+		MACHINE_INFO,
+		STATUS_,
+		LOCATION,
+		CREATED_ON
+	</sql>
+	
+	<!--通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
+    <resultMap type="Machine" id="machineMap">
+        <!-- 用id属性来映射主键字段 -->
+        <id property="id" column="id"/>
+        <!-- 用result属性来映射非主键字段 -->
+        <result property="owner" column="owner"/>
+        <result property="machine_name" column="machine_name"/>
+        <result property="machine_mac" column="machine_mac"/>
+        <result property="machine_info" column="machine_info"/>
+        <result property="status_" column="status_"/>
+        <result property="location" column="location"/>
+        <result property="created_on" column="created_on"/>
+    </resultMap>
+    
+    
+	<!-- 添加一台机器 -->
+	<insert id="insertMachine" parameterType="Machine"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MACHINE 
+			(MACHINE_NAME,MACHINE_MAC,MACHINE_INFO,OWNER,STATUS_,LOCATION,CREATED_ON)
+		VALUES
+			(
+				#{machine_name},#{machine_mac},#{machine_info},#{owner}
+				,#{status_},#{location},#{created_on}
+			)
+	</insert>
+
+	<!-- 根据id 修改一台机器信息  -->
+	<update id="updateMachine" parameterType="Machine">
+		UPDATE MACHINE
+		<set>
+			<if test="owner != null and owner != ''">
+				OWNER=#{owner},
+			</if>
+			<if test="machine_name != null and machine_name != ''">
+				MACHINE_NAME=#{machine_name},
+			</if>
+			<if test="machine_mac != null and machine_mac != ''">
+				MACHINE_MAC=#{machine_mac},
+			</if>
+			<if test="machine_info != null and machine_info != ''">
+				MACHINE_INFO=#{machine_info},
+			</if>
+			<if test="status_ != null and status_ != ''">
+				STATUS_=#{status_},
+			</if>
+			<if test="location != null and location != ''">
+				LOCATION=#{location},
+			</if>
+			<if test="created_on != null and created_on != ''">
+				CREATED_ON=#{created_on},
+			</if>
+		</set>
+		WHERE ID=#{id}
+	</update>
+	
+	<!-- 根据id 修改一台机器的状态-->
+	<update id="updateMachineStatus" parameterType="Machine">
+		UPDATE MACHINE 
+		SET STATUS_ = #{0},CREATED_ON = NOW() 
+		WHERE ID = #{1}
+	</update>
+	
+	<!-- 根据机器码 修改一台机器的状态-->
+	<update id="updateStatusByMac">
+		UPDATE MACHINE 
+		SET STATUS_ = #{1},CREATED_ON = NOW() 
+		WHERE machine_mac = #{0}
+	</update>
+	
+	<!-- 根据id 修改一台机器的位置信息-->
+	<update id="updateMachineLocation" parameterType="Machine">
+		UPDATE MACHINE 
+		SET LOCATION = #{0} 
+		WHERE ID = #{1}
+	</update>
+	
+	<!-- 按用户，查询所有机器 -->
+	<select id="selectMachineByOwner" parameterType="long" resultMap="machineMap">
+		SELECT 
+			<include refid="allMachineField"></include>
+		FROM MACHINE WHERE OWNER = #{owner}
+	</select>
+	
+	<!-- 根据id 查询一台机器 -->
+	<select id="selectMachineById" parameterType="long" resultMap="machineMap">
+		SELECT 
+			<include refid="allMachineField"></include>
+		FROM MACHINE WHERE ID = #{id}
+	</select>
+	
+	<!-- 根据机器码和所属用户 查一台机器id -->
+	<select id="isDevUserPairExist" resultType="Long">
+		SELECT ID
+		FROM MACHINE WHERE  MACHINE_MAC = #{0} AND OWNER = #{1}
+	</select>
+	
+	<!-- 根据机器的ID，查询最近的一个用户ID -->
+	<select id="selectUserIDByDevId" parameterType="String" resultType="Long">
+		SELECT OWNER 
+		FROM MACHINE 
+		WHERE MACHINE_MAC = #{devid} ORDER BY id DESC LIMIT 0, 1
+	</select>
+</mapper>

iamberry-app-international-service/target/classes/com/iamberry/app/mapper/messageMapper.xml

@@ -0,0 +1,209 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MessageMapper">
+	<sql id="messageAllField">
+		ID,TITLE, CONTENT,URL,
+		FORWORD,IS_NEEDSEND,IS_READ,
+		CREATE_DATE,READ_DATE,SEND_TYPE,
+		USER,REMARK,SEND_RESULT
+	</sql>
+	<!--通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
+    <resultMap type="Message" id="messageMap">
+        <id property="id" column="ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="content" column="CONTENT"/>
+        <result property="url" column="URL"/>
+        <result property="forword" column="FORWORD"/>
+        <result property="is_needsend" column="IS_NEEDSEND"/>
+        
+        <result property="is_read" column="IS_READ"/>
+        <result property="create_date" column="CREATE_DATE"/>
+        <result property="read_date" column="READ_DATE"/>
+        <result property="send_type" column="SEND_TYPE"/>
+        <result property="user" column="USER"/>
+        <result property="remark" column="REMARK"/>
+        <result property="send_result" column="SEND_RESULT"/>
+    </resultMap>
+    
+	<sql id="userAttribute">
+		ID,
+		USERNAME,
+		PASSWORD,
+		TOKEN,
+		DISPLAY_NAME,
+		DISPLAY_PICTURE,
+		CREATED_ON,
+		EXT_OPEN_ID,
+		EXT_NAME,
+		EXT_TYPE,
+		LOCATION,
+		BABY_NICKNAME,
+		BABY_DOB,
+		BABY_GENDER,
+		STATUS_ 
+	</sql>
+	
+	<!-- 查询符合条件的用户列表 -->
+	<select id="selectUser" parameterType="PageBean" resultType="User">
+		SELECT 
+			<include refid="userAttribute"></include>
+		FROM USER
+		WHERE 1=1
+	    <if test="params.username!=null and params.username!=''" >
+			AND USERNAME LIKE CONCAT('%',#{params.username},'%')
+	    </if>
+		<if test='recordBegin>0 and pageSize>0'>
+			limit ${recordBegin},${pageSize}
+	    </if>
+	    <if test='recordBegin==0 and pageSize>0 '>
+			limit ${pageSize}
+	    </if> 
+	</select>
+	
+	<!-- 获取用户总条数 -->
+	<select id="selectUserCount" parameterType="SerchParam" resultType="int">
+		SELECT COUNT(ID) FROM USER WHERE 1=1 
+	 	<if test="username!=null and username!=''">
+    		AND USERNAME LIKE CONCAT('%',#{username},'%')
+    	</if>
+	</select>
+	
+	<!-- 获取符合条件所有消息 -->
+	<select id="selectMessageRecoreds" parameterType="PageBean" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM (
+			SELECT ID,TITLE, CONTENT,URL,FORWORD,IS_NEEDSEND,IS_READ,CREATE_DATE,READ_DATE,SEND_TYPE,
+			(SELECT USERNAME FROM USER WHERE ID = a.user) USER,REMARK,SEND_RESULT  FROM MESSAGE a 
+		) a
+    	WHERE 1=1
+    	<if test="params.title!=null and params.title!=''" >
+			AND TITLE LIKE CONCAT('%',#{params.title},'%') 
+    	</if>
+		<if test="params.username!=null and params.username!=''">
+			AND USER LIKE CONCAT('%',#{params.username},'%') 
+		</if>
+		<if test="params.beginDate!= null and  params.beginDate!= ''" >
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') >= DATE_FORMAT(#{params.beginDate},'%Y-%m-%d')]]>
+		</if>
+		<if test="params.endDate!= null and params.endDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') <= DATE_FORMAT(#{params.endDate},'%Y-%m-%d')]]>
+    	</if>
+		ORDER BY CREATE_DATE DESC,USER 
+	    <if test='recordBegin>0 and pageSize>0'>
+			LIMIT ${recordBegin},${pageSize}
+	    </if>
+	    <if test='recordBegin==0 and pageSize>0 '>
+			LIMIT ${pageSize}
+	    </if>
+	</select>
+	
+	<!-- 获取所有消息的总条数 -->
+	<select id="selectMessageCount" parameterType="SerchParam" resultType="int">
+		SELECT COUNT(1) FROM MESSAGE
+		WHERE 1=1
+	    <if test="title!=null and title!=''">
+			AND TITLE LIKE CONCAT('%',#{title},'%') 
+	    </if>
+	    <if test="beginDate!= null and  beginDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') >= DATE_FORMAT(#{beginDate},'%Y-%m-%d')]]>
+	    </if>
+	    <if test="endDate!= null and endDate!= ''">
+			<![CDATA[AND DATE_FORMAT(create_date, '%Y-%m-%d') <= DATE_FORMAT(#{endDate},'%Y-%m-%d')]]>
+	    </if>
+	</select>
+	
+	<!-- 根据id 修改一条消息 -->
+	<update id="updateMessage" parameterType="Message">
+		UPDATE MESSAGE 
+		<set>
+			<if test="title != null and title != ''">
+				TITLE=#{title},
+			</if>
+			<if test="content != null and content != ''">
+				CONTENT=#{content},
+			</if>
+			<if test="url != null and url != ''">
+				URL=#{url},
+			</if>
+			<if test="forword != null and forword != ''">
+				FORWORD=#{forword},
+			</if>
+			<if test="is_needsend != null and is_needsend != ''">
+				IS_NEEDSEND=#{is_needsend},
+			</if>
+			<if test="is_read != null and is_read != ''">
+				IS_READ=#{is_read},
+			</if>
+			<if test="create_date != null and create_date != ''">
+				CREATE_DATE=#{create_date},
+			</if>
+			<if test="read_date != null and read_date != ''">
+				READ_DATE=#{read_date},
+			</if>
+			<if test="send_type != null and send_type != ''">
+				SEND_TYPE=#{send_type},
+			</if>
+			<if test="user != null and user != ''">
+				USER=#{user},
+			</if>
+			<if test="remark != null and remark != ''">
+				REMARK=#{remark},
+			</if>
+			<if test="send_result != null and send_result != ''">
+				SEND_RESULT=#{send_result}
+			</if>
+		</set>
+		WHERE ID=#{id}
+	</update>
+	
+	<!-- 添加一条消息 -->
+	<insert id="insertMessage" parameterType="Message"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MESSAGE
+			(
+				TITLE, CONTENT,URL, FORWORD,IS_NEEDSEND,IS_READ,
+				CREATE_DATE,READ_DATE,SEND_TYPE, USER,REMARK,SEND_RESULT
+			)
+		VALUES
+			(
+				#{title},#{content},#{url},#{forword},#{is_needsend},#{is_read},
+				#{create_date},#{read_date},#{send_type},#{user},
+				#{remark},#{send_result}
+			)
+	</insert>
+	
+	<!-- 获取系统的所有消息 -->
+	<select id="selectSysMessageRecoreds" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM MESSAGE 
+		WHERE USER IS NULL 
+		ORDER BY CREATE_DATE DESC
+	</select>
+	
+	<!-- 根据id获取一条信息  -->
+	<select id="selectUserMessageByid" parameterType="Long" resultMap="messageMap">
+		SELECT 
+			<include refid="messageAllField"></include>
+		FROM MESSAGE WHERE ID = #{id}
+	</select>
+	
+	<!-- 根据用户id获取该用户的所有消息 -->
+	<select id="selectUserMessageRecoreds" parameterType="Long" resultMap="messageMap">
+		SELECT
+			<include refid="messageAllField"></include>
+		FROM MESSAGE WHERE USER=#{userid}  ORDER BY CREATE_DATE DESC
+	</select>
+	
+	<!--  获取某状态的用户消息 -->
+	<select id="selectUserMessageByisread" resultType="int">
+		SELECT COUNT(1)  FROM message where is_read = #{1} and user=#{0}	
+	</select>
+</mapper>

iamberry-app-international-service/target/classes/com/iamberry/app/mapper/milkMapper.xml

@@ -0,0 +1,285 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.MilkMapper">
+
+	<sql id="milkAttribute">
+		id,
+		volume,
+		controller,
+		stars,
+		comments,
+		brand,
+		powder_info,
+		machine_name,
+		machine,
+		user,
+		timestamp_
+	</sql>
+	
+	<sql id="powderAttribute">
+		id,
+		powder_number,
+		spoon_picture,
+		bar_code,
+		brand,
+		series,
+		level,
+		version_,
+		age_range,
+		weight_per_spoon,
+		milk_volume_per_spoon,
+		powder_ratio,
+		density,
+		type,
+		status_,
+		created_on
+	</sql>
+	
+	<resultMap type="MilkMakingRecord" id="milkMap">
+		<id property="id" column="id"/>
+		<result property="volume" column="volume"/>
+		<result property="controller" column="controller"/>
+		<result property="stars" column="stars"/>
+		<result property="comments" column="comments"/>
+		<result property="brand" column="brand"/>
+		<result property="powder_info" column="powder_info"/>
+		<result property="machine_name" column="machine_name"/>
+		<result property="machine" column="machine"/>
+		<result property="user" column="user"/>
+		<result property="timestamp_" column="timestamp_"/>
+	</resultMap>
+	
+	<resultMap type="MilkPowderInfo" id="powderMap">
+		<id property="id" column="id"/>
+		<result property="powder_number" column="powder_number"/>
+		<result property="spoon_picture" column="spoon_picture"/>
+		<result property="bar_code" column="bar_code"/>
+		<result property="brand" column="brand"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="version_" column="version_"/>
+		<result property="age_range" column="age_range"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+		<result property="milk_volume_per_spoon" column="milk_volume_per_spoon"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="density" column="density"/>
+		<result property="type" column="type"/>
+		<result property="status_" column="status_"/>
+		<result property="created_on" column="created_on"/>
+	</resultMap>
+	
+	<resultMap type="com.iamberry.app.core.dto.MilkInfoDTO" id="milkInfoDtoMap">
+		<id property="id" column="id"/>
+		<result property="series" column="series"/>
+		<result property="level" column="level"/>
+		<result property="type" column="type"/>
+		<result property="powder_ratio" column="powder_ratio"/>
+		<result property="weight_per_spoon" column="weight_per_spoon"/>
+	</resultMap>
+	
+	<!-- 添加信息到milk_making_record表中 -->
+	<insert id="insertMilkMakingRecord" parameterType="MilkMakingRecord" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_MAKING_RECORD
+		(VOLUME,CONTROLLER,STARS,COMMENTS,BRAND,POWDER_INFO,MACHINE_NAME,MACHINE,USER,TIMESTAMP_) 
+		VALUES
+		(#{volume},#{controller},#{stars},#{comments},#{brand},#{powder_info},#{machine_name},#{machine},#{user},NOW())
+	</insert>
+	
+	<!-- 根据id修改MILK_MAKING_RECORD的start和comments属性 -->
+	<update id="updateMilkMakingRecord">
+		UPDATE MILK_MAKING_RECORD SET STARS = #{0}, COMMENTS = #{1} WHERE ID = #{2}
+	</update>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			user = #{5} 
+		AND 
+			machine = #{6} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 查询冲奶机冲奶时间和冲奶量 -->
+	<select id="selectMachineMilkMakingRecords" resultType="java.util.HashMap">
+		SELECT 
+			DATE_FORMAT(timestamp_, #{4}) AS #{3}, 
+			SUM(volume) AS volume 
+		FROM 
+			milk_making_record 
+		WHERE 
+			<![CDATA[timestamp_ >= #{0}]]> 
+		AND 
+			<![CDATA[timestamp_ <= #{1}]]> 
+		AND 
+			controller = #{2} 
+		AND 
+			machine = #{5} 
+		GROUP BY #{3}
+	</select>
+	
+	<!-- 根据id查询MILK_MAKING_RECORD所有信息 -->
+	<select id="selectMilkMakingRecord" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据user查询所有冲奶信息 -->
+	<select id="getMilkPowderByUser" parameterType="java.lang.Long" resultMap="milkMap">
+		SELECT <include refid="milkAttribute" /> FROM MILK_MAKING_RECORD WHERE USER = #{0}
+	</select>
+	
+	<!-- 根据user查询总冲奶量和次数 -->
+	<select id="getMilkPowderSumByUser" parameterType="java.lang.Long" resultType="com.iamberry.app.core.dto.RecordCountInfoDTO">
+		SELECT COUNT(1) count,SUM(VOLUME) total FROM MILK_MAKING_RECORD WHERE USER = #{0} 
+	</select>
+	
+	<!-- 将奶粉信息插入到奶粉信息表中 -->
+	<insert id="insertMilkPowderInfo" parameterType="MilkPowderInfo" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO MILK_POWDER_INFO
+			(POWDER_NUMBER,SPOON_PICTURE,BAR_CODE,BRAND,SERIES,LEVEL,VERSION_,AGE_RANGE,
+			WEIGHT_PER_SPOON,MILK_VOLUME_PER_SPOON,POWDER_RATIO,DENSITY,TYPE,STATUS_,CREATED_ON) 
+		VALUES
+			(#{powder_number},#{spoon_picture},#{bar_code},#{brand},#{series},#{level},#{version_},#{age_range},#{weight_per_spoon},
+			#{milk_volume_per_spoon},#{powder_ratio},#{density},#{type},#{status_},NOW())
+	</insert>
+	
+	<!-- 通过条形码查询奶粉信息 -->
+	<select id="selectMilkPowderInfo" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} AND UPPER(STATUS_) = 'APPROVED' 
+	</select>
+	
+	<!-- 根据品牌查询奶粉信息的系列 -->
+	<select id="selectSeries" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT 
+			series 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{brand} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息的段数 -->
+	<select id="selectLevel" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT level FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC 
+	</select>
+	
+	<!-- 根据奶粉品牌获取奶粉，详细信息 -->
+	<select id="selectMilkInfoBybrand" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			series,
+			level,
+			type,
+			id,
+			powder_ratio,
+			weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			BRAND LIKE #{0} 
+		AND 
+			UPPER(STATUS_) = 'APPROVED' 
+		ORDER BY CONVERT(SERIES USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉信息 -->
+	<select id="selectMilkInfo" parameterType="java.lang.String" resultMap="milkInfoDtoMap">
+		SELECT 
+			level,type,id,powder_ratio,weight_per_spoon 
+		FROM 
+			MILK_POWDER_INFO 
+		WHERE 
+			SERIES LIKE #{0} 
+		ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉类型 -->
+	<select id="selectMilkType" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT type FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据奶粉系列查询奶粉密度 -->
+	<select id="selectMilkDensity" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT density FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉比例 -->
+	<select id="selectMilkRatio" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT powder_ratio FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉id -->
+	<select id="selectMilkId" parameterType="java.lang.String" resultType="java.lang.Long">
+		SELECT id FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 根据系列查询奶粉的重量 -->
+	<select id="selectMilkWeightPerSpoon" parameterType="java.lang.String" resultType="java.lang.String">
+		SELECT weight_per_spoon FROM MILK_POWDER_INFO WHERE SERIES LIKE #{0} ORDER BY CONVERT(LEVEL USING GBK) ASC
+	</select>
+	
+	<!-- 查询奶粉品牌 -->
+	<select id="selectMilkPowderBrand" resultType="java.lang.String">
+		SELECT brand FROM MILK_POWDER_INFO WHERE STATUS_ = 'approved' GROUP BY BRAND
+	</select>
+	
+	<!-- 根据系列段数品牌获取奶粉信息 -->
+	<select id="selectMilkInfoByBrandSeriesLevel" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BRAND = #{0} AND SERIES = #{1} AND LEVEL = #{2} 
+	</select>
+	
+	<!-- 查询冲奶记录的冲奶时间 -->
+	<select id="selectLastRecordDate" resultType="java.util.Date">
+		SELECT timestamp_ FROM MILK_MAKING_RECORD WHERE CONTROLLER = 'machine' ORDER BY ID DESC LIMIT 1 
+	</select>
+	
+	<!-- 根据用户id查询冲奶机机器码 -->
+	<select id="getMyMachines" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT machine_mac FROM MACHINE WHERE OWNER = #{0}
+	</select>
+	
+	<!-- 将信息插入到冲奶记录表中 -->
+	<insert id="insertRecordData" parameterType="MilkMakingRecord">
+		INSERT INTO milk_making_record (volume, controller, machine, timestamp_, user) VALUE (#{volume}, 'machine', #{machine}, #{timestamp_}, #{user})
+	</insert>
+	
+	<!-- milk_images表中添加数据 -->
+	<insert id="insertMilkImages" parameterType="MilkImages" useGeneratedKeys="true" keyProperty="image_id">
+		INSERT INTO MILK_IMAGES
+		(
+			IMAGE_MILK_ID,IMAGE_FRONT,IMAGE_BAR,IMAGE_FEED
+		) 
+		VALUES 
+		(
+			#{image_Milk_ID},#{image_Front},#{image_Bar},#{image_Feed}
+		)
+	</insert>
+	
+	<!-- 通过bar_code查询奶粉信息 -->
+	<select id="selectMilkPowderByBar" parameterType="java.lang.String" resultMap="powderMap">
+		SELECT <include refid="powderAttribute" /> FROM MILK_POWDER_INFO WHERE BAR_CODE = #{0} 
+	</select>
+	
+	<!-- 根据设备id查询最新一条冲奶记录 -->
+	<select id="selectMakingRecordAndmachine" parameterType="String" resultType="java.util.Date">
+		SELECT timestamp_ from milk_making_record where machine = #{machine} order by timestamp_ desc LIMIT 1
+	</select>
+</mapper>

iamberry-app-international-service/target/classes/com/iamberry/app/mapper/userMapper.xml

@@ -0,0 +1,181 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.app.mapper.UserMapper">
+
+	<sql id="userAttribute">
+		id,
+		username,
+		password,
+		token,
+		display_name,
+		display_picture,
+		created_on,
+		ext_open_id,
+		ext_name,
+		ext_type,
+		location,
+		baby_nickname,
+		baby_dob,
+		baby_gender,
+		status_,
+		country_code,
+		is_perfect_user
+	</sql>
+	
+	<resultMap type="User" id="userMap">
+		<id property="id" column="id"/>
+		<result property="username" column="username"/>
+		<result property="password" column="password"/>
+		<result property="token" column="token"/>
+		<result property="display_name" column="display_name"/>
+		<result property="display_picture" column="display_picture"/>
+		<result property="created_on" column="created_on"/>
+		<result property="ext_open_id" column="ext_open_id"/>
+		<result property="ext_name" column="ext_name"/>
+		<result property="ext_type" column="ext_type"/>
+		<result property="location" column="location"/>
+		<result property="baby_nickname" column="baby_nickname"/>
+		<result property="baby_dob" column="baby_dob"/>
+		<result property="baby_gender" column="baby_gender"/>
+		<result property="status_" column="status_"/>
+		<result property="is_perfect_user" column="is_perfect_user"/>
+		<result property="country_code" column="country_code"/>
+	</resultMap>
+	
+	<!-- 根据id查询user所有信息 -->
+	<select id="selectUserById"  parameterType="java.lang.Long" resultMap="userMap">
+		SELECT 
+			<include refid="userAttribute" />
+		FROM USER WHERE ID = #{0}
+	</select>
+	
+	<!-- 根据username查询user所有信息 -->
+	<select id="selectUserByUsername" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute" /> FROM USER WHERE USERNAME = #{0}
+	</select>
+	
+	<!-- 通过ext_open_id查询user所有信息 -->
+	<select id="selectUserByExtOpenId" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute" /> FROM USER WHERE EXT_OPEN_ID = #{0}
+	</select>
+	
+	<!-- 添加用户信息到user表中 -->
+	<insert id="insertUser" parameterType="User" useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO USER 
+		(USERNAME,PASSWORD,TOKEN,DISPLAY_NAME,DISPLAY_PICTURE,CREATED_ON,EXT_OPEN_ID,EXT_NAME,EXT_TYPE,
+		LOCATION,BABY_NICKNAME,BABY_DOB,BABY_GENDER,STATUS_,country_code,is_perfect_user) 
+		VALUES 
+		(#{username},#{password},#{token},#{display_name},#{display_picture},NOW(),#{ext_open_id},#{ext_name},#{ext_type},
+		#{location},#{baby_nickname},#{baby_dob},#{baby_gender},#{status_},#{country_code},#{is_perfect_user})
+	</insert>
+	
+	<!-- 根据id修改user表数据 -->
+	<update id="updateUser" parameterType="User">
+		UPDATE USER 
+		<set>
+			<if test="username != null and username != ''">
+				USERNAME = #{username}, 
+			</if>
+			<if test="password != null and password != ''">
+				PASSWORD = #{password}, 
+			</if>
+			<if test="token != null and token != ''">
+				TOKEN = #{token}, 
+			</if>
+			<if test="display_name != null and display_name != ''">
+				DISPLAY_NAME = #{display_name}, 
+			</if>
+			<if test="display_picture != null and display_picture != ''">
+				DISPLAY_PICTURE = #{display_picture}, 
+			</if>
+			<if test="ext_open_id != null and ext_open_id != ''">
+				EXT_OPEN_ID = #{ext_open_id}, 
+			</if>
+			<if test="ext_name != null and ext_name != ''">
+				EXT_NAME = #{ext_name}, 
+			</if>
+			<if test="ext_type != null and ext_type != ''">
+				EXT_TYPE = #{ext_type}, 
+			</if>
+			<if test="location != null and location != ''">
+				LOCATION = #{location}, 
+			</if>
+			<if test="baby_nickname != null and baby_nickname != ''">
+				BABY_NICKNAME = #{baby_nickname}, 
+			</if>
+			<if test="baby_dob != null and baby_dob != ''">
+				BABY_DOB = #{baby_dob}, 
+			</if>
+			<if test="baby_gender != null and baby_gender != ''">
+				BABY_GENDER = #{baby_gender}, 
+			</if>
+			<if test="status_ != null and status_ != ''">
+				STATUS_ = #{status_} 
+			</if>
+		</set>
+		WHERE 
+			ID = #{id} 
+	</update>
+	
+	<!-- 根据id修改user表的个人头像 -->
+	<update id="updateDisplayPicture">
+		UPDATE USER SET DISPLAY_PICTURE = #{0} WHERE ID = #{1} 
+	</update>
+	
+	<!-- 根据用户名和密码查询用户表信息 -->
+	<select id="validateUser" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute"/> FROM USER WHERE USERNAME=#{0} AND PASSWORD=#{1} 
+	</select>
+	
+	<!-- 通过id修改用户表密码 -->
+	<update id="changePassword">
+		UPDATE USER SET PASSWORD=#{1} WHERE ID=#{0}
+	</update>
+	
+	<!-- 通过token查询user表所有信息 -->
+	<select id="selectUserByToken" parameterType="java.lang.String" resultMap="userMap">
+		SELECT <include refid="userAttribute"/> FROM USER WHERE TOKEN=#{0} 
+	</select>
+	
+	<!-- 根据id修改token值 -->
+	<update id="updateUserToken">
+		UPDATE USER SET TOKEN=#{0} WHERE ID=#{1}
+	</update>
+	
+	<!-- 根据id修改user表的用户名 修改IS_PERFECT_USER字段未已完善状态-->
+	<update id="updateUserName">
+	
+		UPDATE USER SET USERNAME=#{0},IS_PERFECT_USER=2 WHERE ID=#{1}                  
+	</update>
+	
+	<!-- 根据id修改user表的用户名和国家代码 -->
+	<update id="updateUserNameAndCountry">
+		UPDATE USER SET USERNAME=#{0},country_code=#{1},IS_PERFECT_USER=2 WHERE ID=#{2}                  
+	</update>
+	
+	<!-- 通过key_查询sys_config表数据 -->
+	<select id="selectConfig" parameterType="java.lang.String" resultType="String">
+		SELECT VALUE_ FROM SYS_CONFIG WHERE KEY_ = #{0}
+	</select>
+	
+	<!-- USER_AVATOR表中添加数据 -->
+	<insert id="insertUserAvator">
+		INSERT INTO USER_AVATOR (USER_ID, AVATOR) VALUE (#{0}, #{1})
+	</insert>
+	
+	<!-- 通过user_id修改USER_AVATOR表数据 -->
+	<update id="updateUserAvator">
+		UPDATE USER_AVATOR SET AVATOR = #{1} WHERE USER_ID = #{0}
+	</update>
+	
+	<!-- 根据user_id查询USER_AVATOR表数据 -->
+	<select id="selectUserAvator" parameterType="java.lang.Long" resultType="java.lang.String">
+		SELECT avator FROM USER_AVATOR WHERE USER_ID = #{id}
+	</select>
+</mapper>

iamberry-app-international-service/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Aug 16 19:54:50 CST 2017
+version=1.0.0
+groupId=com.iamberry
+artifactId=iamberry-app-international-service

iamberry-app-international-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,15 @@
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\CodeServiceImpl.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\UserServiceImpl.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\mapper\MachineMapper.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\MessageServiceImpl.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\LogServiceImpl.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\sqlprovider\DMLProvider.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\mapper\CodeMapper.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\mapper\MilkMapper.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\MilkServiceImpl.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\mapper\MessageMapper.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\ulitity\Utility.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\mapper\LogMapper.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\MachineServiceImpl.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\service\BaseService.java
+E:\xiangmu\iamberry-app-international-service\src\main\java\com\iamberry\app\mapper\UserMapper.java