新增WIFI&BLE牙刷【6区带压力时长】类型设备

ailink-receiver/src/main/java/com/inet/ailink/receiver/controller/DataBrush.java

@@ -42,6 +42,20 @@ public class DataBrush extends BaseEntity {
 	private Integer uri;
 	private Integer dri;
 
+	private Integer uce;
+	private Integer dce;
+	private Integer ure;
+	private Integer dre;
+	private Integer ule;
+	private Integer dle;
+
+	private Integer ucs;
+	private Integer dcs;
+	private Integer urs;
+	private Integer drs;
+	private Integer uls;
+	private Integer dls;
+
 
 
 	public String getBrushModel() {
@@ -294,4 +308,100 @@ public class DataBrush extends BaseEntity {
 	public void setDri(Integer dri) {
 		this.dri = dri;
 	}
+
+	public Integer getUce() {
+		return uce;
+	}
+
+	public void setUce(Integer uce) {
+		this.uce = uce;
+	}
+
+	public Integer getDce() {
+		return dce;
+	}
+
+	public void setDce(Integer dce) {
+		this.dce = dce;
+	}
+
+	public Integer getUre() {
+		return ure;
+	}
+
+	public void setUre(Integer ure) {
+		this.ure = ure;
+	}
+
+	public Integer getDre() {
+		return dre;
+	}
+
+	public void setDre(Integer dre) {
+		this.dre = dre;
+	}
+
+	public Integer getUle() {
+		return ule;
+	}
+
+	public void setUle(Integer ule) {
+		this.ule = ule;
+	}
+
+	public Integer getDle() {
+		return dle;
+	}
+
+	public void setDle(Integer dle) {
+		this.dle = dle;
+	}
+
+	public Integer getUcs() {
+		return ucs;
+	}
+
+	public void setUcs(Integer ucs) {
+		this.ucs = ucs;
+	}
+
+	public Integer getDcs() {
+		return dcs;
+	}
+
+	public void setDcs(Integer dcs) {
+		this.dcs = dcs;
+	}
+
+	public Integer getUrs() {
+		return urs;
+	}
+
+	public void setUrs(Integer urs) {
+		this.urs = urs;
+	}
+
+	public Integer getDrs() {
+		return drs;
+	}
+
+	public void setDrs(Integer drs) {
+		this.drs = drs;
+	}
+
+	public Integer getUls() {
+		return uls;
+	}
+
+	public void setUls(Integer uls) {
+		this.uls = uls;
+	}
+
+	public Integer getDls() {
+		return dls;
+	}
+
+	public void setDls(Integer dls) {
+		this.dls = dls;
+	}
 }

ailink-receiver/src/main/java/com/inet/ailink/receiver/service/impl/DataBrushServiceImpl.java

@@ -161,6 +161,34 @@ public class DataBrushServiceImpl extends  BaseServiceImpl<IDataBrushDao, DataBr
 				dataBrushList.add(dataBrush);
 				continue;
 			}
+			//6区带压力时长数据刷牙结果
+			if(tlv.getTag() == 3){
+				dataBrush.setBrushZone(6);
+				dataBrush.setUploadTime(String.valueOf(Base64TeaUitls.getLowConactHighEndForLong(0, 3, tlv.getValue())));
+				dataBrush.setBrushModel(Base64TeaUitls.getLowConactHighEndForLong(4, 4, tlv.getValue())+"");
+				dataBrush.setBrushTimeDefault(Base64TeaUitls.getLowConactHighEndForLong(5, 6, tlv.getValue())+"");
+				dataBrush.setBrushTime(Base64TeaUitls.getLowConactHighEndForLong(7, 8, tlv.getValue())+"");
+				dataBrush.setUc(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(9, 10, tlv.getValue())+""));
+				dataBrush.setUce(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(11, 12, tlv.getValue())+""));
+				dataBrush.setUcs(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(13, 14, tlv.getValue())+""));
+				dataBrush.setDc(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(15, 16, tlv.getValue())+""));
+				dataBrush.setDce(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(17, 18, tlv.getValue())+""));
+				dataBrush.setDcs(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(19, 20, tlv.getValue())+""));
+				dataBrush.setUr(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(21, 22, tlv.getValue())+""));
+				dataBrush.setUre(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(23, 24, tlv.getValue())+""));
+				dataBrush.setUrs(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(25, 26, tlv.getValue())+""));
+				dataBrush.setDr(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(27, 28, tlv.getValue())+""));
+				dataBrush.setDre(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(29, 30, tlv.getValue())+""));
+				dataBrush.setDrs(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(31, 32, tlv.getValue())+""));
+				dataBrush.setUl(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(33, 34, tlv.getValue())+""));
+				dataBrush.setUle(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(35, 36, tlv.getValue())+""));
+				dataBrush.setUls(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(37, 38, tlv.getValue())+""));
+				dataBrush.setDl(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(39, 40, tlv.getValue())+""));
+				dataBrush.setDle(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(41, 42, tlv.getValue())+""));
+				dataBrush.setDls(Integer.parseInt(Base64TeaUitls.getLowConactHighEndForLong(43, 44, tlv.getValue())+""));
+				dataBrush.setLastBattery(Base64TeaUitls.getLowConactHighEndForLong(45, 45, tlv.getValue())+"");
+				dataBrushList.add(dataBrush);
+			}
 		}
 		return dataBrushList;
 	}