活动抽奖，增加经纬度和具体地点记录

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnaireUsers.java

@@ -33,6 +33,12 @@ public class QuestionnaireUsers extends IdEntity implements Serializable {
	private String census;
	//现居住地
	private String address;
	//经度
	private String longitude;
	//纬度
	private String latitude;
	//具体地点
	private String location;
	
	private Date createTime;
	private Date updateTime;
@@ -93,6 +99,30 @@ public class QuestionnaireUsers extends IdEntity implements Serializable {
		this.address = address;
	}
	public String getLongitude() {
		return longitude;
	}
	public void setLongitude(String longitude) {
		this.longitude = longitude;
	}
	public String getLatitude() {
		return latitude;
	}
	public void setLatitude(String latitude) {
		this.latitude = latitude;
	}
	public String getLocation() {
		return location;
	}
	public void setLocation(String location) {
		this.location = location;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreateTime() {
		return createTime;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/questionnaire/QuestionnaireUsersDao.java

@@ -20,4 +20,8 @@ public interface QuestionnaireUsersDao extends PagingAndSortingRepository<Questi
            "t.mobile=?4,t.census=?5,t.address=?6,t.updateTime = ?7  where  t.code=?1")
    int modifyUser(String code, String name, String idCard, String mobile, String census, String address, Date updateTime);
    @Modifying
    @Query("update QuestionnaireUsers u set u.longitude=?2,u.latitude=?3,u.location=?4 where u.code=?1")
    int modifyUserLocation(String code ,String longitude, String latitude, String location);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireService.java

@@ -388,6 +388,10 @@ public class QuestionnaireService extends BaseService {
	public QuestionnaireWinningESDO saveAnswerAndLotto(JSONObject jsonData, QuestionnaireUsers questionnaireUsers) throws Exception {
		System.out.println("********jsonData********* " + jsonData);
		//保存个人信息经纬度
		String longitude = String.valueOf(jsonData.get("longitude"));
		String latitude = String.valueOf(jsonData.get("latitude"));
		String location = String.valueOf(jsonData.get("location"));
		//解析json保存各种答案
		String surveyCode = jsonData.get("surveyCode").toString();
		String openId = jsonData.get("openId").toString();
@@ -395,6 +399,7 @@ public class QuestionnaireService extends BaseService {
		QuestionnaireUsers questionnaireUsers1 = questionnaireUsersDao.findByOpoenId(openId);
		if (questionnaireUsers1!=null){
			userCode = questionnaireUsers1.getCode();
			questionnaireUsersDao.modifyUserLocation(userCode,longitude,latitude,location);
		}
		Date createTime = new Date();
		//获取一维数组
@@ -443,10 +448,6 @@ public class QuestionnaireService extends BaseService {
		QuestionnaireWinningESDO result = new QuestionnaireWinningESDO();
		if (resultList!=null && resultList.size()>0){
			result = resultList.get(0);
			System.out.println("1-------"+result.getPrizeCode());
			System.out.println("2-------"+result.getPrizePsw());
			System.out.println("3-------"+key1);
			System.out.println("4-------"+key2);
			if (!StringUtils.isEmpty(result.getPrizeCode())){
				String prizeCode = RivaEDCode.passDecode(key1,key2,result.getPrizeCode());
				result.setPrizeCode(prizeCode);
@@ -490,5 +491,17 @@ public class QuestionnaireService extends BaseService {
			}
		}
	}
	
	public boolean checkParam(String param, int length){
		boolean flag = true;
		if (org.springframework.util.StringUtils.isEmpty(param)){
			flag = false;
			return  flag;
		}
		if (param.length()>length){
			flag = false;
			return flag;
		}
		return flag;
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/questionnaire/QuestionnaireController.java

@@ -77,12 +77,12 @@ public class QuestionnaireController extends BaseController {
                return write(-1,"不好意思，您已经抽过奖了！");
            }
            boolean paramFlag = true;
            paramFlag = checkParam(name,50);
            paramFlag = checkParam(idcard,50);
            paramFlag = checkParam(openid,50);
            paramFlag = checkParam(mobile,50);
            paramFlag = checkParam(census,50);
            paramFlag = checkParam(address,200);
            paramFlag = questionnaireService.checkParam(name,50);
            paramFlag = questionnaireService.checkParam(idcard,50);
            paramFlag = questionnaireService.checkParam(openid,50);
            paramFlag = questionnaireService.checkParam(mobile,50);
            paramFlag = questionnaireService.checkParam(census,50);
            paramFlag = questionnaireService.checkParam(address,200);
            if (!paramFlag){
                return write(-1,"您填的信息格式不合格，请您检查！");
            }
@@ -99,18 +99,7 @@ public class QuestionnaireController extends BaseController {
        }
    }
    private boolean checkParam(String param, int length){
        boolean flag = true;
        if (StringUtils.isEmpty(param)){
            flag = false;
            return  flag;
        }
        if (param.length()>length){
            flag = false;
            return flag;
        }
        return flag;
    }
    //----------------------电影票活动抽奖-------------------------------//
    @RequestMapping(value = "/checkLotto",method = RequestMethod.POST)