修改返回数据格式

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/controller/WxaUserApiController.java

@@ -24,10 +24,12 @@ import com.jfinal.weixin.sdk.cache.IAccessTokenCache;
 import com.jfinal.weixin.sdk.utils.Charsets;
 import com.jfinal.wxaapp.api.WxaUserApi;
 import com.jfinal.wxaapp.jfinal.WxaController;
+import com.zskk.controller.bean.DoctorBean;
 import com.zskk.controller.bean.LoginBean;
 import com.zskk.controller.bean.ResultBean;
 import com.zskk.model.Doctors;
 import com.zskk.model.DoctorsWechat;
+import com.zskk.model.Institution;
 import com.zskk.util.ErrorConstant;
 
 /**
@@ -81,10 +83,16 @@ public class WxaUserApiController extends WxaController {
 		loginBean.setSessionId(sessionId);
 		if (doctors != null) {
 			doctors.setPassword("");
+			DoctorBean doctorBean = JSON.parseObject(doctors.toJson(), DoctorBean.class);
+			Institution institution = Institution.dao.findById(doctorBean.getInstitution_id());
+			doctorBean.setInstitution(institution.getName());
+			StringBuilder sb = new StringBuilder(doctorBean.getPhone());
+			sb.replace(3, 7, "****");
+			doctorBean.setPhone(sb.toString());
 			String tokenKey = "TOKEN_WXA_" + StrKit.getRandomUUID();
 			String doctorsStr =  JSON.toJSONString(doctors);
 			Redis.use("pc").setex("think" + tokenKey, 7200, doctors.toJson());
-			loginBean.setDoctorBean(doctors);
+			loginBean.setDoctorBean(doctorBean);
 			loginBean.setToken(tokenKey);
 		}
 		renderJson(new ResultBean(loginBean));
@@ -119,7 +127,7 @@ public class WxaUserApiController extends WxaController {
 		Doctors doctors = Doctors.dao.findById(doctorsWechat.getDoctorId());
 		LoginBean loginBean = new LoginBean();
 		loginBean.setSessionId(sessionId);
-		loginBean.setDoctorBean(doctors);
+//		loginBean.setDoctorBean(doctors);
 		renderJson(new ResultBean(loginBean));
 	}
 
@@ -195,9 +203,9 @@ public class WxaUserApiController extends WxaController {
 			doctors.setPassword("");
 			String tokenKey = "TOKEN_WXA_" + StrKit.getRandomUUID();
 			Redis.use("pc").setex(tokenKey, 7200, doctors.toJson());
-			loginBean.setDoctorBean(doctors);
+//			loginBean.setDoctorBean(doctors);
 			loginBean.setToken(tokenKey);
-			loginBean.setDoctorBean(doctors);
+//			loginBean.setDoctorBean(doctors);
 		}
 		renderJson(new ResultBean(loginBean));
 	}
@@ -274,20 +282,18 @@ public class WxaUserApiController extends WxaController {
 		doctorsWechat.update();
 		LoginBean loginBean = new LoginBean();
 		doctors.setPassword("");
+		DoctorBean doctorBean = JSON.parseObject(doctors.toJson(), DoctorBean.class);
+		Institution institution = Institution.dao.findById(doctorBean.getInstitution_id());
+		doctorBean.setInstitution(institution.getName());
+		StringBuilder sb = new StringBuilder(doctorBean.getPhone());
+		sb.replace(3, 7, "****");
+		doctorBean.setPhone(sb.toString());
 		String tokenKey = "TOKEN_WXA_" + StrKit.getRandomUUID();
-		String doctorsStr =  JSON.toJSONString(doctors);
 		Redis.use("pc").setex("think" + tokenKey, 7200, doctors.toJson());
-		loginBean.setDoctorBean(doctors);
+		loginBean.setDoctorBean(doctorBean);
 		loginBean.setToken(tokenKey);
 		renderJson(new ResultBean(loginBean));
 
 	}
-	
-	public void aaa() {
-		Doctors doctors = Doctors.dao.findFirst("select * from doctors where phone=?", "15203224322");
-		String tokenKey = "TOKEN_WXA_" + "test4";
-		String doctorsStr =  JSON.toJSONString(doctors);
-		Redis.use("pc").setex("think" + tokenKey, 7200, doctors.toJson());
-		
-	}
+
 }

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/controller/bean/DoctorBean.java

@@ -0,0 +1,308 @@
+package com.zskk.controller.bean;
+
+public class DoctorBean {
+	
+	private String institution;
+	
+	private String id;
+	
+	private String username;
+
+	private String realname;
+
+	private String email;
+
+	private String login_time;
+
+	private String token;
+
+	private String phone;
+	
+	private String remark;
+
+	private String doctor_title;
+	
+	private String status;
+	
+	private String attachment;
+	
+	private String institution_id;
+	
+	private String department_id;
+	
+	private String doctor_role;
+	
+	private String login_failure;
+	
+	private String login_ip;
+	
+	private String login_code;
+	
+	private String is_report;
+	
+	private String exam_class;
+	
+	private String send_sms;
+	
+	private String message_push;
+	
+	private String is_admin;
+
+	private String is_send_message;
+	
+	private String is_use_autograph;
+	
+	private String autograph;
+	
+	private String device_ids;
+	
+	private String introduce;	
+	
+	private String createdAt;
+	
+	private String updatedAt;
+
+	public String getInstitution() {
+		return institution;
+	}
+
+	public void setInstitution(String institution) {
+		this.institution = institution;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getRealname() {
+		return realname;
+	}
+
+	public void setRealname(String realname) {
+		this.realname = realname;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getLogin_time() {
+		return login_time;
+	}
+
+	public void setLogin_time(String login_time) {
+		this.login_time = login_time;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDoctor_title() {
+		return doctor_title;
+	}
+
+	public void setDoctor_title(String doctor_title) {
+		this.doctor_title = doctor_title;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getAttachment() {
+		return attachment;
+	}
+
+	public void setAttachment(String attachment) {
+		this.attachment = attachment;
+	}
+
+	public String getInstitution_id() {
+		return institution_id;
+	}
+
+	public void setInstitution_id(String institution_id) {
+		this.institution_id = institution_id;
+	}
+
+	public String getDepartment_id() {
+		return department_id;
+	}
+
+	public void setDepartment_id(String department_id) {
+		this.department_id = department_id;
+	}
+
+	public String getDoctor_role() {
+		return doctor_role;
+	}
+
+	public void setDoctor_role(String doctor_role) {
+		this.doctor_role = doctor_role;
+	}
+
+	public String getLogin_failure() {
+		return login_failure;
+	}
+
+	public void setLogin_failure(String login_failure) {
+		this.login_failure = login_failure;
+	}
+
+	public String getLogin_ip() {
+		return login_ip;
+	}
+
+	public void setLogin_ip(String login_ip) {
+		this.login_ip = login_ip;
+	}
+
+	public String getLogin_code() {
+		return login_code;
+	}
+
+	public void setLogin_code(String login_code) {
+		this.login_code = login_code;
+	}
+
+	public String getIs_report() {
+		return is_report;
+	}
+
+	public void setIs_report(String is_report) {
+		this.is_report = is_report;
+	}
+
+	public String getExam_class() {
+		return exam_class;
+	}
+
+	public void setExam_class(String exam_class) {
+		this.exam_class = exam_class;
+	}
+
+	public String getSend_sms() {
+		return send_sms;
+	}
+
+	public void setSend_sms(String send_sms) {
+		this.send_sms = send_sms;
+	}
+
+	public String getMessage_push() {
+		return message_push;
+	}
+
+	public void setMessage_push(String message_push) {
+		this.message_push = message_push;
+	}
+
+	public String getIs_admin() {
+		return is_admin;
+	}
+
+	public void setIs_admin(String is_admin) {
+		this.is_admin = is_admin;
+	}
+
+	public String getIs_send_message() {
+		return is_send_message;
+	}
+
+	public void setIs_send_message(String is_send_message) {
+		this.is_send_message = is_send_message;
+	}
+
+	public String getIs_use_autograph() {
+		return is_use_autograph;
+	}
+
+	public void setIs_use_autograph(String is_use_autograph) {
+		this.is_use_autograph = is_use_autograph;
+	}
+
+	public String getAutograph() {
+		return autograph;
+	}
+
+	public void setAutograph(String autograph) {
+		this.autograph = autograph;
+	}
+
+	public String getDevice_ids() {
+		return device_ids;
+	}
+
+	public void setDevice_ids(String device_ids) {
+		this.device_ids = device_ids;
+	}
+
+	public String getIntroduce() {
+		return introduce;
+	}
+
+	public void setIntroduce(String introduce) {
+		this.introduce = introduce;
+	}
+
+	public String getCreatedAt() {
+		return createdAt;
+	}
+
+	public void setCreatedAt(String createdAt) {
+		this.createdAt = createdAt;
+	}
+
+	public String getUpdatedAt() {
+		return updatedAt;
+	}
+
+	public void setUpdatedAt(String updatedAt) {
+		this.updatedAt = updatedAt;
+	}
+	
+	
+	
+
+}

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/controller/bean/LoginBean.java

@@ -15,15 +15,7 @@ public class LoginBean {
 	
 	private String token;
 	
-	private Doctors DoctorBean;
-	
-	public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
+	private DoctorBean DoctorBean;
 
 	public String getSessionId() {
 		return sessionId;
@@ -33,12 +25,21 @@ public class LoginBean {
 		this.sessionId = sessionId;
 	}
 
-	public Doctors getDoctorBean() {
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public DoctorBean getDoctorBean() {
 		return DoctorBean;
 	}
 
-	public void setDoctorBean(Doctors doctorBean) {
+	public void setDoctorBean(DoctorBean doctorBean) {
 		DoctorBean = doctorBean;
 	}
-
+	
+	
 }

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/model/Institution.java

@@ -0,0 +1,11 @@
+package com.zskk.model;
+
+import com.zskk.model.base.BaseInstitution;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class Institution extends BaseInstitution<Institution> {
+	public static final Institution dao = new Institution().dao();
+}

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/model/_MappingKit.java

@@ -18,6 +18,7 @@ public class _MappingKit {
 	public static void mapping(ActiveRecordPlugin arp) {
 		arp.addMapping("doctors", "id", Doctors.class);
 		arp.addMapping("doctors_wechat", "id", DoctorsWechat.class);
+		arp.addMapping("institution", "id", Institution.class);
 	}
 }
 

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/model/base/BaseInstitution.java

@@ -0,0 +1,252 @@
+package com.zskk.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings("serial")
+public abstract class BaseInstitution<M extends BaseInstitution<M>> extends Model<M> implements IBean {
+
+	public void setId(java.lang.String id) {
+		set("id", id);
+	}
+	
+	public java.lang.String getId() {
+		return getStr("id");
+	}
+
+	public void setName(java.lang.String name) {
+		set("name", name);
+	}
+	
+	public java.lang.String getName() {
+		return getStr("name");
+	}
+
+	public void setAddress(java.lang.String address) {
+		set("address", address);
+	}
+	
+	public java.lang.String getAddress() {
+		return getStr("address");
+	}
+
+	public void setRemark(java.lang.String remark) {
+		set("remark", remark);
+	}
+	
+	public java.lang.String getRemark() {
+		return getStr("remark");
+	}
+
+	public void setStatus(java.lang.String status) {
+		set("status", status);
+	}
+	
+	public java.lang.String getStatus() {
+		return getStr("status");
+	}
+
+	public void setInstitutionLevel(java.lang.String institutionLevel) {
+		set("institution_level", institutionLevel);
+	}
+	
+	public java.lang.String getInstitutionLevel() {
+		return getStr("institution_level");
+	}
+
+	public void setParentInstitution(java.lang.String parentInstitution) {
+		set("parent_institution", parentInstitution);
+	}
+	
+	public java.lang.String getParentInstitution() {
+		return getStr("parent_institution");
+	}
+
+	public void setChargeMode(java.lang.String chargeMode) {
+		set("charge_mode", chargeMode);
+	}
+	
+	public java.lang.String getChargeMode() {
+		return getStr("charge_mode");
+	}
+
+	public void setLocalDomain(java.lang.String localDomain) {
+		set("local_domain", localDomain);
+	}
+	
+	public java.lang.String getLocalDomain() {
+		return getStr("local_domain");
+	}
+
+	public void setReportSubtitle(java.lang.String reportSubtitle) {
+		set("report_subtitle", reportSubtitle);
+	}
+	
+	public java.lang.String getReportSubtitle() {
+		return getStr("report_subtitle");
+	}
+
+	public void setAgentId(java.lang.String agentId) {
+		set("agent_id", agentId);
+	}
+	
+	public java.lang.String getAgentId() {
+		return getStr("agent_id");
+	}
+
+	public void setMsgPhone(java.lang.String msgPhone) {
+		set("msg_phone", msgPhone);
+	}
+	
+	public java.lang.String getMsgPhone() {
+		return getStr("msg_phone");
+	}
+
+	public void setUrgentTime(java.util.Date urgentTime) {
+		set("urgent_time", urgentTime);
+	}
+	
+	public java.util.Date getUrgentTime() {
+		return get("urgent_time");
+	}
+
+	public void setNotUrgentTime(java.util.Date notUrgentTime) {
+		set("not_urgent_time", notUrgentTime);
+	}
+	
+	public java.util.Date getNotUrgentTime() {
+		return get("not_urgent_time");
+	}
+
+	public void setWxSource(java.lang.String wxSource) {
+		set("wx_source", wxSource);
+	}
+	
+	public java.lang.String getWxSource() {
+		return getStr("wx_source");
+	}
+
+	public void setIsTest(java.lang.String isTest) {
+		set("is_test", isTest);
+	}
+	
+	public java.lang.String getIsTest() {
+		return getStr("is_test");
+	}
+
+	public void setCurrentMoney(java.lang.Integer currentMoney) {
+		set("current_money", currentMoney);
+	}
+	
+	public java.lang.Integer getCurrentMoney() {
+		return getInt("current_money");
+	}
+
+	public void setMinMoney(java.lang.Integer minMoney) {
+		set("min_money", minMoney);
+	}
+	
+	public java.lang.Integer getMinMoney() {
+		return getInt("min_money");
+	}
+
+	public void setNoticeMonoy(java.lang.Integer noticeMonoy) {
+		set("notice_monoy", noticeMonoy);
+	}
+	
+	public java.lang.Integer getNoticeMonoy() {
+		return getInt("notice_monoy");
+	}
+
+	public void setIsPay(java.lang.Integer isPay) {
+		set("is_pay", isPay);
+	}
+	
+	public java.lang.Integer getIsPay() {
+		return getInt("is_pay");
+	}
+
+	public void setProvince(java.lang.String province) {
+		set("province", province);
+	}
+	
+	public java.lang.String getProvince() {
+		return getStr("province");
+	}
+
+	public void setCity(java.lang.String city) {
+		set("city", city);
+	}
+	
+	public java.lang.String getCity() {
+		return getStr("city");
+	}
+
+	public void setDistrict(java.lang.String district) {
+		set("district", district);
+	}
+	
+	public java.lang.String getDistrict() {
+		return getStr("district");
+	}
+
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
+	public void setApiIds(java.lang.String apiIds) {
+		set("api_ids", apiIds);
+	}
+	
+	public java.lang.String getApiIds() {
+		return getStr("api_ids");
+	}
+
+	public void setFilmPrice(java.lang.Integer filmPrice) {
+		set("film_price", filmPrice);
+	}
+	
+	public java.lang.Integer getFilmPrice() {
+		return getInt("film_price");
+	}
+
+	public void setHandlingTime(java.lang.String handlingTime) {
+		set("handling_time", handlingTime);
+	}
+	
+	public java.lang.String getHandlingTime() {
+		return getStr("handling_time");
+	}
+
+	public void setPatientSms(java.lang.String patientSms) {
+		set("patient_sms", patientSms);
+	}
+	
+	public java.lang.String getPatientSms() {
+		return getStr("patient_sms");
+	}
+
+	public void setSuperLevel(java.lang.Integer superLevel) {
+		set("super_level", superLevel);
+	}
+	
+	public java.lang.Integer getSuperLevel() {
+		return getInt("super_level");
+	}
+
+}

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/service/ServiceFactory.java

@@ -18,7 +18,6 @@ public class ServiceFactory {
 	 */
 	public static void init(){
 		CLASS_MAP.put(ThreadPoolService.class, 	        Duang.duang(ThreadPoolService.class));
-		CLASS_MAP.put(UserService.class, 	            Duang.duang(UserService .class));
 
 	}
 	

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/service/UserService.java

@@ -1,74 +0,0 @@
-package com.zskk.service;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.AlgorithmParameters;
-import java.security.Key;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import com.alibaba.fastjson.JSON;
-import com.jfinal.kit.Base64Kit;
-import com.jfinal.kit.HashKit;
-import com.jfinal.weixin.sdk.api.ApiResult;
-import com.jfinal.weixin.sdk.utils.Charsets;
-
-import okhttp3.FormBody;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class UserService {
-
-	private static final MediaType JSON_CODE = MediaType.get("application/json; charset=utf-8");
-
-	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
-
-	/**
-	 * 创建微信用户
-	 * 
-	 * @param openid
-	 */
-	public static String decrypt(String encryptedData, String ivStr) {
-        byte[] bizData = Base64Kit.decode("zY5mNzlVRTEhY2V5bAgjtjCKBKIPhlHu1ct/ThHNgbIL/ZyxZ+amvQ7JSFSRh2b1JC+VisPN9MP/yBfdFbcvhuLLM0kXQLKOqd4zRWi5+SXTdnHHYdoIp+z2zE4mk277iBrg+LRyaJEwdZ7OvgNBedrkn6mDANwQNb2kn1slkP13Z3MMtiUJlEn2GSKboHv+VOdnNAp3AfIpxGhc+ZIH4w==");
-        byte[] keyByte = Base64Kit.decode("9s89B/Ju7f9tSqifyPUboA==");
-        byte[] ivByte  = Base64Kit.decode("tg1xdcVOnjSwfott9Dz58A==");
-        try {
-            Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
-            Key sKeySpec = new SecretKeySpec(keyByte, "AES");
-            // 初始化
-            AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
-            params.init(new IvParameterSpec(ivByte));
-            cipher.init(Cipher.DECRYPT_MODE, sKeySpec, params);
-            byte[] original = cipher.doFinal(bizData);
-            // 去除补位字符
-            byte[] result = decode(original);
-            return new String(result, Charsets.UTF_8);
-        } catch (Exception e) {
-            throw new RuntimeException("aes解密失败");
-        }
-    }
-	
-	static byte[] decode(byte[] decrypted) {
-        int pad = (int) decrypted[decrypted.length - 1];
-        if (pad < 1 || pad > 32) {
-            pad = 0;
-        }
-        return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
-    }
-
-	public static void main(String[] args) throws IOException {
-		String aaaString=  decrypt("","");
-		ApiResult apiResult = ApiResult.create(aaaString);
-		System.out.println(apiResult);
-	}
-}

PacsOnline_Wechat_Doctor/src/main/java/com/zskk/util/_JFinalDemoGenerator.java

@@ -46,7 +46,7 @@ public class _JFinalDemoGenerator {
 		generator.setGenerateChainSetter(false);
 		
 		// 添加不需要生成的表名
-		generator.addExcludedTable("bbs","sys_logs","bodypart","constant","department","device","doctor_class","dr_cla_permission","exam_class","exam_project","exam_subclass","images","manager","menu","templates","studies","series","oss_callbacks","version","sys_menus","api","default_cost","every_studies","fa_admin","fa_admin_log","fa_area","fa_attachment","fa_auth_group","fa_auth_group_access","fa_auth_institution_access","fa_auth_rule","fa_category","fa_config","fa_ems","fa_sms","fa_test","fa_user","fa_user_group","fa_user_money_log","fa_user_rule","fa_user_score_log","fa_user_token","fa_version","lcoss_callbacks","log","patient_exam","register","remote_contact","remote_cost","remote_order","remote_water","remote_water_log","send_message","special_contact","special_remote","wechat_pay_log","wechat_refund_log","xz","user_bind","exams","institution","messages","open_application","operating","patient_infos","remote_application","report","report_record","user_wechat","wechat_bind");
+		generator.addExcludedTable("bbs","sys_logs","bodypart","constant","department","device","doctor_class","dr_cla_permission","exam_class","exam_project","exam_subclass","images","manager","menu","templates","studies","series","oss_callbacks","version","sys_menus","api","default_cost","every_studies","fa_admin","fa_admin_log","fa_area","fa_attachment","fa_auth_group","fa_auth_group_access","fa_auth_institution_access","fa_auth_rule","fa_category","fa_config","fa_ems","fa_sms","fa_test","fa_user","fa_user_group","fa_user_money_log","fa_user_rule","fa_user_score_log","fa_user_token","fa_version","lcoss_callbacks","log","patient_exam","register","remote_contact","remote_cost","remote_order","remote_water","remote_water_log","send_message","special_contact","special_remote","wechat_pay_log","wechat_refund_log","xz","user_bind","exams","messages","open_application","operating","patient_infos","remote_application","report","report_record","user_wechat","wechat_bind","apis");
 		
 		// 设置是否在 Model 中生成 dao 对象
 		generator.setGenerateDaoInModel(true);