upd

com.sharemao.web.appserver/src/main/java/com/sharemao/app/ctrl/AppUserCtrl.java

@@ -379,6 +379,20 @@ public class AppUserCtrl {
 		return new JsonView(result, msg, code);
 	}
 
+	@Path("/updphone.do")
+	public JsonView updphone(Context context) {
+		String lastAccessUrl = context.getRequest().getRequestURL() + "?" + context.getRequest().getQueryString();
+		logger.info("请求地址：>>{" + lastAccessUrl + "}");
+		Map<String, String> para = context.getParas();
+		// 获取返回结果
+		Map<String, Object> result = service.updphone(para);
+		String msg = result.get("msg").toString();
+		int code = Integer.parseInt(String.valueOf(result.get("code")));
+		result.remove("msg");
+		result.remove("code");
+		return new JsonView(result, msg, code);
+	}
+
 	/**
 	 * 微信用户注销接口
 	 * @param context

com.sharemao.web.appserver/src/main/java/com/sharemao/app/ctrl/PackageCtrl.java

@@ -328,5 +328,47 @@ public class PackageCtrl {
 		result.remove("code");
 		return new JsonView(result, msg, code);
 	}
-	
-}
+
+    @Path(value = "/getCurUst.do")
+	public JsonView getCurUst(Context context) {
+		String lastAccessUrl = context.getRequest().getRequestURL() + "?" + context.getRequest().getQueryString();
+		log.info("请求地址：>>{" + lastAccessUrl + "}");
+		Map<String, String> para = context.getParas();
+		Map<String, Object> result = packService.getCurUst(para);
+		log.info("result>>>>>>>>" + result);
+		String msg = result.get("msg").toString();
+		int code = Integer.parseInt(String.valueOf(result.get("code")));
+		result.remove("msg");
+		result.remove("code");
+		return new JsonView(result, msg, code);
+	}
+
+    @Path(value = "/getMyUst.do")
+	public JsonView getMyUst(Context context) {
+		String lastAccessUrl = context.getRequest().getRequestURL() + "?" + context.getRequest().getQueryString();
+		log.info("请求地址：>>{" + lastAccessUrl + "}");
+		Map<String, String> para = context.getParas();
+		Map<String, Object> result = packService.getMyUst(para);
+		log.info("result>>>>>>>>" + result);
+		String msg = result.get("msg").toString();
+		int code = Integer.parseInt(String.valueOf(result.get("code")));
+		result.remove("msg");
+		result.remove("code");
+		return new JsonView(result, msg, code);
+	}
+
+    @Path(value = "/getPkgsByDevId3.do")
+    public JsonView getPkgsByDevId3(Context context) {
+        String lastAccessUrl = context.getRequest().getRequestURL() + "?" + context.getRequest().getQueryString();
+        log.info("请求地址：>>{" + lastAccessUrl + "}");
+        Map<String, String> para = context.getParas();
+        // 获取返回结果
+        Map<String, Object> result = packService.getPkgsByDevid3(para);
+        String msg = result.get("msg").toString();
+        int code = Integer.parseInt(String.valueOf(result.get("code")));
+        result.remove("msg");
+        result.remove("code");
+        return new JsonView(result, msg, code);
+    }
+
+    }

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/AppUserService.java

@@ -142,6 +142,8 @@ public interface AppUserService {
 	
 	public Map<String, Object> wxRegister2(Map<String, String> para);
 
+	public Map<String, Object> updphone(Map<String, String> para);
+
 	/**
 	 * 微信公众号注销登陆
 	 * @param para

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/PackageService.java

@@ -90,4 +90,10 @@ public interface PackageService {
 	public Map<String, Object> getPkgByPkid(Map<String, String> para);
 
     public Map<String, Object> hasPkg(Map<String, String> para);
+
+    public Map<String, Object> getCurUst(Map<String, String> para);
+
+    public Map<String, Object> getMyUst(Map<String, String> para);
+
+    public Map<String, Object> getPkgsByDevid3(Map<String, String> para);
 }

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/AppUserServiceImpl.java

@@ -1284,6 +1284,69 @@ public class AppUserServiceImpl extends AppBaseService implements AppUserService
 		return record;
 	}
 
+	public Map<String, Object> updphone(Map<String, String> para)
+	{
+		Map<String,Object> record = new HashMap<String, Object>();
+		record.put("msg", "fail");
+		int signRes = ProjectTools.devM3Sign(para);		//认证
+		record.put("code", signRes);					//将认证结果写入record
+
+		if(signRes==0)
+		{
+			String	code = para.get("code");	//验证码
+			String phone = para.get("phone");	//用户登录名（手机号）
+			String id = para.get("id");
+			String orgid=para.get("oid");
+			String devid=para.get("devid");
+
+			logger.info("code="+code+",phone="+phone+",id="+id+",devid="+devid);
+
+			if(ProjectTools.isEmpty(phone) || ProjectTools.isEmpty(devid)  || ProjectTools.isEmpty(id))
+			{
+				record.put("msg", "缺少参数");
+				record.put("code", 4);
+				return record;
+			}
+
+			//如果是znz不需要短信验证
+			if( !code.equals("znz"))
+			{
+				if(!ProjectConstants.smsCodeMap.containsKey(phone))
+				{
+					//没有获取到验证码，返回验证码错误信息5
+					record.put("code", 5);
+					record.put("msg", "验证码错误!");
+					return record;
+				}
+				String code2 = ProjectConstants.smsCodeMap.get(phone).getRadCode();
+				long time = ProjectConstants.smsCodeMap.get(phone).getCrtTm();
+				long nowTime = System.currentTimeMillis() - ProjectConstants.overTime;	//计算两分钟以前的时间，判断验证码是否超时
+				if(!code.equals(code2))
+				{
+					//判断验证码是否正确，错误返回5
+					record.put("code", 5);
+					record.put("msg", "验证码错误!");
+					return record;
+				}
+				if(time<nowTime)
+				{
+					//验证码超时，返回6
+					record.put("code", 6);
+					record.put("msg", "验证码超时，请重新获取!");
+					ProjectConstants.smsCodeMap.remove(phone);
+					return record;
+				}
+			}
+
+            String defSql = "UPDATE appuser SET phonenum = '"+phone+"' WHERE id = '"+id+"'";
+            baseDao.excuSql(defSql);
+
+			record.put("msg", "OK");
+			ProjectConstants.smsCodeMap.remove(phone);
+		}
+		return record;
+	}
+
 	@Override
 	public Map<String, Object> wxLogout(Map<String, String> para) 
 	{

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/PackageServiceImpl.java

@@ -1,8 +1,11 @@
 package com.sharemao.app.service.impl;
 
+import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -1744,4 +1747,237 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
         return record;
     }
 
+    @Override
+    public Map<String, Object> getCurUst(Map<String, String> para)
+    {
+        Map<String, Object> record = new HashMap<String, Object>();
+        record.put("msg", "fail");
+        int signRes = ProjectTools.devM3Sign(para);	// 签名
+        record.put("code", signRes);
+//		if (signRes != 0)
+//			return record;
+
+        String devid = para.get("devid");
+        if (Tools.isEmpty(devid)) {
+            record.put("code", 4);
+            record.put("msg", "请求错误");	//缺少参数
+            return record;
+        }
+
+        String uusql = "SELECT ust.remain,pkvalue,ust.invalid,packid"
+                + "	 FROM usersuit ust "
+                + "	WHERE ust.packid>1 and ust.devid = '"+devid+"' AND ust.invalid>"+DateTimeUtil.longtime()
+                +" AND ust.effect<"+DateTimeUtil.longtime()
+                + " ORDER BY ust.crttm desc ";
+        logger.info(uusql);
+        List<Map<String, Object>> pkgLst = baseDao.getMapList(uusql);
+        record.put("total", "0G");
+        record.put("usevalue", "0G");
+        record.put("remainvalue", "0G");
+        record.put("day", 0);
+        if (pkgLst!=null && !pkgLst.isEmpty()) {
+            try {
+                Map<String, Object> map = pkgLst.get(0);
+                String invalid = String.valueOf(map.get("invalid"));
+                String remain = String.valueOf(map.get("remain"));
+                String pkvalue = String.valueOf(map.get("pkvalue"));
+                String packid = String.valueOf(map.get("packid"));
+                if (Tools.isEmpty(pkvalue)) {
+                    String psql="select from package where id="+packid;
+                    List<Map<String, Object>> pkgLst2 = baseDao.getMapList(psql);
+                    pkvalue=String.valueOf(pkgLst2.get(0).get("pkvalue"));
+                }
+                long total = (long) (Double.parseDouble(pkvalue) / 1024);
+                long remainvalue = (long) (Double.parseDouble(remain) / 1024);
+                if (remainvalue<=0){
+                    record.put("show", "buyPkg");
+                }
+                long usevalue = total-remainvalue;
+                record.put("total", total +"G");
+                record.put("usevalue", usevalue +"G");
+                record.put("remainvalue", remainvalue +"G");
+                LocalDate now = LocalDate.now();
+                LocalDate invalidDate = LocalDate.parse(invalid, DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+                long day = ChronoUnit.DAYS.between(now, invalidDate);
+                record.put("day", day);
+            } catch (NumberFormatException e) {
+                Tools.getExceptionMessage(e);
+            }
+        } else {
+            record.put("show", "buyPkg");
+        }
+
+        record.put("msg", "OK");
+        return record;
+    }
+
+    @Override
+    public Map<String, Object> getMyUst(Map<String, String> para)
+    {
+        Map<String, Object> record = new HashMap<String, Object>();
+        record.put("msg", "fail");
+        int signRes = ProjectTools.devM3Sign(para);	// 签名
+        record.put("code", signRes);
+//		if (signRes != 0)
+//			return record;
+
+        String devid = para.get("devid");
+        if (Tools.isEmpty(devid)) {
+            record.put("code", 4);
+            record.put("msg", "请求错误");	//缺少参数
+            return record;
+        }
+
+        String uusql = "SELECT ust.effect,ust.invalid,pkg.pkname"
+                + "	 FROM usersuit ust left join packageview pkg on ust.packid=pkg.pkid"
+                + "	WHERE ust.packid>1 and ust.devid = '"+devid+"'"
+                + " ORDER BY ust.invalid  ";
+        logger.info(uusql);
+        List<Map<String, Object>> pkgLst = baseDao.getMapList(uusql);
+        if (pkgLst==null){
+            pkgLst= new ArrayList<Map<String, Object>>();
+        }
+        for (Map<String, Object> map : pkgLst) {
+            map.put("effectDate", ProjectTools.timeInt2Date(String.valueOf(map.get("effect"))));
+            map.put("invalidDate", ProjectTools.timeInt2Date(String.valueOf(map.get("invalid"))));
+        }
+        record.put("msg", "OK");
+        record.put("pkgs", pkgLst);
+        return record;
+    }
+
+    @Override
+    public Map<String, Object> getPkgsByDevid3(Map<String, String> para) {
+
+        Map<String, Object> record = new HashMap<String, Object>();
+        record.put("msg", "fail");
+        int signRes = ProjectTools.devM3Sign(para); 	// 认证
+        record.put("code", signRes); 	// 写入认证返回值
+//		if (signRes > 0)
+//			result.add(record);
+//		else
+        {
+            String areaid = para.get("areaid");
+            String orgid = para.get("oid");
+            String devid = para.get("devid");
+            if(Tools.isEmpty(devid) || "null".equals(devid))
+            {
+                record.put("code", 9);
+                record.put("msg", "设备编号不能为空");
+                return record;
+            }
+//			String devgrpid=getDevGrpId(devid);
+
+            if(Tools.isEmpty(areaid))
+                areaid="100000";
+
+//            int packType=getPKTypeByDevid(devid,devgrpid);
+            int packType=getDevTypeId(devid);
+
+            String sql =  "SELECT pkv.pkid AS id,pkg.pkgValue, pkv.pkname AS pkgName, pkv.pkgDesc, pkv.price,pkv.reorder,pkg.`invalidtime` AS expiryDay,pkg.img,pkv.protext,pkv.title,pkv.color,pkv.paytype "
+                    + "	FROM packageview pkv LEFT JOIN package pkg ON pkv.`pkid` = pkg.`id` WHERE pktype=16 AND pkv.issale=1 AND pkv.orgid= "+ orgid;
+
+            sql += " ORDER BY pkv.reorder ASC";
+            logger.info(sql);
+            List<Map<String, Object>> pkgLst = baseDao.getMapList(sql);
+            for (Map<String, Object> map : pkgLst) {
+                DecimalFormat df = new DecimalFormat("#.##");
+                map.put("price", df.format(Double.parseDouble(String.valueOf(map.get("price")))/1000));
+                map.put("ts", CodecUtil.str2md5("zengnz"+map.get("price").toString()));
+                String expiryDay = String.valueOf(map.get("expiryDay"));
+                String expiryDayStr = "";
+                String invalidDay = "";
+                Date nowDate = new Date();
+                switch (expiryDay) {
+                    case "0":
+                        expiryDayStr= "1 天";
+                        nowDate = DateTimeUtil.addDay(nowDate, 1);
+                        break;
+                    case "1":
+                        expiryDayStr= "30 天";
+                        nowDate = ProjectTools.addMonth(nowDate, 1);
+                        break;
+                    case "2":
+                        expiryDayStr= "90 天";
+                        nowDate = ProjectTools.addMonth(nowDate, 3);
+                        break;
+                    case "3":
+                        expiryDayStr= "半年";
+                        nowDate = ProjectTools.addMonth(nowDate, 6);
+                        break;
+                    case "4":
+                        expiryDayStr= "1 年";
+                        nowDate = ProjectTools.addMonth(nowDate, 12);
+                        break;
+                    case "5":
+                        expiryDayStr= "两年";
+                        nowDate = ProjectTools.addMonth(nowDate, 24);
+                        break;
+                    case "6":
+                        expiryDayStr= "7 天";
+                        nowDate = DateTimeUtil.addDay(nowDate, 7);
+                        break;
+                    case "7":
+                        expiryDayStr= "3 年";
+                        nowDate = ProjectTools.addMonth(nowDate, 36);
+                        break;
+                    case "8":
+                        expiryDayStr= "3 天";
+                        nowDate = DateTimeUtil.addDay(nowDate, 3);
+                        break;
+                    case "9":
+                        expiryDayStr= "两天";
+                        nowDate = DateTimeUtil.addDay(nowDate, 2);
+                        break;
+                    case "11":
+                        expiryDayStr= "7 个月";
+                        nowDate = ProjectTools.addMonth(nowDate, 7);
+                        break;
+                    case "12":
+                        expiryDayStr= "14 个月";
+                        nowDate = ProjectTools.addMonth(nowDate, 14);
+                        break;
+                    case "18":
+                        expiryDayStr= "15 个月";
+                        nowDate = ProjectTools.addMonth(nowDate, 15);
+                        break;
+                    case "19":
+                        expiryDayStr= "18 个月";
+                        nowDate = ProjectTools.addMonth(nowDate, 18);
+                        break;
+                    case "13":
+                        expiryDayStr= "两年半";
+                        nowDate = ProjectTools.addMonth(nowDate, 28);
+                        break;
+                    case "14":
+                        expiryDayStr= "3 年 8 个月";
+                        nowDate = ProjectTools.addMonth(nowDate, 44);
+                        break;
+                    case "15":
+                        expiryDayStr= "4 年";
+                        nowDate = ProjectTools.addMonth(nowDate, 48);
+                        break;
+                    case "16":
+                        expiryDayStr= "5 年";
+                        nowDate = ProjectTools.addMonth(nowDate, 60);
+                        break;
+                    case "17":
+                        expiryDayStr= "6 年";
+                        nowDate = ProjectTools.addMonth(nowDate, 72);
+                        break;
+                }
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                invalidDay = sdf.format(nowDate);
+                map.put("expiryDay", expiryDayStr);
+                map.put("invalidDay", invalidDay);
+                String pkvalStr=String.valueOf(df.format(Double.parseDouble(String.valueOf(map.get("pkgValue")))/1024));
+                map.put("pkgValue", pkvalStr);
+            }
+
+            record.put("msg", "OK");
+            record.put("list", pkgLst);
+
+        }
+        return record;
+    }
 }