Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskq/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskq/SyncOrgUnitAndUserDaoImpl.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzykdxfskq/SyncOrgUnitAndUserDaoImpl.java (revision 24326) @@ -0,0 +1,190 @@ +package com.forgon.disinfectsystem.datasynchronization.dao.gzykdxfskq; + +import net.sf.json.JSONArray; +import net.sf.json.JSONException; +import net.sf.json.JSONObject; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; + +import com.forgon.disinfectsystem.datasynchronization.dao.SyncOrgUnitAndUserDao; +import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; +import com.forgon.disinfectsystem.datasynchronization.model.UserVo; +import com.forgon.tools.json.JSONUtil; + +/** + * 查询第三方科室与人员信息(广医口腔) + * @author YanWeiNing + * 2018-09-20 + * + */ +public class SyncOrgUnitAndUserDaoImpl implements SyncOrgUnitAndUserDao { + + Logger logger = Logger.getLogger(SyncOrgUnitAndUserDaoImpl.class); + + @Override + public UserVo[] getAllUser() { + // TODO Auto-generated method stub + return null; + } + + @Override + public OrgUnitVo[] getAllOrgUnit() { + // TODO Auto-generated method stub + return null; + } + + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + OrgUnitVo[] OrgUnitVos = null; + if(StringUtils.isNotBlank(param)){ + //1、解析参数 + JSONObject jsonObject = JSONObject.fromObject(param); + logger.debug("解析:调用接口推送组织机构数据jsonObject="+ jsonObject.toString()); + String name = null;//科室名称 + String code = null;//科室编号 + //1. + setAndcheckResponseParam(jsonObject); + //2.data->entity->code(科室编号),name(科室名称) + JSONObject data = jsonObject.optJSONObject("data"); + if(data.isNullObject()){ + logger.error("参数:data不能为空!:"+jsonObject.toString()); + throw new JSONException("唯一参数:data不能为空!"); + } + JSONObject entity = data.optJSONObject("entity"); + if(entity.isNullObject()){ + logger.error("参数:entity不能为空!:"+jsonObject.toString()); + throw new JSONException("唯一参数:entity不能为空!"); + } + code = JSONUtil.optString(entity, "code", null); + name = JSONUtil.optString(entity, "name", null); + if(StringUtils.isBlank(code)||StringUtils.isBlank(name)){ + logger.error("参数:entity不能为空!:"+jsonObject.toString()); + throw new JSONException("唯一参数:code、name不能为空!"); + } + //2、创建OrgUnitVo[] + OrgUnitVos = new OrgUnitVo[1]; + OrgUnitVo vo = new OrgUnitVo(); + vo.setCoding(code); + vo.setName(name); + OrgUnitVos[0]=vo; + logger.debug(JSONArray.fromObject(OrgUnitVos)); + }else{ + logger.error("请求参数:不能为空!:"+ param); + throw new JSONException("请求参数不能为空!"); + } + return OrgUnitVos; + } + + @Override + public UserVo[] paramToUserVos(String param) { + UserVo[] userVos = null; + if(StringUtils.isNotBlank(param)){ + //1、解析参数 + JSONObject jsonObject = JSONObject.fromObject(param); + logger.debug("解析:调用接口推送用户数据 jsonObject="+ jsonObject.toString()); + String name = null;//人员名字 + String code = null;//人员工号 + //1. + setAndcheckResponseParam(jsonObject); + //2. + //data->entity->code(工号)name(名字) + //data->entity->emplDepartmentList->departmentCode(科室编码) + JSONObject data = jsonObject.optJSONObject("data"); + if(data.isNullObject()){ + logger.error("参数:data不能为空!:"+ jsonObject.toString()); + throw new JSONException("唯一参数:data不能为空!"); + } + JSONObject entity = data.optJSONObject("entity"); + if(entity.isNullObject()){ + logger.error("参数:entity不能为空!:"+ jsonObject.toString()); + throw new JSONException("唯一参数:entity不能为空!"); + } + name = JSONUtil.optString(entity, "name", null);//获得人员名字 + code = JSONUtil.optString(entity, "code", null);//获得人员工号 + if(StringUtils.isEmpty(name)||StringUtils.isEmpty(code)){ + logger.error("参数:name、code不能为空!:"+ jsonObject.toString()); + throw new JSONException("参数:name、code不能为空!"); + } + JSONArray emplDepartmentList = entity.getJSONArray("emplDepartmentList"); + if(emplDepartmentList.isEmpty()){ + logger.error("参数:emplDepartmentList不能为空!:"+ jsonObject.toString()); + throw new JSONException("参数:emplDepartmentList不能为空!"); + } + //2、创建UserVo[] + userVos = new UserVo[emplDepartmentList.size()]; + for (int i = 0; i < emplDepartmentList.size(); i++) { + UserVo userVo = new UserVo(); + JSONObject departmentObject = emplDepartmentList.getJSONObject(i); + //获得科室编码 + String departmentCode = JSONUtil.optString(departmentObject, "departmentCode", null); + if(StringUtils.isEmpty(departmentCode)){ + logger.error("参数:departmentCode不能为空!:"+ jsonObject.toString()); + throw new JSONException("参数:departmentCode不能为空!"); + } + userVo.setCoding(code); + userVo.setName(name); + userVo.setOrgUnitCoding(departmentCode); + userVos[i] = userVo; + } + logger.debug(JSONArray.fromObject(userVos)); + }else{ + logger.error("参数:不能为空!:"+ param); + throw new JSONException("参数:code、name不能为空!"); + } + return userVos; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String resMsg,String param) { + JSONObject result = new JSONObject(); + String resCode = "-1"; + if(StringUtils.isNotBlank(param)){ + JSONObject jsonObject = JSONObject.fromObject(param); + setResponseParam(jsonObject,result); + } + if(success){ + resCode = "0"; + } + result.put("code", resCode); + result.put("resMsg", resMsg); + return result; + } + + /** + * 校验通过响应参数获得得返回参数 + * @param jsonObject + * @param result + */ + private void setAndcheckResponseParam(JSONObject jsonObject) { + String serviceCode = JSONUtil.optString(jsonObject, "serviceCode", null);//服务编码 + String msgId = JSONUtil.optString(jsonObject, "msgId", null);//消息id + String operId = JSONUtil.optString(jsonObject, "operId", null);//操作员id + String appCode = JSONUtil.optString(jsonObject, "appCode", null);//接入系统编码 + String operTime = JSONUtil.optString(jsonObject, "operTime", null);//"操作时间 + if(StringUtils.isBlank(serviceCode)||StringUtils.isBlank(msgId) + ||StringUtils.isBlank(operId)||StringUtils.isBlank(appCode)||StringUtils.isBlank(operTime)){ + logger.error("参数{serviceCode、msgId、operId、appCode、operTime}不能为空!:"+ jsonObject.toString()); + throw new JSONException("参数{serviceCode、msgId、operId、appCode、operTime}不能为空!"); + } + } + + /** + * 通过响应参数获得返回参数 + * @param jsonObject + * @param result + */ + private void setResponseParam(JSONObject jsonObject, JSONObject result) { + String serviceCode = JSONUtil.optString(jsonObject, "serviceCode", null);//服务编码 + String msgId = JSONUtil.optString(jsonObject, "msgId", null);//消息id + String operId = JSONUtil.optString(jsonObject, "operId", null);//操作员id + String appCode = JSONUtil.optString(jsonObject, "appCode", null);//接入系统编码 + String operTime = JSONUtil.optString(jsonObject, "operTime", null);//"操作时间 + result.put("serviceCode", serviceCode); + result.put("msgId", msgId); + result.put("operId", operId); + result.put("appCode", appCode); + result.put("operTime", operTime); + } + +} Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncOrgUnitAndUserDao.java =================================================================== diff -u -r12331 -r24326 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 12331) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 24326) @@ -1,5 +1,7 @@ package com.forgon.disinfectsystem.datasynchronization.dao; +import net.sf.json.JSONObject; + import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; import com.forgon.disinfectsystem.datasynchronization.model.UserVo; @@ -8,4 +10,29 @@ UserVo[] getAllUser(); OrgUnitVo[] getAllOrgUnit(); + /** + * 把参数组装为 OrgUnitVo[] + * @param param + * @return + */ + public OrgUnitVo[] paramToOrgUnitVos(String param); + + /** + * 把参数组装为 UserVo[] + * @param param + * @return + */ + public UserVo[] paramToUserVos(String param); + + /** + * 组装响应结果 + * 说明： + * success： true:响应结果为成功；false:响应结果为失败 + * param：若不为空则:表明响应的结果需要请求参数的数据 + * @param success 是否成功 + * @param message 返回信息 + * @param param 请求参数(可以为空) + * @return + */ + public JSONObject buttjoinResponse(Boolean success,String message,String param); } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r21966 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 21966) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -7,6 +7,8 @@ import java.util.ArrayList; import java.util.List; +import net.sf.json.JSONObject; + import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; @@ -101,4 +103,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r24147 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24147) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsskrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -4,6 +4,7 @@ import java.util.List; import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -134,4 +135,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDao.java =================================================================== diff -u -r13715 -r24326 --- ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 13715) +++ ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 24326) @@ -11,6 +11,8 @@ import java.util.SortedSet; import java.util.TreeSet; +import net.sf.json.JSONObject; + import org.springframework.core.io.Resource; import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; @@ -117,5 +119,24 @@ return null; } } + + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r21966 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 21966) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -4,6 +4,7 @@ import java.util.List; import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -134,4 +135,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r18977 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 18977) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -165,4 +165,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java =================================================================== diff -u --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java (revision 0) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java (revision 24326) @@ -0,0 +1,187 @@ +package com.forgon.disinfectsystem.datasynchronization.controller; + +import net.sf.json.JSONException; +import net.sf.json.JSONObject; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import com.forgon.disinfectsystem.datasynchronization.dao.SyncOrgUnitAndUserDao; +import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; +import com.forgon.disinfectsystem.datasynchronization.model.UserVo; +import com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManager; + +/** + * 对接用户、科室(目前只针对广医口腔) + * @author YanWeiNing + * + */ +@RestController +@RequestMapping("/buttjoint/buttjointUserAndOrgAndPatientController") +public class ButtjointUserAndOrgAndPatientController { + + Logger logger = Logger.getLogger(ButtjointUserAndOrgAndPatientController.class); + + @Autowired(required = false) + private SyncOrgUnitAndUserDao syncOrgUnitAndUserDao ; + + @Autowired + private DataSynchronizationManager dataSynchronizationManager; + + /** + * 新增科室 + * @param param json格式的字符串 + * @return json对象 + */ + @RequestMapping(value = "/registerDeptCast",method = RequestMethod.POST) + public JSONObject registerDeptCast(@RequestBody String param){ + logger.debug("调用：registerDeptCast接口推送组织机构数据param="+ param); + JSONObject result = null; + Boolean success = false; + String message = ""; + try { + if(null != syncOrgUnitAndUserDao){ + //1、解析参数 获得OrgUnitVo[] + OrgUnitVo[] unitVos = syncOrgUnitAndUserDao.paramToOrgUnitVos(param); + //2、保存或更新科室 + dataSynchronizationManager.processSyncOrgUnitData(unitVos); + //3、设置成功信息 + success = true; + message = "新增科室成功"; + }else{ + message = "获取不到接口buttjoinOrgUnitAndUserDao!"; + } + }catch(JSONException e){ + logger.error("数据格式有误!"+e.getMessage()); + message = "数据格式有误!"+e.getMessage(); + e.printStackTrace(); + }catch (Exception e) { + logger.error("后台报错!"+e.getMessage()); + message = "后台报错!"+e.getMessage(); + e.printStackTrace(); + }finally{ + //4、设置响应结果 + result = syncOrgUnitAndUserDao.buttjoinResponse(success,message,param); + } + return result; + } + + + /** + * 修改科室 + * @param param json格式的字符串 + * @return json对象 + */ + @RequestMapping(value = "/editDeptCast",method = RequestMethod.POST) + public JSONObject editDeptCast(@RequestBody String param){ + logger.debug("接口：editDeptCast调用接口推送组织机构数据param="+ param); + JSONObject result = null; + Boolean success = false; + String message = ""; + try { + if(null != syncOrgUnitAndUserDao){ + //1、解析参数 获得OrgUnitVo[] + OrgUnitVo[] unitVos = syncOrgUnitAndUserDao.paramToOrgUnitVos(param); + //2、保存或更新科室 + dataSynchronizationManager.processSyncOrgUnitData(unitVos); + //3、设置成功信息 + success = true; + message = "修改科室成功"; + }else{ + message = "获取不到接口buttjoinOrgUnitAndUserDao!"; + } + }catch(JSONException e){ + logger.error("数据格式有误!"+e.getMessage()); + message = "数据格式有误!"+e.getMessage(); + e.printStackTrace(); + }catch (Exception e) { + logger.error("后台报错!"+e.getMessage()); + message = "后台报错!"+e.getMessage(); + e.printStackTrace(); + }finally{ + //4、设置响应结果 + result = syncOrgUnitAndUserDao.buttjoinResponse(success,message,param); + } + return result; + } + + /** + * 新增人员 + * @param param json格式的字符串 + * @return json对象 + */ + @RequestMapping(value = "/registerEmployeeCast",method = RequestMethod.POST) + public JSONObject registerEmployeeCast (@RequestBody String param){ + logger.debug("接口:registerEmployeeCast 调用接口推送人员数据param="+ param); + JSONObject result = null; + Boolean success = false; + String message = ""; + try { + if(null != syncOrgUnitAndUserDao){ + //1、解析参数 获得UserVo[] + UserVo[] uerVos = syncOrgUnitAndUserDao.paramToUserVos(param); + //2、保存或更新人员 + dataSynchronizationManager.processSyncUserData(uerVos); + //3、设置成功信息 + success = true; + message = "新增人员成功"; + }else{ + message = "获取不到接口buttjoinOrgUnitAndUserDao!"; + } + }catch(JSONException e){ + logger.error("数据格式有误!"+e.getMessage()); + message = "数据格式有误!"+e.getMessage(); + e.printStackTrace(); + }catch (Exception e) { + logger.error("后台报错!"+e.getMessage()); + message = "后台报错!"+e.getMessage(); + e.printStackTrace(); + }finally{ + //4、设置响应结果 + result = syncOrgUnitAndUserDao.buttjoinResponse(success,message,param); + } + return result; + } + + /** + * 修改人员 + * @param param json格式的字符串 + * @return json对象 + */ + @RequestMapping(value = "/editEmployeeCast",method = RequestMethod.POST) + public JSONObject editEmployeeCast (@RequestBody String param){ + logger.debug("接口:editEmployeeCast 调用接口推送人员数据param="+ param); + JSONObject result = null; + Boolean success = false; + String message = ""; + try { + if(null != syncOrgUnitAndUserDao){ + //1、解析参数 获得UserVo[] + UserVo[] uerVos = syncOrgUnitAndUserDao.paramToUserVos(param); + //2、保存或更新人员 + dataSynchronizationManager.processSyncUserData(uerVos); + //3、设置成功信息 + success = true; + message = "修改人员成功"; + }else{ + message = "获取不到接口buttjoinOrgUnitAndUserDao!"; + } + }catch(JSONException e){ + logger.error("数据格式有误!"+e.getMessage()); + message = "数据格式有误!"+e.getMessage(); + e.printStackTrace(); + }catch (Exception e) { + logger.error("后台报错!"+e.getMessage()); + message = "后台报错!"+e.getMessage(); + e.printStackTrace(); + }finally{ + //4、设置响应结果 + result = syncOrgUnitAndUserDao.buttjoinResponse(success,message,param); + } + return result; + } +} Index: ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDataSyncDao.java =================================================================== diff -u -r15334 -r24326 --- ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDataSyncDao.java (.../SyncOrgUnitAndUserDataSyncDao.java) (revision 15334) +++ ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDataSyncDao.java (.../SyncOrgUnitAndUserDataSyncDao.java) (revision 24326) @@ -176,5 +176,24 @@ } return new UserVo[0]; } + + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } } Index: ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java =================================================================== diff -u -r16938 -r24326 --- ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 16938) +++ ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/cszxyy/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 24326) @@ -5,6 +5,7 @@ import org.apache.log4j.Logger; import net.sf.json.JSON; +import net.sf.json.JSONObject; import ws.pub.ihis.Constants; import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; @@ -43,4 +44,23 @@ UserVo[] result = JSONUtil.fromJson(jsonResult.toString(), token); return result; } + + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r23629 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 23629) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -132,4 +132,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r14046 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 14046) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -128,4 +128,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/SyncOrgUnitAndUserDao.java =================================================================== diff -u -r12331 -r24326 --- ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 12331) +++ ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/SyncOrgUnitAndUserDao.java (.../SyncOrgUnitAndUserDao.java) (revision 24326) @@ -11,6 +11,8 @@ import java.util.SortedSet; import java.util.TreeSet; +import net.sf.json.JSONObject; + import org.springframework.core.io.Resource; import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo; @@ -117,4 +119,23 @@ return null; } } + + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r19682 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 19682) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -134,4 +134,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r15727 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 15727) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -5,6 +5,8 @@ import java.util.ArrayList; import java.util.List; +import net.sf.json.JSONObject; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -129,4 +131,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-jysrmyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r22894 -r24326 --- ssts-datasync-jysrmyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 22894) +++ ssts-datasync-jysrmyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -151,4 +151,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + } Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java =================================================================== diff -u -r16800 -r24326 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 16800) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java (.../SyncOrgUnitAndUserDaoImpl.java) (revision 24326) @@ -233,4 +233,23 @@ return orgUnitVoArray; } + @Override + public OrgUnitVo[] paramToOrgUnitVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public UserVo[] paramToUserVos(String param) { + // TODO Auto-generated method stub + return null; + } + + @Override + public JSONObject buttjoinResponse(Boolean success, String message, + String param) { + // TODO Auto-generated method stub + return null; + } + }