2018年5月29日 --智能分析平台

.idea/misc.xml

@@ -19,4 +19,5 @@
   <component name="SvnBranchConfigurationManager">
     <option name="mySupportsUserInfoFilter" value="true" />
   </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
 </project>
\ No newline at end of file

pom.xml

@@ -570,7 +570,17 @@
 		    <artifactId>BASE64Decoder</artifactId>
 		    <version>1.0</version>
 		</dependency>
-<!-- 
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20080701</version>
+        </dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20080701</version>
+		</dependency>
+		<!--
                 <dependency>
                     <groupId>org.apache.xmlgraphics</groupId>
                     <artifactId>batik-anim</artifactId>

src/main/java/com/cmsz/dao/DepartmentDaoSupport.java

@@ -45,4 +45,29 @@ public class DepartmentDaoSupport extends DAOSupport {
 		return departmentList;
 	}
 
+	public List<DepartmentVO> findAllDepartment()
+	{
+		String sql="SELECT DEPARTMENT_ID, DEPARTMENT_CODE, DEPARTMENT_NAME, DEPARTMENT_NOTE FROM DIM_DEPARTMENT_INFO_T";
+
+		List<DepartmentVO> departmentList=new ArrayList<DepartmentVO>();
+		try {
+			ResultSet rs=this.getResultSet(sql);
+			while(rs.next())
+			{
+				DepartmentVO vo=new DepartmentVO();
+				vo.setDepartmentId(rs.getString("DEPARTMENT_ID"));
+				vo.setDepartmentname(rs.getString("DEPARTMENT_NAME"));
+				vo.setNote(rs.getString("DEPARTMENT_NOTE"));
+				//userInfoVO.setWorkCode(rs.getString(""));
+				departmentList.add(vo);
+			}
+			this.closeAll();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return departmentList;
+	}
+
 }

src/main/java/com/cmsz/dao/RoleInfoDaoSupport.java

@@ -34,8 +34,8 @@ public class RoleInfoDaoSupport extends DAOSupport {
 				vo.setName(rs.getString("ROLE_NAME"));
 				vo.setNote(rs.getString("ROLE_DESCRIPTION"));
 				vo.setSafeMode(rs.getString("SAFE_MODE"));
-				vo.setValidBegin(rs.getDate("VALID_BEGIN"));
-				vo.setValidEnd(rs.getDate("VALID_END"));
+				vo.setValidBegin(rs.getString("VALID_BEGIN"));
+				vo.setValidEnd(rs.getString("VALID_END"));
 				resultList.add(vo);
 			}
 			this.closeAll();
@@ -47,4 +47,31 @@ public class RoleInfoDaoSupport extends DAOSupport {
 		return resultList;
 	}
 
+	public List<WorkGroupVO> queryAllWorkGroup() {
+		logger.info("开始查询工作组信息-----------------");
+		String sql="SELECT ROLE_ID, ROLE_NAME, ROLE_DESCRIPTION, CREATE_TIME, MODIFY_TIME, ROLE_TYPE, VALID_BEGIN, VALID_END, SAFE_MODE FROM JCPZ_ROLE_INFO_T";
+		List<WorkGroupVO> resultList = new ArrayList<WorkGroupVO>();
+
+		try {
+			ResultSet rs=this.getResultSet(sql);
+			while(rs.next())
+			{
+				WorkGroupVO vo = new WorkGroupVO();
+				vo.setGroupId(rs.getString("ROLE_ID"));
+				vo.setGroupType(rs.getString("ROLE_TYPE"));
+				vo.setName(rs.getString("ROLE_NAME"));
+				vo.setNote(rs.getString("ROLE_DESCRIPTION"));
+				vo.setSafeMode(rs.getString("SAFE_MODE"));
+				vo.setValidBegin(rs.getString("VALID_BEGIN"));
+				vo.setValidEnd(rs.getString("VALID_END"));
+				resultList.add(vo);
+			}
+			this.closeAll();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return resultList;
+	}
 }

src/main/java/com/cmsz/vo/DepartmentVO.java

@@ -15,12 +15,46 @@ public class DepartmentVO implements Serializable {
 	
 	private String note;  // 备注
 
+//	public String getDepartmentId() {
+//		return departmentId;
+//	}
+//
+//	public void setDepartmentId(String departmentId) {
+//		this.departmentId = departmentId;
+//	}
+//
+//	public String getDepartmentname() {
+//		return departmentname;
+//	}
+//
+//	public void setDepartmentname(String departmentname) {
+//		this.departmentname = departmentname;
+//	}
+//
+//	public String getNote() {
+//		return note;
+//	}
+//
+//	public void setNote(String note) {
+//		this.note = note;
+//	}
+
+	public DepartmentVO() {
+	}
+
+	public DepartmentVO(String departmentId, String departmentname, String note) {
+		this.departmentId = departmentId;
+		this.departmentname = departmentname;
+		this.note = note;
+	}
+
 	public String getDepartmentId() {
 		return departmentId;
 	}
 
 	public void setDepartmentId(String departmentId) {
-		this.departmentId = departmentId;
+		departmentId = departmentId.equals("") ? "0" : departmentId.trim();
+		this.departmentId = departmentId ;
 	}
 
 	public String getDepartmentname() {
@@ -28,7 +62,8 @@ public class DepartmentVO implements Serializable {
 	}
 
 	public void setDepartmentname(String departmentname) {
-		this.departmentname = departmentname;
+		departmentname = departmentname.equals("") ? "0" : departmentname.trim();
+		this.departmentname = departmentname ;
 	}
 
 	public String getNote() {
@@ -36,6 +71,13 @@ public class DepartmentVO implements Serializable {
 	}
 
 	public void setNote(String note) {
+		note = note.equals("") ? "0" : note.trim();
 		this.note = note;
 	}
+
+	@Override
+	public String toString() {
+		return "DepartmentVO [departmentId=" + departmentId + ", departmentname=" + departmentname + ", note=" + note
+				+ "]";
+	}
 }
\ No newline at end of file

src/main/java/com/cmsz/vo/SysLogDTO.java

@@ -16,20 +16,29 @@ public class SysLogDTO {
 	private String dst_port;
 	private String dst_mac;
 	private String protocol;
-	private String start_time;
-	private String end_time;
+//	private String start_time;
+//	private String end_time;
 	private String primary_user;
 	private String secondary_user;
 	private String operation;
 	private String content;
-	private String dev_ip;
-	private String dev_port;
-	private String dev_mac;
-	private String authen_status;
+	private String sensitive_name;
+	private String sensitive_range;
+	private String sensitive_type;
+	private String is_remark;
+	private String remark_type;
+	private String remark_code;
+	private String menuname;
+	private String menucode;
+//	private String dev_ip;
+//	private String dev_port;
+//	private String dev_mac;
+//	private String authen_status;
 	private String log_level;
 	private String session_id;
 	private String param_len;
 	private String param;
+	private String result_status;
 	
 	public String getOperation() {
 		return operation;
@@ -104,18 +113,18 @@ public class SysLogDTO {
 	public void setProtocol(String protocol) {
 		this.protocol = protocol;
 	}
-	public String getStart_time() {
-		return start_time;
-	}
-	public void setStart_time(String start_time) {
-		this.start_time = start_time;
-	}
-	public String getEnd_time() {
-		return end_time;
-	}
-	public void setEnd_time(String end_time) {
-		this.end_time = end_time;
-	}
+//	public String getStart_time() {
+//		return start_time;
+//	}
+//	public void setStart_time(String start_time) {
+//		this.start_time = start_time;
+//	}
+//	public String getEnd_time() {
+//		return end_time;
+//	}
+//	public void setEnd_time(String end_time) {
+//		this.end_time = end_time;
+//	}
 	public String getPrimary_user() {
 		return primary_user;
 	}
@@ -128,30 +137,30 @@ public class SysLogDTO {
 	public void setSecondary_user(String secondary_user) {
 		this.secondary_user = secondary_user;
 	}
-	public String getDev_ip() {
-		return dev_ip;
-	}
-	public void setDev_ip(String dev_ip) {
-		this.dev_ip = dev_ip;
-	}
-	public String getDev_port() {
-		return dev_port;
-	}
-	public void setDev_port(String dev_port) {
-		this.dev_port = dev_port;
-	}
-	public String getDev_mac() {
-		return dev_mac;
-	}
-	public void setDev_mac(String dev_mac) {
-		this.dev_mac = dev_mac;
-	}
-	public String getAuthen_status() {
-		return authen_status;
-	}
-	public void setAuthen_status(String authen_status) {
-		this.authen_status = authen_status;
-	}
+//	public String getDev_ip() {
+//		return dev_ip;
+//	}
+//	public void setDev_ip(String dev_ip) {
+//		this.dev_ip = dev_ip;
+//	}
+//	public String getDev_port() {
+//		return dev_port;
+//	}
+//	public void setDev_port(String dev_port) {
+//		this.dev_port = dev_port;
+//	}
+//	public String getDev_mac() {
+//		return dev_mac;
+//	}
+//	public void setDev_mac(String dev_mac) {
+//		this.dev_mac = dev_mac;
+//	}
+//	public String getAuthen_status() {
+//		return authen_status;
+//	}
+//	public void setAuthen_status(String authen_status) {
+//		this.authen_status = authen_status;
+//	}
 	public String getLog_level() {
 		return log_level;
 	}
@@ -177,7 +186,79 @@ public class SysLogDTO {
 		this.param = param;
 	}
 
-/*	public String formatStr(){
+	public String getSensitive_name() {
+		return sensitive_name;
+	}
+
+	public void setSensitive_name(String sensitive_name) {
+		this.sensitive_name = sensitive_name;
+	}
+
+	public String getSensitive_range() {
+		return sensitive_range;
+	}
+
+	public void setSensitive_range(String sensitive_range) {
+		this.sensitive_range = sensitive_range;
+	}
+
+	public String getSensitive_type() {
+		return sensitive_type;
+	}
+
+	public void setSensitive_type(String sensitive_type) {
+		this.sensitive_type = sensitive_type;
+	}
+
+	public String getIs_remark() {
+		return is_remark;
+	}
+
+	public void setIs_remark(String is_remark) {
+		this.is_remark = is_remark;
+	}
+
+	public String getRemark_type() {
+		return remark_type;
+	}
+
+	public void setRemark_type(String remark_type) {
+		this.remark_type = remark_type;
+	}
+
+	public String getRemark_code() {
+		return remark_code;
+	}
+
+	public void setRemark_code(String remark_code) {
+		this.remark_code = remark_code;
+	}
+
+	public String getMenuname() {
+		return menuname;
+	}
+
+	public void setMenuname(String menuname) {
+		this.menuname = menuname;
+	}
+
+	public String getMenucode() {
+		return menucode;
+	}
+
+	public void setMenucode(String menucode) {
+		this.menucode = menucode;
+	}
+
+	public String getResult_status() {
+		return result_status;
+	}
+
+	public void setResult_status(String result_status) {
+		this.result_status = result_status;
+	}
+
+	/*	public String formatStr(){
 		StringBuffer sb = new StringBuffer();
 		Method[] methods = null;
 		methods = this.getClass().getDeclaredMethods();

src/main/java/com/cmsz/vo/UserInfoVO.java

 package com.cmsz.vo;
 
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 public class UserInfoVO implements Serializable{	
 	
@@ -10,7 +13,7 @@ public class UserInfoVO implements Serializable{
 	 */
 	private static final long serialVersionUID = -675389784876238114L;
 
-	private Long userID;
+//	private Long userID;
 	
 	private String loginUser; //登录用户（账号）
 	
@@ -22,7 +25,8 @@ public class UserInfoVO implements Serializable{
 	
 	private String validLength; //有效期
 	
-	private Date expireDate; //失效时间
+//	private Date expireDate; //失效时间
+	private String expireDate;
 	
 	private String  logLock; //锁定状态）//0，禁用；1，启用；9删除
 	
@@ -32,13 +36,184 @@ public class UserInfoVO implements Serializable{
 	
 	private String note; //备注
 
+	private String userKey;
+	private String msisdn;
+	private String mail;
+	private String updateBy;
+	private String updateTime;
+	
+//	public Long getUserID() {
+//		return userID;
+//	}
+//
+//	public void setUserID(Long userID) {
+//		this.userID = userID;
+//	}
+//
+//	public String getLoginUser() {
+//		return loginUser;
+//	}
+//
+//	public void setLoginUser(String loginUser) {
+//		this.loginUser = loginUser;
+//	}
+//
+//	public String getPassword() {
+//		return password;
+//	}
+//
+//	public void setPassword(String password) {
+//		this.password = password;
+//	}
+//
+//	public String getStaffName() {
+//		return staffName;
+//	}
+//
+//	public void setStaffName(String staffName) {
+//		this.staffName = staffName;
+//	}
+//
+//	public String getFlag() {
+//		return flag;
+//	}
+//
+//	public void setFlag(String flag) {
+//		this.flag = flag;
+//	}
+//
+//	public String getValidLength() {
+//		return validLength;
+//	}
+//
+//	public void setValidLength(String validLength) {
+//		this.validLength = validLength;
+//	}
+//
+//	public String getExpireDate() {
+//		return expireDate;
+//	}
+//
+//	public void setExpireDate(String expireDate) {
+//		this.expireDate = expireDate;
+//	}
+//
+//	public String getLogLock() {
+//		return logLock;
+//	}
+//
+//	public void setLogLock(String logLock) {
+//		this.logLock = logLock;
+//	}
+//
+//	public String getDepartmentCode() {
+//		return departmentCode;
+//	}
+//
+//	public void setDepartmentCode(String departmentCode) {
+//		this.departmentCode = departmentCode;
+//	}
+//
+//	public String getWorkCode() {
+//		return workCode;
+//	}
+//
+//	public void setWorkCode(String workCode) {
+//		this.workCode = workCode;
+//	}
+//
+//	public String getNote() {
+//		return note;
+//	}
+//
+//	public void setNote(String note) {
+//		this.note = note;
+//	}
+//
+//	@Override
+//	public String toString() {
+//		return "UserInfoVO [loginUser=" + loginUser + ", password=" + password
+//				+ ", staffName=" + staffName + ", flag=" + flag
+//				+ ", validLength=" + validLength + ", expireDate=" + expireDate
+//				+ ", logLock=" + logLock + ", departmentCode=" + departmentCode
+//				+ ", workCode=" + workCode + ", note=" + note + "]";
+//	}
+
+
+	public static UserInfoVO getaddUserInfo(UserInfoVO user){
+		Calendar calendar = Calendar.getInstance();
+		SimpleDateFormat sdfymdhms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		if (user == null) {
+			return null;
+		}
+		if(user.getUpdateBy() == null){
+			user.setUpdateBy(user.getLoginUser());
+		}
+		if(user.getUpdateTime() == null){
+			user.setUpdateTime(sdfymdhms.format(calendar.getTime()));
+		}
+		if(user.getMsisdn() == null){
+			user.setMsisdn("");
+		}
+		if(user.getMail() == null){
+			user.setMail("");
+		}
+		if(user.getNote() == null){
+			user.setNote("");
+		}
+		user.setExpireDate(user.getExpireDate().substring(0,10));
+		return user;
+	}
+
+	public static List<UserInfoVO> getUserInfoVerification(List<UserInfoVO> arry) {
+		if (arry == null) {
+			return null;
+		}
+		for (int i = 0; i < arry.size(); i++) {
+			if (arry.get(i).getLoginUser() == null) {
+				arry.get(i).setLoginUser("0");
+			}
+			if (arry.get(i).getPassword() == null) {
+				arry.get(i).setPassword("0");
+			}
+			if (arry.get(i).getStaffName() == null) {
+				arry.get(i).setStaffName("0");
+			}
+			if (arry.get(i).getFlag() == null) {
+				arry.get(i).setFlag("0");
+			}
+			if (arry.get(i).getValidLength() == null) {
+				arry.get(i).setValidLength("0");
+			}else{
+				arry.get(i).setValidLength("365");
+			}
+			if (arry.get(i).getExpireDate() == null) {
+				arry.get(i).setExpireDate("0");
+			}else{
+				arry.get(i).setExpireDate(arry.get(i).getExpireDate()+" 00:00:00");
+			}
+			if (arry.get(i).getLogLock() == null) {
+				arry.get(i).setLogLock("0");
+			}
+			if (arry.get(i).getDepartmentCode() == null) {
+				arry.get(i).setDepartmentCode("0");
+			}
+			if (arry.get(i).getWorkCode() == null) {
+				arry.get(i).setWorkCode("0");
+			}
+			if (arry.get(i).getNote() == null) {
+				arry.get(i).setNote("0");
+			}
+		}
+		return arry;
+	}
 
-	public Long getUserID() {
-		return userID;
+	public UserInfoVO() {
 	}
 
-	public void setUserID(Long userID) {
-		this.userID = userID;
+	public UserInfoVO(String staffName) {
+		this.staffName = staffName;
 	}
 
 	public String getLoginUser() {
@@ -70,7 +245,7 @@ public class UserInfoVO implements Serializable{
 	}
 
 	public void setFlag(String flag) {
-		this.flag = flag;
+		this.flag = "y";
 	}
 
 	public String getValidLength() {
@@ -81,20 +256,12 @@ public class UserInfoVO implements Serializable{
 		this.validLength = validLength;
 	}
 
-	public Date getExpireDate() {
-		return expireDate;
-	}
-	
-	public void setExpireDate(Date expireDate) {
-		this.expireDate = expireDate;
-	}
-	
 	public String getLogLock() {
 		return logLock;
 	}
 
 	public void setLogLock(String logLock) {
-		this.logLock = logLock;
+		this.logLock = "1";
 	}
 
 	public String getDepartmentCode() {
@@ -102,6 +269,7 @@ public class UserInfoVO implements Serializable{
 	}
 
 	public void setDepartmentCode(String departmentCode) {
+		departmentCode = departmentCode.equals("") ? "0" : departmentCode.trim();
 		this.departmentCode = departmentCode;
 	}
 
@@ -110,6 +278,7 @@ public class UserInfoVO implements Serializable{
 	}
 
 	public void setWorkCode(String workCode) {
+		workCode = workCode.equals("") ? "0" : workCode.trim();
 		this.workCode = workCode;
 	}
 
@@ -118,16 +287,69 @@ public class UserInfoVO implements Serializable{
 	}
 
 	public void setNote(String note) {
+		note = note.equals("") ? "0" : note.trim();
 		this.note = note;
 	}
 
+	public String getMsisdn() {
+		return msisdn;
+	}
+
+	public void setMsisdn(String msisdn) {
+		msisdn = msisdn.equals("") ? "0" : msisdn.trim();
+		this.msisdn = msisdn;
+	}
+
+	public String getMail() {
+		return mail;
+	}
+
+	public void setMail(String mail) {
+		mail = mail.equals("") ? "0" : mail.trim();
+		this.mail = mail;
+	}
+
+	public String getUserKey() {
+		return userKey;
+	}
+
+	public void setUserKey(String userKey) {
+		this.userKey = userKey;
+	}
+
+	public String getExpireDate() {
+		return expireDate;
+	}
+
+	public void setExpireDate(String expireDate) {
+		expireDate = expireDate.equals("") ? "0" : expireDate.trim();
+		this.expireDate = expireDate;
+	}
+
+	public String getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(String updateBy) {
+		updateBy = updateBy.equals("") ? "0" : updateBy.trim();
+		this.updateBy = updateBy;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		updateTime = updateTime.equals("") ? "0" : updateTime.trim();
+		this.updateTime = updateTime;
+	}
+
 	@Override
 	public String toString() {
-		return "UserInfoVO [loginUser=" + loginUser + ", password=" + password
-				+ ", staffName=" + staffName + ", flag=" + flag
-				+ ", validLength=" + validLength + ", expireDate=" + expireDate
-				+ ", logLock=" + logLock + ", departmentCode=" + departmentCode
-				+ ", workCode=" + workCode + ", note=" + note + "]";
+		return "UserInfo [loginUser=" + loginUser + ", userKey=" + userKey + ", staffName=" + staffName + ", msisdn="
+				+ msisdn + ", mail=" + mail + ", password=" + password + ", flag=" + flag + ", validLength="
+				+ validLength + ", expireDate=" + expireDate + ", updateBy=" + updateBy + ", updateTime=" + updateTime
+				+ ", logLock=" + logLock + ", departmentCode=" + departmentCode + ", workCode=" + workCode + ", note="
+				+ note + "]";
 	}
-	
 }
\ No newline at end of file

src/main/java/com/cmsz/vo/WorkGroupVO.java

@@ -2,6 +2,7 @@ package com.cmsz.vo;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 public class WorkGroupVO implements Serializable {
 
@@ -19,18 +20,114 @@ public class WorkGroupVO implements Serializable {
 	
 	private String safeMode; //权限属性
 
-	private Date validBegin;  //有效起始时间
-
-	private Date validEnd;  //有效终止时间
+//	private Date validBegin;  //有效起始时间
+//
+//	private Date validEnd;  //有效终止时间
 
 	private String note;  //备注
 
-	public String getSafeMode() {
-		return safeMode;
+
+	private String validBegin;// （有效起始时间）
+	private String validEnd;// （有效终止时间）
+
+	private String updateBy;
+	private String updateTime;
+
+//	public String getSafeMode() {
+//		return safeMode;
+//	}
+//
+//	public void setSafeMode(String safeMode) {
+//		this.safeMode = safeMode;
+//	}
+//
+//	public String getGroupId() {
+//		return groupId;
+//	}
+//
+//	public void setGroupId(String groupId) {
+//		this.groupId = groupId;
+//	}
+//
+//	public String getName() {
+//		return name;
+//	}
+//
+//	public void setName(String name) {
+//		this.name = name;
+//	}
+//
+//	public String getGroupType() {
+//		return groupType;
+//	}
+//
+//	public void setGroupType(String groupType) {
+//		this.groupType = groupType;
+//	}
+//
+//	public String getNote() {
+//		return note;
+//	}
+//
+//	public void setNote(String note) {
+//		this.note = note;
+//	}
+//
+//	public String getValidBegin() {
+//		return validBegin;
+//	}
+//
+//	public void setValidBegin(String validBegin) {
+//		this.validBegin = validBegin;
+//	}
+//
+//	public String getValidEnd() {
+//		return validEnd;
+//	}
+//
+//	public void setValidEnd(String validEnd) {
+//		this.validEnd = validEnd;
+//	}
+//
+//	public static long getSerialversionuid() {
+//		return serialVersionUID;
+//	}
+
+	public static List<WorkGroupVO> getWorkGroupVerification(List<WorkGroupVO> arry){
+		if (arry == null) {
+			return null;
+		}
+		for (int i = 0; i < arry.size(); i++) {
+			if (arry.get(i).getValidBegin() == null) {
+				arry.get(i).setValidBegin("0");
+			}else{
+				arry.get(i).setValidBegin("365");
 			}
 
-	public void setSafeMode(String safeMode) {
+			if(arry.get(i).getValidEnd() == null){
+				arry.get(i).setValidEnd("0");
+			}else{
+				arry.get(i).setValidEnd(arry.get(i).getValidEnd()+" 00:00:00");
+			}
+		}
+		return arry;
+	}
+
+
+	public WorkGroupVO(String groupId, String name, String groupType, String safeMode, String validBegin, String validEnd,
+					 String note, String updateBy, String updateTime) {
+		this.groupId = groupId;
+		this.name = name;
+		this.groupType = groupType;
 		this.safeMode = safeMode;
+		this.validBegin = validBegin;
+		this.validEnd = validEnd;
+		this.note = note;
+		this.updateBy = updateBy;
+		this.updateTime = updateTime;
+	}
+
+	public WorkGroupVO() {
 	}
 
 	public String getGroupId() {
@@ -54,34 +151,70 @@ public class WorkGroupVO implements Serializable {
 	}
 
 	public void setGroupType(String groupType) {
+		groupType = groupType.equals("") ? "0" : groupType.trim();
 		this.groupType = groupType;
 	}
 
-	public String getNote() {
-		return note;
+	public String getSafeMode() {
+		return safeMode;
 	}
 
-	public void setNote(String note) {
-		this.note = note;
+	public void setSafeMode(String safeMode) {
+		safeMode = safeMode.equals("") ? "0" : safeMode.trim();
+		this.safeMode = safeMode;
 	}
 
-	public Date getValidBegin() {
+	public String getValidBegin() {
 		return validBegin;
 	}
 
-	public void setValidBegin(Date validBegin) {
+	public void setValidBegin(String validBegin) {
+		validBegin = validBegin.equals("") ? "0" : validBegin.trim();
 		this.validBegin = validBegin;
 	}
 
-	public Date getValidEnd() {
+	public String getValidEnd() {
 		return validEnd;
 	}
 
-	public void setValidEnd(Date validEnd) {
+	public void setValidEnd(String validEnd) {
+		validEnd = validEnd.equals("") ? "0" : validEnd.trim();
 		this.validEnd = validEnd;
 	}
 
-	public static long getSerialversionuid() {
-		return serialVersionUID;
+	public String getNote() {
+		return note;
+	}
+
+	public void setNote(String note) {
+		note = note.equals("") ? "0" : note.trim();
+		this.note = note;
+	}
+
+	public String getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(String updateBy) {
+		updateBy = updateBy.equals("") ? "0" : updateBy.trim();
+		this.updateBy = updateBy;
 	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		updateTime = updateTime.equals("") ? "0" : updateTime.trim();
+		this.updateTime = updateTime;
+	}
+
+
+	@Override
+	public String toString() {
+		return "WorkGroup [groupId=" + groupId + ", name=" + name + ", groupType=" + groupType + ", safeMode="
+				+ safeMode + ", validBegin=" + validBegin + ", validEnd=" + validEnd + ", note=" + note + ", updateBy="
+				+ updateBy + ", updateTime=" + updateTime + "]";
+	}
+
 }

src/main/java/com/cmsz/ws/DepartmentService.java

@@ -8,6 +8,8 @@ import com.cmsz.vo.DepartmentVO;
 public interface DepartmentService{
 
 	/*查询部门列表*/
-	public List<DepartmentVO> queryDepartment (String departmentId);
+//	public List<DepartmentVO> queryDepartment (String departmentId);
+
+	public String queryDepartment (String departmentId);
 
 }
\ No newline at end of file

src/main/java/com/cmsz/ws/GroupService.java

@@ -7,6 +7,7 @@ import com.cmsz.vo.WorkGroupVO;
 public interface GroupService {
 
 	/*查询工作组 */
-	public List<WorkGroupVO> queryWorkGroup(String groupId);
+//	public List<WorkGroupVO> queryWorkGroup(String groupId);
 
+	public String queryWorkGroup(String groupId);
 }
\ No newline at end of file

src/main/java/com/cmsz/ws/LoginSwitchService.java

@@ -4,6 +4,7 @@ import com.cmsz.vo.ResultVO;
 
 public interface LoginSwitchService {
 
-	public ResultVO loginModChg(String flag);
+//	public ResultVO loginModChg(String flag);
 
+	public String loginModChg(String flag);
 }
\ No newline at end of file

src/main/java/com/cmsz/ws/UserService.java

@@ -8,18 +8,23 @@ import com.cmsz.vo.UserInfoVO;
 public interface UserService {
 
 	/*查询用户 */
-	public List<UserInfoVO> queryUserInfo(String loginUser);
+//	public List<UserInfoVO> queryUserInfo(String loginUser);
+	public String queryUserInfo(String loginUser);
 
 	/*新增用户*/
-	public ResultVO addUserInfo(UserInfoVO userInfo);
+//	public ResultVO addUserInfo(UserInfoVO userInfo);
+	public String addUserInfo(String userInfo);
 
 	/*修改用户 */
-	public ResultVO modifyUserInfo(UserInfoVO userInfo);
+//	public ResultVO modifyUserInfo(UserInfoVO userInfo);
+	public String modifyUserInfo(String userInfo);
 
 	/*修改密码*/
-	public ResultVO modifyUserPassword(String loginUser, String oldPassword, String newPassword);
+//	public ResultVO modifyUserPassword(String loginUser, String oldPassword, String newPassword);
+	public String modifyUserPwd(String json);
 
 	/* 删除用户*/
-	public ResultVO delUserInfo(String loginUsers);
+//	public ResultVO delUserInfo(String loginUsers);
+	public String delUserInfo(String loginUsers);
 	
 }
\ No newline at end of file

src/main/java/com/cmsz/ws/impl/DepartmentServiceImpl.java

@@ -3,6 +3,10 @@ package com.cmsz.ws.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.hp.cmsz.entity.Department;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONException;
+import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,38 +14,70 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.cmsz.dao.DepartmentDaoSupport;
 import com.cmsz.vo.DepartmentVO;
 import com.cmsz.ws.DepartmentService;
-import com.hp.cmsz.entity.Department;
-import com.hp.cmsz.repository.DepartmentDao;
 
 public class DepartmentServiceImpl implements DepartmentService {
 
     private static Logger logger = LoggerFactory.getLogger(DepartmentServiceImpl.class);
 
     @Autowired
-   // private DepartmentDaoSupport departmentDao;
+    private DepartmentDaoSupport departmentDao;
     
 	/**
 	 * 查询部门列表
 	 */
-	public List<DepartmentVO> queryDepartment (String departmentId) {
-		logger.info("开始查询部门列表信息-----------------");
-		DepartmentDaoSupport departmentDao=new DepartmentDaoSupport();
-		List<DepartmentVO> resultList = new ArrayList<DepartmentVO>();
-		//List<Department> departmentList = new ArrayList<Department>();
-		/*if (departmentId.equals("") || departmentId == null) {//为空
-			departmentList = (List<Department>) departmentDao.findAll();
-		} else {
-			departmentList = (List<Department>) departmentDao.findByDepartmentId(Long.valueOf(departmentId));
+//	public List<DepartmentVO> queryDepartment (String departmentId) {
+//		logger.info("开始查询部门列表信息-----------------");
+//		DepartmentDaoSupport departmentDao=new DepartmentDaoSupport();
+//		List<DepartmentVO> resultList = new ArrayList<DepartmentVO>();
+//		//List<Department> departmentList = new ArrayList<Department>();
+//		/*if (departmentId.equals("") || departmentId == null) {//为空
+//			departmentList = (List<Department>) departmentDao.findAll();
+//		} else {
+//			departmentList = (List<Department>) departmentDao.findByDepartmentId(Long.valueOf(departmentId));
+//		}
+//
+//	 */
+//		resultList=departmentDao.findByDepartmentId(departmentId);
+//			/*for (int i = 0; i < departmentList.size(); i++) {
+//			DepartmentVO vo = new DepartmentVO();
+//			vo.setDepartmentId(String.valueOf(departmentList.get(i).getDepartmentId()));
+//			resultList.add(vo);
+//		}*/
+//		return resultList;
+//	}
+
+	public String queryDepartment(String departmentId) {
+		String lu = "";
+		if(departmentId != null && !departmentId.equals("")){
+			JSONObject joo = JSONObject.fromObject(departmentId);
+			lu = (String) joo.get("departmentId");
 		}
 
-	 */
-		resultList=departmentDao.findByDepartmentId(departmentId);
-			/*for (int i = 0; i < departmentList.size(); i++) {
-			DepartmentVO vo = new DepartmentVO();
-			vo.setDepartmentId(String.valueOf(departmentList.get(i).getDepartmentId()));
-			resultList.add(vo);
-		}*/
-		return resultList;
+		logger.info("查询用户部门操作：参数为 "+lu);
+		List<DepartmentVO> lists = new ArrayList<DepartmentVO>();
+		if(lu!=null && !lu.equals("")){
+			lists = departmentDao.findByDepartmentId(lu);
+		} else{
+			lists = departmentDao.findAllDepartment();
 		}
+		JSONArray ja = new JSONArray();
+		try {
+			if(lists != null){
+				int num = lists.size(); //行数
+				//AES aes = new AES(); // 模糊化处理AES方式加解密
+				System.out.println("同步业务系统数量="+ num);
+				for (int i = 0; i < num; i++){
+					JSONObject jo = new JSONObject();
+					jo.put("departmentId", 	lists.get(i).getDepartmentId());
+					jo.put("departmentname", 	lists.get(i).getDepartmentname());
+					jo.put("note", 			lists.get(i).getNote());
+					ja.add(jo);
+				}
+			}
+		} catch (JSONException e) {
+			e.printStackTrace();
+		}
+		return ja.toString();
 
+	}
 }

src/main/java/com/cmsz/ws/impl/GroupServiceImpl.java

@@ -3,6 +3,9 @@ package com.cmsz.ws.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONException;
+import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,33 +18,75 @@ public class GroupServiceImpl implements GroupService {
     private static Logger logger = LoggerFactory.getLogger(GroupServiceImpl.class);
 
     @Autowired
-   // private RoleInfoDao roleInfoDao;
+    private RoleInfoDaoSupport roleInfoDao;
     
 	/**
 	 * 查询工作组
 	 */
-	public List<WorkGroupVO> queryWorkGroup(String groupId) {
-		logger.info("开始查询工作组信息-----------------");
-		RoleInfoDaoSupport roleInfoDao=new RoleInfoDaoSupport();
-		List<WorkGroupVO> resultList = new ArrayList<WorkGroupVO>();
-		//List<RoleInfo> roleInfoList = new ArrayList<RoleInfo>();;
-		/*if (groupId.equals("") || groupId == null) {//为空
-			roleInfoList = (List<RoleInfo>) roleInfoDao.findAll();
+//	public List<WorkGroupVO> queryWorkGroup(String groupId) {
+//		logger.info("开始查询工作组信息-----------------");
+//		RoleInfoDaoSupport roleInfoDao=new RoleInfoDaoSupport();
+//		List<WorkGroupVO> resultList = new ArrayList<WorkGroupVO>();
+//		//List<RoleInfo> roleInfoList = new ArrayList<RoleInfo>();;
+//		/*if (groupId.equals("") || groupId == null) {//为空
+//			roleInfoList = (List<RoleInfo>) roleInfoDao.findAll();
+//		} else {
+//			roleInfoList = (List<RoleInfo>) roleInfoDao.findByRoleId(Long.valueOf(groupId));
+//		}
+//		for (int i = 0; i < roleInfoList.size(); i++) {
+//			WorkGroupVO vo = new WorkGroupVO();
+//			vo.setGroupId(String.valueOf(roleInfoList.get(i).getRoleId()));
+//			vo.setGroupType(roleInfoList.get(i).getRoleType());
+//			vo.setName(roleInfoList.get(i).getRoleName());
+//			vo.setNote(roleInfoList.get(i).getRoleDescription());
+//			vo.setSafeMode(roleInfoList.get(i).getSafeMode());
+//			vo.setValidBegin(roleInfoList.get(i).getValidBegin());
+//			vo.setValidEnd(roleInfoList.get(i).getValidEnd());
+//			resultList.add(vo);
+//		}*/
+//		resultList=roleInfoDao.queryWorkGroup(groupId);
+//		return resultList;
+//	}
+
+	public String queryWorkGroup(String groupId) {
+		String lu = "";
+		if(groupId != null && !groupId.equals("")){
+			JSONObject joo = JSONObject.fromObject(groupId);
+			lu = (String) joo.get("groupId");
+		}
+
+		logger.info("查询用户工作组操作：参数为 "+lu);
+
+		List<WorkGroupVO> workList = new ArrayList<WorkGroupVO>();
+		if (lu != null && !lu.equals("")) {
+			workList = roleInfoDao.queryWorkGroup(lu);
 		} else {
-			roleInfoList = (List<RoleInfo>) roleInfoDao.findByRoleId(Long.valueOf(groupId));
+			workList = roleInfoDao.queryAllWorkGroup();
+		}
+
+		workList = WorkGroupVO.getWorkGroupVerification(workList);
+
+		JSONArray ja = new JSONArray();
+		try {
+			if(workList != null){
+				int num = workList.size(); //行数
+				//AES aes = new AES(); // 模糊化处理AES方式加解密
+				System.out.println("同步业务系统数量="+ num);
+				for (int i = 0; i < num; i++){
+					JSONObject jo = new JSONObject();
+					jo.put("groupId", 			workList.get(i).getGroupId());
+					jo.put("name", 				workList.get(i).getName());
+					jo.put("groupType", 			workList.get(i).getGroupType());
+					jo.put("safeMode", 			workList.get(i).getSafeMode());
+					jo.put("validBegin", 			workList.get(i).getValidBegin());
+					jo.put("validEnd", 			workList.get(i).getValidEnd());
+					jo.put("note", 				workList.get(i).getNote());
+					ja.add(jo);
+				}
+			}
+		} catch (JSONException e) {
+			e.printStackTrace();
 		}
-		for (int i = 0; i < roleInfoList.size(); i++) {
-			WorkGroupVO vo = new WorkGroupVO();
-			vo.setGroupId(String.valueOf(roleInfoList.get(i).getRoleId()));
-			vo.setGroupType(roleInfoList.get(i).getRoleType());
-			vo.setName(roleInfoList.get(i).getRoleName());
-			vo.setNote(roleInfoList.get(i).getRoleDescription());
-			vo.setSafeMode(roleInfoList.get(i).getSafeMode());
-			vo.setValidBegin(roleInfoList.get(i).getValidBegin());
-			vo.setValidEnd(roleInfoList.get(i).getValidEnd());
-			resultList.add(vo);
-		}*/
-		resultList=roleInfoDao.queryWorkGroup(groupId);
-		return resultList;
+		return ja.toString();
 	}
 }

src/main/java/com/cmsz/ws/impl/LoginSwitchServiceImpl.java

 package com.cmsz.ws.impl;
 
+import com.hp.cmsz.repository.UserInfoDao;
+import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.cmsz.vo.ResultVO;
 import com.cmsz.ws.LoginSwitchService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 public class LoginSwitchServiceImpl implements LoginSwitchService {
 
     private static Logger logger = LoggerFactory.getLogger(LoginSwitchServiceImpl.class);
 
-	public ResultVO loginModChg(String flag) {
-
-		logger.info("开始切换系统登录模式----------------");
-
-		ResultVO resultVO = new ResultVO();
-		String descript = "";
-		/*
-		if (!"0".equals(flag) && !"1".equals(flag)) {
-			descript = "开关标志无效";
-		} else {
-			try {
-				loginSwitchDAO.updateLoginModel(flag);
-			} catch (Exception e) {
-				descript = "登录模式切换失败";
-				e.printStackTrace();
-			}
-		}
-		if(descript == "")
-			resultVO.setResult("0");
-		else
-			resultVO.setResult("1");
+    @Autowired
+	private LoginSwitchService loginSwitchService;
+
+//	public ResultVO loginModChg(String flag) {
+//
+//		logger.info("开始切换系统登录模式----------------");
+//
+//		ResultVO resultVO = new ResultVO();
+//		String descript = "";
+//		/*
+//		if (!"0".equals(flag) && !"1".equals(flag)) {
+//			descript = "开关标志无效";
+//		} else {
+//			try {
+//				loginSwitchDAO.updateLoginModel(flag);
+//			} catch (Exception e) {
+//				descript = "登录模式切换失败";
+//				e.printStackTrace();
+//			}
+//		}
+//		if(descript == "")
+//			resultVO.setResult("0");
+//		else
+//			resultVO.setResult("1");
+//		*/
+//		resultVO.setResultDesc(descript);
+//		return resultVO;
+//	}
+
+	/**
+	 * 开关标志位 0 打开 1 关闭
 	 */
-		resultVO.setResultDesc(descript);
-		return resultVO;
+	public String loginModChg(String flag) {
+		JSONObject joo = JSONObject.fromObject(flag);
+		String lu = (String) joo.get("flag");
+
+		JSONObject jo = new JSONObject();
+		logger.info("切换登陆接口（开关表）操作：参数为 "+lu);
+		int code = Integer.parseInt(loginSwitchService.loginModChg(lu));
+		if(code!=1){    //失败
+			logger.info("切换失败！");
+			jo.put("result", 			"1"); // 操作结果：0 成功、1 失败
+			jo.put("resultDesc", 		"切换失败！"); // 操作结果描述
+			return jo.toString();
+		}else{
+			logger.info("切换成功！");
+			jo.put("result", 			"0"); // 操作结果：0 成功、1 失败
+			jo.put("resultDesc", 		"切换成功！"); // 操作结果描述
+			return jo.toString();
+		}
 	}
+
 }

src/main/java/com/hp/cmsz/commons/utils/AES.java

+package com.hp.cmsz.commons.utils;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * AES方式加解密算法
+ * @author venus4A
+ */
+public class AES {
+
+    /**
+     * 由服务端提供给调用者的一个用于数据加密的共享密钥
+     */
+    private String _publicKey = null;
+    /**
+     *
+     * @param publicKey  AES密钥
+     */
+    public AES() {
+        String publicKey = "jKV4GEAwBtcyehND";
+        _publicKey = publicKey;
+    }
+
+    public static final String KEY_ALGORITHM = "AES";
+    public static final String CIPHER_ALGORITHM = "AES/CTR/PKCS5Padding";
+    public static final String ivParameter = "1234567890abcdef";
+
+    /**
+     * 解密
+     * @param data
+     * @return
+     */
+    public String decrypt(String data) {
+        try {
+            SecretKeySpec skeySpec = new SecretKeySpec(_publicKey.getBytes("ASCII"), KEY_ALGORITHM);
+            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+            IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes());
+            cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
+            byte[] encrypted1 = new BASE64Decoder().decodeBuffer(data);
+            byte[] original = cipher.doFinal(encrypted1);
+            String originalString = new String(original, "utf-8");
+            return originalString;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 加密
+     * @param data
+     * @return
+     */
+    public String encrypt(String data) {
+        try {
+            IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes());
+            SecretKeySpec sKeySpec = new SecretKeySpec(_publicKey.getBytes(), KEY_ALGORITHM);
+            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+            cipher.init(Cipher.ENCRYPT_MODE, sKeySpec, iv);
+            byte[] encrypted = cipher.doFinal(data.getBytes("utf-8"));
+            return new BASE64Encoder().encode(encrypted);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        //举例
+        String str = "111111";
+        AES aes = new AES();
+        str = aes.encrypt(str);
+        System.out.println("加密="+str);
+        str = aes.decrypt(str);
+        System.out.println("解密="+str);
+    }
+}

src/main/java/com/hp/cmsz/web/IndexController.java

@@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.hp.cmsz.commons.utils.*;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.shiro.SecurityUtils;
@@ -30,16 +31,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import com.google.gson.Gson;
-import com.hp.cmsz.commons.utils.Constant;
-import com.hp.cmsz.commons.utils.DES;
-import com.hp.cmsz.commons.utils.PropertiesUtil;
-import com.hp.cmsz.commons.utils.TokenProcessor;
 import com.hp.cmsz.entity.UserInfo;
 import com.hp.cmsz.entity.XcdDetailInfoView;
 import com.hp.cmsz.entity.XcdWarningInfoView;
@@ -106,7 +100,7 @@ public class IndexController {
 		 * 
 		 * }
 		 */
-		// map.put("loginState", "loginSuccess");
+		 map.put("loginState", "loginSuccess");
 
 	
 		UserInfo userinfo = (UserInfo) SecurityUtils.getSubject().getSession()
@@ -117,25 +111,25 @@ public class IndexController {
 		}
 
 		// Add by Huach on 20140803 begin
-		return PageURLController.index;
-		// return nextUrl(request);
+//		return PageURLController.index;
+		 return nextUrl(request);
 		// Add by Huach on 20140803 end
 
 	}
 
 	@RequestMapping(method = RequestMethod.POST)
 	public String fail(HttpServletRequest request,
-	// @RequestParam(FormAuthenticationFilter.DEFAULT_USERNAME_PARAM) String
-	// userName,
+	 @RequestParam(FormAuthenticationFilter.DEFAULT_USERNAME_PARAM) String
+	 userName,
 			Model model, Map map) {
 
-		// model.addAttribute(FormAuthenticationFilter.DEFAULT_USERNAME_PARAM,
-		// userName);
-		// map.put("loginState", "loginFail");
+		 model.addAttribute(FormAuthenticationFilter.DEFAULT_USERNAME_PARAM,
+		 userName);
+		 map.put("loginState", "loginFail");
 		// Add by Huach on 20140803 begin
-		return PageURLController.index;
+//		return PageURLController.index;
 
-		// return nextUrl(request);
+		 return nextUrl(request);
 		// Add by Huach on 20140803 end
 
 	}
@@ -349,8 +343,10 @@ public class IndexController {
 						.findUserInfoByLoginName(accountId);
 				String password = "";
 				try {
-					DES des = new DES();
-					password = des.decrypt(userinfo.getPassword());
+					AES aes = new AES();
+					password = aes.decrypt(userinfo.getPassword());
+//					DES des = new DES();20180509注释
+//					password = des.decrypt(userinfo.getPassword());
 				} catch (Exception e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -381,8 +377,9 @@ public class IndexController {
 						request.setAttribute(
 								FormAuthenticationFilter.DEFAULT_ERROR_KEY_ATTRIBUTE_NAME,
 								Constant.MUST_LOGIN_FROM_4A);
-						// prompt = "该系统已被4A平台接管，请通过4A平台登录!";
-						// 强制退出认证
+						String prompt = "";
+						prompt = "该系统已被4A平台接管，请通过4A平台登录!";
+//						 强制退出认证
 						request.getSession().setAttribute(
 								Constant.CURRENT_USER_SESSION, null);
 						return PageURLController.index;
@@ -409,14 +406,14 @@ public class IndexController {
 		log.info("--4A Request IP is:" + IPof4a);
 		log.info("--Request IP is:" + remoteIP + " and query string is:"
 				+ queryString);
-		// if (IPof4a.equals(remoteIP)||(queryString!=null &&
-		// queryString.startsWith(Constant.PARAMETER_OF_4A_TOKEN) &&
-		// (queryString.split(Constant.SEPARATOR_OF_TOKEN)).length==4)) {
-		// return true;
-		// } else {
-		// return false;
-		// }
+		 if (IPof4a.equals(remoteIP)||(queryString!=null &&
+		 queryString.startsWith(Constant.PARAMETER_OF_4A_TOKEN) &&
+		 (queryString.split(Constant.SEPARATOR_OF_TOKEN)).length==4)) {
 		 return true;
+		 } else {
+		 return false;
+		 }
+//		return true;
 	}
 
 	private boolean isAuthenticate(HttpServletRequest request) {

src/main/java/com/hp/cmsz/web/authoritymanage/FourAService.java

@@ -39,13 +39,14 @@ public class FourAService {
 		
 		log.info("---Show service list in ForAService begin---");
 		UserService userService=new UserServiceImpl();
-		List<UserInfoVO> userInfoVOs=userService.queryUserInfo("");
+//		List<UserInfoVO> userInfoVOs=userService.queryUserInfo("");
+		String userInfoVOs=userService.queryUserInfo("");
 		//List<UserInfo> userInfos=authorityManageService.getAllUserInfo();
-		for (UserInfoVO user:userInfoVOs)
-		{
-			log.info("---User:"+user);
-		}
-		
+//		for (UserInfoVO user:userInfoVOs)
+//		{
+//			log.info("---User:"+user);
+//		}
+		log.info("---User:"+userInfoVOs);
 		return PageURLController.FOUR_A_SERVICE_LIST;	
 	}
 

src/main/resources/application.properties

@@ -4,8 +4,10 @@ linux_server_ip=localhost
 4a.server.ip=172.16.8.121
 4a.login.url=http://172.16.8.121:8080/venus4a/TicketloginAction.do?method=appLoginResult
 4a.logout.url=http://172.16.8.121:8080/venus4a/TicketloginAction.do?method=appExit
-4a.syslog.ip=172.16.8.117
-4a.syslog.port=514
+#4a.syslog.ip=172.16.8.117
+4a.syslog.ip=192.168.117.75
+#4a.syslog.port=514
+4a.syslog.port=51455
 local.ip.prefix=192.168
 #set system parameters for 4A by huach on 20140802 end
 #vertica database setting
@@ -28,8 +30,8 @@ jdbc.database=ccolap
 #jdbc.username=szcm
 #jdbc.password=szcm
 jdbc.driver=com.vertica.jdbc.Driver
-jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap
-#jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd
+#jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap 
+jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd
 jdbc.username=ccolap
 jdbc.password=hg.2015
 ##test

src/main/webapp/WEB-INF/server-config.wsdd

+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+ <globalConfiguration>
+  <parameter name="sendMultiRefs" value="true"/>
+  <parameter name="disablePrettyXML" value="true"/>
+  <parameter name="adminPassword" value="admin"/>
+  <parameter name="attachments.Directory" value=""/>
+  <parameter name="dotNetSoapEncFix" value="true"/>
+  <parameter name="enableNamespacePrefixOptimization" value="false"/>
+  <parameter name="sendXMLDeclaration" value="true"/>
+  <parameter name="sendXsiTypes" value="true"/>
+  <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
+  <requestFlow>
+   <handler type="java:org.apache.axis.handlers.JWSHandler">
+    <parameter name="scope" value="session"/>
+   </handler>
+   <handler type="java:org.apache.axis.handlers.JWSHandler">
+    <parameter name="scope" value="request"/>
+    <parameter name="extension" value=".jwr"/>
+   </handler>
+  </requestFlow>
+ </globalConfiguration>
+ <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <transport name="http">
+  <requestFlow>
+   <handler type="URLMapper"/>
+   <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+  </requestFlow>
+  <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
+  <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
+  <parameter name="qs.list" value="org.apache.axis.transport.http.QSListHandler"/>
+  <parameter name="qs.method" value="org.apache.axis.transport.http.QSMethodHandler"/>
+  <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>
+  <parameter name="qs.wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
+ </transport>
+ <transport name="local">
+  <responseFlow>
+   <handler type="LocalResponder"/>
+  </responseFlow>
+ </transport>
+	 <!-- 4A用户信息同步接口 -->
+     <service name="UserService" provider="java:RPC">
+		<parameter name="className" value="com.cmsz.ws.UserService"/>
+    	<parameter name="allowedMethods"  value="queryUserInfo,addUserInfo,modifyUserInfo,modifyUserPwd,delUserInfo"/>						
+     </service>
+	 <!-- 4A工作组信息同步接口 -->
+     <service name="GroupService" provider="java:RPC">
+   	    <parameter name="className" value="com.cmsz.ws.GroupService"/>
+    	<parameter name="allowedMethods"  value="queryWorkGroup"/>						
+     </service>
+     <!-- 4A部门同步接口 -->
+     <service name="DepartmentService" provider="java:RPC">
+   	    <parameter name="className" value="com.cmsz.ws.DepartmentService"/>
+    	<parameter name="allowedMethods"  value="queryDepartment"/>						
+     </service>
+	 <!-- 4A认证开关接口 -->
+     <service name="LoginSwitchService" provider="java:RPC">
+   	  	<parameter name="className" value="com.cmsz.ws.LoginSwitchService"/>
+    	<parameter name="allowedMethods"  value="loginModChg"/>						
+     </service>
+</deployment>
\ No newline at end of file

src/main/webapp/WEB-INF/web.xml

@@ -11,6 +11,7 @@
 			classpath*:/applicationContext.xml,
 		<!-- 	classpath*:/xfire-servlet.xml,
 			classpath:org/codehaus/xfire/spring/xfire.xml, -->
+
 			classpath*:/applicationContext-shiro.xml
 		</param-value>
 	</context-param>
@@ -123,42 +124,53 @@
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 
-	<!-- begin XFire 配置 -->
-
-<!-- Commented by Huach on 20140725 begin
-	<servlet>
-		<servlet-name>xfire</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>xfire</servlet-name>
-		  <url-pattern>*.ws</url-pattern>
-		</servlet-mapping>
- -->
-
-	<!-- 配合Spring容器中XFire一起工作的Servlet -->
-	<servlet>
-		<servlet-name>XFireServlet</servlet-name>
-		<display-name>XFire Servlet</display-name>
-		<servlet-class>org.codehaus.xfire.transport.http.XFireConfigurableServlet</servlet-class>
-		<!-- <servlet-class>org.codehaus.xfire.spring.XFireSpringServlet</servlet-class> -->
-	<load-on-startup>2</load-on-startup> 
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>XFireServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-	<!-- 
+	<!--&lt;!&ndash; begin XFire 配置 &ndash;&gt;-->
+
+<!--&lt;!&ndash; Commented by Huach on 20140725 begin-->
+	<!--<servlet>-->
+		<!--<servlet-name>xfire</servlet-name>-->
+		<!--<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>-->
+	<!--</servlet>-->
+	<!--<servlet-mapping>-->
+		<!--<servlet-name>xfire</servlet-name>-->
+		  <!--<url-pattern>*.ws</url-pattern>-->
+		<!--</servlet-mapping>-->
+ <!--&ndash;&gt;-->
+
+	<!--&lt;!&ndash; 配合Spring容器中XFire一起工作的Servlet &ndash;&gt;-->
+	<!--<servlet>-->
+		<!--<servlet-name>XFireServlet</servlet-name>-->
+		<!--<display-name>XFire Servlet</display-name>-->
+		<!--<servlet-class>org.codehaus.xfire.transport.http.XFireConfigurableServlet</servlet-class>-->
+		<!--&lt;!&ndash; <servlet-class>org.codehaus.xfire.spring.XFireSpringServlet</servlet-class> &ndash;&gt;-->
+	<!--<load-on-startup>2</load-on-startup> -->
+	<!--</servlet>-->
+	<!--<servlet-mapping>-->
+		<!--<servlet-name>XFireServlet</servlet-name>-->
+		<!--<url-pattern>/services/*</url-pattern>-->
+	<!--</servlet-mapping>-->
+	<!--&lt;!&ndash; -->
+	<!--<servlet>-->
+		<!--<servlet-name>xfireServlet</servlet-name>-->
+		<!--<servlet-class>org.codehaus.xfire.spring.XFireSpringServlet</servlet-class>-->
+	<!--</servlet>-->
+	<!--<servlet-mapping>-->
+		<!--<servlet-name>xfireServlet</servlet-name>-->
+		<!--<url-pattern>/services/*</url-pattern>-->
+	<!--</servlet-mapping> -->
+	 <!--&ndash;&gt;-->
+	<!--&lt;!&ndash; end XFire 配置 &ndash;&gt;-->
+
+	<!-- begin AxisServlet 配置 -->
 	<servlet>
-		<servlet-name>xfireServlet</servlet-name>
-		<servlet-class>org.codehaus.xfire.spring.XFireSpringServlet</servlet-class>
+		<servlet-name>AxisServlet</servlet-name>
+		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>xfireServlet</servlet-name>
+		<servlet-name>AxisServlet</servlet-name>
 		<url-pattern>/services/*</url-pattern>
 	</servlet-mapping>
-	 -->
-	<!-- end XFire 配置 -->
+	<!-- end AxisServlet 配置 -->
 
 	<session-config>
 		<session-timeout>20</session-timeout>

target/classes/application.properties

@@ -4,8 +4,10 @@ linux_server_ip=localhost
 4a.server.ip=172.16.8.121
 4a.login.url=http://172.16.8.121:8080/venus4a/TicketloginAction.do?method=appLoginResult
 4a.logout.url=http://172.16.8.121:8080/venus4a/TicketloginAction.do?method=appExit
-4a.syslog.ip=172.16.8.117
-4a.syslog.port=514
+#4a.syslog.ip=172.16.8.117
+4a.syslog.ip=192.168.117.75
+#4a.syslog.port=514
+4a.syslog.port=51455
 local.ip.prefix=192.168
 #set system parameters for 4A by huach on 20140802 end
 #vertica database setting
@@ -28,8 +30,8 @@ jdbc.database=ccolap
 #jdbc.username=szcm
 #jdbc.password=szcm
 jdbc.driver=com.vertica.jdbc.Driver
-jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap
-#jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd
+#jdbc.url=jdbc:vertica://hg-computer:5433/cmsz_ccolap
+jdbc.url=jdbc:vertica://192.168.127.58:5433/vertica_prd
 jdbc.username=ccolap
 jdbc.password=hg.2015
 ##test