Home Explore Help
Register Sign In
jiapeng
/
bridge
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 9 Releases 0 Wiki
Browse Source

111

XMTT 6 years ago
parent
54452abf65
commit
97feda4f67
12 changed files with 1054 additions and 388 deletions
Split View Show Diff Stats
  1. 126 0
      src/main/java/com/ekexiu/project/bridge/mail/MailService.java
  2. 36 0
      src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneResult.java
  3. 20 0
      src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneResultEntry.java
  4. 312 0
      src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneService.java
  5. 4 8
      src/main/java/com/ekexiu/project/bridge/system/dao/BridgeDao.java
  6. 9 4
      src/main/java/com/ekexiu/project/bridge/system/dao/BridgeServerDao.java
  7. 9 4
      src/main/java/com/ekexiu/project/bridge/system/dao/CollectDeviceDao.java
  8. 9 4
      src/main/java/com/ekexiu/project/bridge/system/dao/TransducerDao.java
  9. 409 0
      src/main/java/com/ekexiu/project/bridge/resource/service/BridgeService.java
  10. 4 0
      src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java
  11. 106 368
      src/main/java/com/ekexiu/project/bridge/system/service/SysService.java
  12. 10 0
      src/main/java/com/ekexiu/project/bridge/system/vo/SessionUser.java

+ 126 - 0
src/main/java/com/ekexiu/project/bridge/mail/MailService.java
View File 

@ -0,0 +1,126 @@
1 
package com.ekexiu.project.bridge.mail;
2
3 
import org.jfw.apt.annotation.Bean;
4
5 
import javax.mail.Message;
6 
import javax.mail.MessagingException;
7 
import javax.mail.Session;
8 
import javax.mail.Transport;
9 
import javax.mail.internet.AddressException;
10 
import javax.mail.internet.InternetAddress;
11 
import javax.mail.internet.MimeMessage;
12 
import java.io.UnsupportedEncodingException;
13 
import java.util.Map;
14 
import java.util.Properties;
15
16 
@Bean
17 
public class MailService {
18 
	private Properties sessionProperties = new Properties();;
19 
	private String mailHost;
20 
	private int port;
21 
	private String username;
22 
	private String password;
23 
	private Session session;
24 
	private String from;
25 
	private String nick;
26
27 
	public void setNick(String nick) {
28 
		if (nick == null)
29 
			return;
30 
		try {
31 
			this.nick = javax.mail.internet.MimeUtility.encodeText(nick);
32 
		} catch (UnsupportedEncodingException e) {
33 
			this.nick = null;
34 
		}
35 
	}
36
37 
	public String getFrom() {
38 
		return from;
39 
	}
40
41 
	public void setFrom(String from) {
42 
		this.from = from;
43 
	}
44
45 
	private Session getSession() {
46 
		if (null == this.session) {
47 
			this.session = Session.getInstance(this.sessionProperties);
48 
		}
49 
		return this.session;
50 
	}
51
52 
	public int getPort() {
53 
		return port;
54 
	}
55
56 
	public void setPort(int port) {
57 
		this.port = port;
58 
	}
59
60 
	public Properties getSessionProperties() {
61 
		return sessionProperties;
62 
	}
63
64 
	public void setSessionProperties(Map<String, String> map) {
65 
		this.sessionProperties.clear();
66 
		this.sessionProperties.putAll(map);
67 
	}
68
69 
	public String getMailHost() {
70 
		return mailHost;
71 
	}
72
73 
	public void setMailHost(String mailHost) {
74 
		this.mailHost = mailHost;
75 
	}
76
77 
	public String getUsername() {
78 
		return username;
79 
	}
80
81 
	public void setUsername(String username) {
82 
		this.username = username;
83 
	}
84
85 
	public String getPassword() {
86 
		return password;
87 
	}
88
89 
	public void setPassword(String password) {
90 
		this.password = password;
91 
	}
92
93 
	public void sendSimpleMail(String to, String template, Map<String, String> values, String subject) throws MessagingException {
94 
		Transport ts = this.getSession().getTransport();
95 
		ts.connect(this.mailHost, port, username, password);
96 
		try {
97 
			Message message = this.createSimpleMail(to, subject, template, values);
98 
			ts.sendMessage(message, message.getAllRecipients());
99 
		} finally {
100 
			try {
101 
				ts.close();
102 
			} catch (Exception e) {
103 
			}
104 
		}
105 
	}
106
107 
	private MimeMessage createSimpleMail(String to, String subject, String template, Map<String, String> values) throws AddressException, MessagingException {
108 
		MimeMessage message = new MimeMessage(session);
109 
		if (null == this.nick) {
110 
			message.setFrom(new InternetAddress(this.from));
111 
		} else {
112 
			message.setFrom(new InternetAddress(this.nick + " <" + this.from + ">"));
113 
		}
114 
		message.setRecipient(Message.RecipientType.TO, new InternetAddress(to));
115 
		message.setSubject(subject);
116
117 
		String content = template;
118 
		if (null != values && values.size() > 0) {
119 
			for (Map.Entry<String, String> entry : values.entrySet()) {
120 
				content = content.replaceAll(entry.getKey(), entry.getValue());
121 
			}
122 
		}
123 
		message.setContent(content, "text/html;charset=UTF-8");
124 
		return message;
125 
	}
126 
}

+ 36 - 0
src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneResult.java
View File 

@ -0,0 +1,36 @@
1 
package com.ekexiu.project.bridge.mobile;
2
3 
import java.util.List;
4
5 
public class MobilePhoneResult {
6 
	public static final String SUCCESS="00000";
7
8 
	private String respCode;
9 
	private String failCount;
10 
	private List<MobilePhoneResultEntry> failList;
11 
	private String smsId;
12 
	public String getRespCode() {
13 
		return respCode;
14 
	}
15 
	public void setRespCode(String respCode) {
16 
		this.respCode = respCode;
17 
	}
18 
	public String getFailCount() {
19 
		return failCount;
20 
	}
21 
	public void setFailCount(String failCount) {
22 
		this.failCount = failCount;
23 
	}
24 
	public List<MobilePhoneResultEntry> getFailList() {
25 
		return failList;
26 
	}
27 
	public void setFailList(List<MobilePhoneResultEntry> failList) {
28 
		this.failList = failList;
29 
	}
30 
	public String getSmsId() {
31 
		return smsId;
32 
	}
33 
	public void setSmsId(String smsId) {
34 
		this.smsId = smsId;
35 
	}
36 
}

+ 20 - 0
src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneResultEntry.java
View File 

@ -0,0 +1,20 @@
1 
package com.ekexiu.project.bridge.mobile;
2
3 
public class MobilePhoneResultEntry {
4 
	private String phone;
5 
	private String respCode;
6 
	public String getPhone() {
7 
		return phone;
8 
	}
9 
	public void setPhone(String phone) {
10 
		this.phone = phone;
11 
	}
12 
	public String getRespCode() {
13 
		return respCode;
14 
	}
15 
	public void setRespCode(String respCode) {
16 
		this.respCode = respCode;
17 
	}
18
19
20 
}

+ 312 - 0
src/main/java/com/ekexiu/project/bridge/mobile/MobilePhoneService.java
View File 

@ -0,0 +1,312 @@
1 
package com.ekexiu.project.bridge.mobile;
2
3 
import org.jfw.apt.annotation.Bean;
4 
import org.jfw.util.ConstData;
5 
import org.jfw.util.DateUtil;
6 
import org.jfw.util.StringUtil;
7 
import org.jfw.util.exception.JfwBaseException;
8 
import org.jfw.util.io.IoUtil;
9 
import org.jfw.util.json.JsonService;
10
11 
import java.io.ByteArrayInputStream;
12 
import java.io.IOException;
13 
import java.io.InputStream;
14 
import java.io.InputStreamReader;
15 
import java.io.OutputStream;
16 
import java.net.HttpURLConnection;
17 
import java.net.URL;
18 
import java.net.URLEncoder;
19 
import java.util.HashMap;
20 
import java.util.Locale;
21 
import java.util.Map;
22
23 
@Bean
24 
public class MobilePhoneService {
25 
	private static final Map<String, String> errorReason = new HashMap<String, String>();
26
27 
	private String accountSid = "a9e818c5ffb547c6a1db15ce45381ab0";
28 
	private String authToken = "d34f7d9bccd74d67abe8a62263a73fda";
29 
	private String restUrl = "https://api.miaodiyun.com/20150822/industrySMS/sendSMS";
30 
	private String marketUrl = "https://api.miaodiyun.com/20150822/affMarkSMS/sendSMS";
31 
	private int sendTimeout = 10 * 1000;
32 
	private int readTimeout = 10 * 1000;
33
34 
	public int getSendTimeout() {
35 
		return sendTimeout;
36 
	}
37
38 
	public void setSendTimeout(int sendTimeout) {
39 
		this.sendTimeout = sendTimeout;
40 
	}
41
42 
	public int getReadTimeout() {
43 
		return readTimeout;
44 
	}
45
46 
	public void setReadTimeout(int readTimeout) {
47 
		this.readTimeout = readTimeout;
48 
	}
49
50 
	public String getRestUrl() {
51 
		return restUrl;
52 
	}
53
54 
	public void setRestUrl(String restUrl) {
55 
		this.restUrl = restUrl;
56 
	}
57
58 
	public String getMarketUrl() {
59 
		return marketUrl;
60 
	}
61
62 
	public void setMarketUrl(String marketUrl) {
63 
		this.marketUrl = marketUrl;
64 
	}
65
66 
	public String getAccountSid() {
67 
		return accountSid;
68 
	}
69
70 
	public void setAccountSid(String accountSid) {
71 
		this.accountSid = accountSid;
72 
	}
73
74 
	public String getAuthToken() {
75 
		return authToken;
76 
	}
77
78 
	public void setAuthToken(String authToken) {
79 
		this.authToken = authToken;
80 
	}
81
82 
	private byte[] send(String content) throws IOException {
83 
		URL url = new URL(this.restUrl);
84 
		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
85 
		conn.setRequestMethod("POST");// 提交模式
86 
		conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
87 
		conn.setConnectTimeout(this.sendTimeout);// 连接超时 单位毫秒
88 
		conn.setReadTimeout(this.readTimeout);// 读取超时 单位毫秒
89 
		conn.setDoOutput(true);// 是否输入参数
90 
		byte[] bypes = content.getBytes(ConstData.UTF8);
91 
		OutputStream out = conn.getOutputStream();
92 
		try {
93 
			out.write(bypes);
94 
			out.flush();
95 
		} finally {
96 
			out.close();
97 
		}
98 
		InputStream inStream = conn.getInputStream();
99 
		return IoUtil.readStream(inStream, true);
100 
	}
101
102 
	private byte[] sendMarket(String content) throws IOException {
103 
		URL url = new URL(this.marketUrl);
104 
		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
105 
		conn.setRequestMethod("POST");// 提交模式
106 
		conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
107 
		conn.setConnectTimeout(this.sendTimeout);// 连接超时 单位毫秒
108 
		conn.setReadTimeout(this.readTimeout);// 读取超时 单位毫秒
109 
		conn.setDoOutput(true);// 是否输入参数
110 
		byte[] bypes = content.getBytes(ConstData.UTF8);
111 
		OutputStream out = conn.getOutputStream();
112 
		try {
113 
			out.write(bypes);
114 
			out.flush();
115 
		} finally {
116 
			out.close();
117 
		}
118 
		InputStream inStream = conn.getInputStream();
119 
		return IoUtil.readStream(inStream, true);
120 
	}
121
122 
	private MobilePhoneResult parse(byte[] bytes) {
123 
		return JsonService.fromJson(new InputStreamReader(new ByteArrayInputStream(bytes), ConstData.UTF8), MobilePhoneResult.class);
124 
	}
125
126 
	public void sendMessage(String to, String contentTemplate, String replateKey, String value) throws Exception {
127 
		String content = contentTemplate.replaceAll(replateKey, value);
128 
		String dateStr = DateUtil.formatDateTime(System.currentTimeMillis());
129 
		StringBuilder sb = new StringBuilder();
130 
		sb.append("accountSid=").append(this.accountSid).append("&smsContent=").append(URLEncoder.encode(content, "UTF-8")).append("&to=").append(to)
131 
				.append("&timestamp=").append(dateStr).append("&sig=");
132 
		String md5 = StringUtil.md5(this.accountSid + this.authToken + dateStr).toLowerCase(Locale.US);
133 
		sb.append(md5);
134 
		MobilePhoneResult mpr = this.parse(this.send(sb.toString()));
135 
		if (!MobilePhoneResult.SUCCESS.equals(mpr.getRespCode())) {
136 
			String reason = errorReason.get(mpr.getRespCode());
137 
			if(reason==null) reason="未知错误，请联系技术客服。";
138 
			throw new Exception(mpr.getRespCode()+"-"+reason);
139 
		}
140 
	}
141
142 
	public void sendMarketMessage(String to, String contentTemplate) throws Exception {
143 
		String dateStr = DateUtil.formatDateTime(System.currentTimeMillis());
144 
		StringBuilder sb = new StringBuilder();
145 
		sb.append("accountSid=").append(this.accountSid).append("&smsContent=").append(URLEncoder.encode(contentTemplate, "UTF-8")).append("&to=").append(to)
146 
				.append("&timestamp=").append(dateStr).append("&sig=");
147 
		String md5 = StringUtil.md5(this.accountSid + this.authToken + dateStr).toLowerCase(Locale.US);
148 
		sb.append(md5);
149 
		MobilePhoneResult mpr = this.parse(this.sendMarket(sb.toString()));
150 
		if (!MobilePhoneResult.SUCCESS.equals(mpr.getRespCode())) {
151 
			String reason = errorReason.get(mpr.getRespCode());
152 
			if(reason==null) reason="未知错误，请联系技术客服。";
153 
			throw new Exception(mpr.getRespCode()+"-"+reason);
154 
		}
155 
	}
156
157
158 
	public static void main(String[] args) throws Exception{
159 
		MobilePhoneService mps = new MobilePhoneService();
160 
		try {
161 
			mps.sendMarketMessage("13525007261", "【科袖】您收到了一个新的咨询，快去查看吧。http://a.app.qq.com/o/simple.jsp?pkgname=com.ekexiu.app退订回N");
162 
			System.out.println("send success!");
163 
		} catch (Exception e) {
164 
			throw new JfwBaseException("send error!");
165 
		}
166 
		//mps.sendMessage("18601149468","【科袖科技】请输入验证码yzm，完成手机绑定。请于1分钟内正确输入验证码。如非本人操作，请忽略本短信。科袖科技","yzm","122234");
167 
	}
168
169 
	static {
170 
		errorReason.put("00001", "未知错误，请联系技术客服。");
171 
		errorReason.put("00002", "未知的方法名");
172 
		errorReason.put("00003", "请求方式错误");
173 
		errorReason.put("00004", "参数非法，如request parameter (key) is missing");
174 
		errorReason.put("00005", "timestamp已过期");
175 
		errorReason.put("00006", "sign错误");
176 
		errorReason.put("00007", "重复提交");
177 
		errorReason.put("00008", "操作频繁");
178 
		errorReason.put("00011", "请求的xml格式不对");
179 
		errorReason.put("00012", "不支持get请求，请使用post");
180 
		errorReason.put("00013", "请求url格式不正确");
181 
		errorReason.put("00015", "时间戳超出有效时间范围");
182 
		errorReason.put("00016", "请求json格式不对");
183 
		errorReason.put("00017", "数据库操作失败");
184 
		errorReason.put("00018", "参数为空");
185 
		errorReason.put("00019", "订单已存在");
186 
		errorReason.put("00020", "用户不存在");
187 
		errorReason.put("00021", "子账号余额不足");
188 
		errorReason.put("00022", "操作频繁");
189 
		errorReason.put("00023", "开发者余额不足");
190 
		errorReason.put("00025", "手机格式不对");
191 
		errorReason.put("00026", "手机号存在");
192 
		errorReason.put("00027", "子账号名称已存在");
193 
		errorReason.put("00028", "子账号名称过长");
194 
		errorReason.put("00029", "回调开发者服务器异常");
195 
		errorReason.put("00030", "回调地址为空");
196 
		errorReason.put("00031", "appId为空或者没有传值");
197 
		errorReason.put("00032", "主叫号码为空或者没有传值");
198 
		errorReason.put("00033", "被叫号码为空或者没有传值");
199 
		errorReason.put("00034", "子账号为空或者没有传值");
200 
		errorReason.put("00035", "主叫号码和被叫号码相同");
201 
		errorReason.put("00036", "验证码格式不对（4-8位数字）");
202 
		errorReason.put("00037", "limit格式不对");
203 
		errorReason.put("00038", "start格式不对");
204 
		errorReason.put("00039", "验证码为空或者缺少此参数");
205 
		errorReason.put("00040", "用户名或者密码错误");
206 
		errorReason.put("00050", "短信或者语音验证码错误");
207 
		errorReason.put("00051", "显示号码与被叫号码一样，不允许呼叫");
208 
		errorReason.put("00052", "回拨主叫号码格式错误");
209 
		errorReason.put("00053", "被叫号码格式错误");
210 
		errorReason.put("00054", "显号格式错误");
211 
		errorReason.put("00055", "应用不包含此子账号");
212 
		errorReason.put("00056", "开发者不包含此应用");
213 
		errorReason.put("00060", "请求数据不存在");
214 
		errorReason.put("00061", "app不存在");
215 
		errorReason.put("00062", "developerId 请求错误");
216 
		errorReason.put("00063", "app未上线");
217 
		errorReason.put("00064", "请求Content-Type错误");
218 
		errorReason.put("00065", "请求Accept错误");
219 
		errorReason.put("00066", "开发者余额已被冻结");
220 
		errorReason.put("00070", "手机号未绑定");
221 
		errorReason.put("00071", "通知类型已停用或者未创建");
222 
		errorReason.put("00072", "balance格式不对（必须为大于等于0的double）");
223 
		errorReason.put("00073", "charge格式不对（必须为大于等于0的double）");
224 
		errorReason.put("00074", "主叫和子账户绑定的手机号不相同");
225 
		errorReason.put("00075", "子账户没有绑定手机号");
226 
		errorReason.put("00076", "时间格式不对");
227 
		errorReason.put("00077", "开始时间小于结束时间");
228 
		errorReason.put("00078", "开始时间和結束時間必須是同一天");
229 
		errorReason.put("00079", "服务器内部异常");
230 
		errorReason.put("00080", "子账号不存在");
231 
		errorReason.put("00081", "通知计费系统失败");
232 
		errorReason.put("00082", "参数校验失败");
233 
		errorReason.put("00083", "充值失败");
234 
		errorReason.put("00084", "子账号没有托管 不能进行充值");
235 
		errorReason.put("00085", "开发者不包含子帐号");
236 
		errorReason.put("00086", "DEMO不能进行充值");
237 
		errorReason.put("00087", "IQ类型错误");
238 
		errorReason.put("00090", "回调地址为空");
239 
		errorReason.put("00091", "没有语音");
240 
		errorReason.put("00093", "没有这个语音文件或者审核没通过");
241 
		errorReason.put("00094", "每批发送的手机号数量不得超过100个");
242 
		errorReason.put("00095", "未开通邮件短信功能");
243 
		errorReason.put("00096", "邮件模板未审核通过");
244 
		errorReason.put("00097", "邮件模板未启用");
245 
		errorReason.put("00098", "同一手机号每天只能发送n条相同的内容");
246 
		errorReason.put("00099", "相同的应用每天只能给同一手机号发送n条不同的内容");
247 
		errorReason.put("00100", "短信内容不能含有关键字");
248 
		errorReason.put("00101", "配置短信端口号失败");
249 
		errorReason.put("00102", "一个开发者只能配置一个端口");
250 
		errorReason.put("00103", "应用的邮件模板不存在");
251 
		errorReason.put("00104", "相同的应用当天给同一手机号发送短信的条数小于等于n");
252 
		errorReason.put("00105", "本开发者只能发短信给移动手机");
253 
		errorReason.put("00106", "时间戳(timestamp)参数为空");
254 
		errorReason.put("00107", "签名(sig)参数为空");
255 
		errorReason.put("00108", "时间戳(timestamp)格式错误");
256 
		errorReason.put("00109", "子账号已被关闭");
257 
		errorReason.put("00110", "解析post数据失败，post数据不符合格式要求");
258 
		errorReason.put("00111", "匹配到黑名单");
259 
		errorReason.put("00112", "accountSid参数为空");
260 
		errorReason.put("00113", "短信内容和模板匹配度过低");
261 
		errorReason.put("00114", "clientNumber参数为空");
262 
		errorReason.put("00115", "charge参数为空");
263 
		errorReason.put("00116", "charge格式不对，不能解析成double");
264 
		errorReason.put("00117", "fromTime参数为空");
265 
		errorReason.put("00118", "toTime参数为空");
266 
		errorReason.put("00119", "fromTime参数格式不正确");
267 
		errorReason.put("00120", "toTime参数格式不正确");
268 
		errorReason.put("00122", "date参数为空");
269 
		errorReason.put("00123", "date的值不在指定范围内");
270 
		errorReason.put("00124", "没有查询到话单（所以没有生成下载地址）");
271 
		errorReason.put("00125", "emailTemplateId参数为空");
272 
		errorReason.put("00126", "to参数为空");
273 
		errorReason.put("00127", "param参数为空");
274 
		errorReason.put("00128", "templateId参数为空");
275 
		errorReason.put("00129", "模板类型错误");
276 
		errorReason.put("00130", "serviceType参数为空");
277 
		errorReason.put("00131", "content参数为空");
278 
		errorReason.put("00132", "本接口的邮件短信业务只能发送移动手机");
279 
		errorReason.put("00133", "错误的业务类型");
280 
		errorReason.put("00134", "没有和内容匹配的模板");
281 
		errorReason.put("00135", "应用没有属于指定类型业务并且已审核通过、已启用的模板");
282 
		errorReason.put("00136", "开发者不能调用此接口");
283 
		errorReason.put("00137", "没有权限自定义邮件内容");
284 
		errorReason.put("00138", "短信没有签名不能发送");
285 
		errorReason.put("00139", "短信签名已进入黑名单不能发送");
286 
		errorReason.put("00140", "邮件短信发送间隔太小");
287 
		errorReason.put("00141", "一小时内发送给单个手机次数超过限制");
288 
		errorReason.put("00142", "一天内发送给单个手机次数超过限制");
289 
		errorReason.put("00143", "含有非法关键字");
290 
		errorReason.put("00144", "mobile参数为空");
291 
		errorReason.put("00145", "新手机号和旧手机号相同，不必修改");
292 
		errorReason.put("00146", "minutes格式不对（必须为大于等于0的double）");
293 
		errorReason.put("00147", "被叫次数超限");
294 
		errorReason.put("00148", "主叫次数超限");
295 
		errorReason.put("00149", "流量包大小格式错误");
296 
		errorReason.put("00150", "找不到匹配的流量包");
297 
		errorReason.put("00151", "该签名下的手机号码黑名单");
298 
		errorReason.put("00152", "端口号已被关闭");
299 
		errorReason.put("00153", "未知的手机号运营商");
300 
		errorReason.put("00154", "开发者无权限给此号码发短信");
301 
		errorReason.put("00155", "流量充值提交失败");
302 
		errorReason.put("00156", "packageId为空或者没有传值");
303 
		errorReason.put("00157", "packageId不存在");
304 
		errorReason.put("00158", "不允许发验证码");
305 
		errorReason.put("00159", "超过每秒发送频率限制");
306 
		errorReason.put("00160", "没有发送会员通知推广类短信权限");
307 
		errorReason.put("00161", "短信签名没有报备");
308 
		errorReason.put("00162", "没有发送营销短信权限");
309 
		errorReason.put("00163", "会员营销短信内容必须包含退订");
310 
		errorReason.put("00164", "端口号非法");
311 
	}
312 
}

+ 4 - 8
src/main/java/com/ekexiu/project/bridge/system/dao/BridgeDao.java
View File 

@ -1,4 +1,4 @@
1 
package com.ekexiu.project.bridge.system.dao;
1 
package com.ekexiu.project.bridge.resource.dao;
2 2
3 3 
import com.ekexiu.project.bridge.resource.po.Bridge;
4 4 
import org.jfw.apt.annotation.Nullable;
 
@ -7,7 +7,6 @@ import org.jfw.apt.orm.annotation.dao.method.From;
7 7 
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
8 8 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
9 9 
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
10 
import org.jfw.apt.orm.annotation.dao.method.Where;
11 10 
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
12 11 
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
13 12 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
 
@ -46,12 +45,9 @@ public interface BridgeDao {
46 45
47 46 
    @PageSelect
48 47 
    @OrderBy("ORDER BY CODE")
49 
    @Where("active = '1'")
50 
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable @Like String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;
51
48 
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @Nullable @Like String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;
49
52 50 
    @PageSelect
53 51 
    @OrderBy("ORDER BY CODE")
54 
    PageQueryResult<Bridge> pageQuery(Connection con,@Nullable Boolean active,@SqlColumn(handlerClass = StringHandler.class,value="ID IN(SELECT BCODE FROM USER_BRIDGE WHERE UID=?)") String uid, int pageSize, int pageNo) throws SQLException;
55
56
52 
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable Boolean active, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN(SELECT BCODE FROM USER_BRIDGE WHERE UID=?)") String uid, int pageSize, int pageNo) throws SQLException;
57 53 
}

+ 9 - 4
src/main/java/com/ekexiu/project/bridge/system/dao/BridgeServerDao.java
View File 

@ -1,14 +1,15 @@
1 
package com.ekexiu.project.bridge.system.dao;
1 
package com.ekexiu.project.bridge.resource.dao;
2 2
3 3 
import com.ekexiu.project.bridge.resource.po.BridgeServer;
4 4 
import org.jfw.apt.annotation.Nullable;
5 5 
import org.jfw.apt.orm.annotation.dao.DAO;
6 6 
import org.jfw.apt.orm.annotation.dao.method.From;
7 7 
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
8 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
8 9 
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
9 
import org.jfw.apt.orm.annotation.dao.method.Where;
10 10 
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
11 11 
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
12 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
12 13 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
13 14 
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
14 15 
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
 
@ -19,6 +20,7 @@ import org.jfw.util.PageQueryResult;
19 20
20 21 
import java.sql.Connection;
21 22 
import java.sql.SQLException;
23 
import java.util.List;
22 24
23 25 
/**
24 26 
 * Created by TT on 2018/8/8.
 
@ -43,8 +45,11 @@ public interface BridgeServerDao {
43 45 
    BridgeServer query(Connection con, String id) throws SQLException;
44 46
45 47 
    @PageSelect
46 
    @Where("active = '1'")
47 
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE WHERE CODE = ?)"}) String bridgeCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
48 
    @OrderBy("ORDER BY CODE")
49 
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE WHERE CODE = ?)"}) String bridgeCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
50
51 
    @SelectList
52 
    List<BridgeServer> queryByBridge(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM BRIDGE_SERVER WHERE BRIDGE_ID = ?)") String id) throws SQLException;
48 53 
}
49 54
50 55

+ 9 - 4
src/main/java/com/ekexiu/project/bridge/system/dao/CollectDeviceDao.java
View File 

@ -1,14 +1,15 @@
1 
package com.ekexiu.project.bridge.system.dao;
1 
package com.ekexiu.project.bridge.resource.dao;
2 2
3 3 
import com.ekexiu.project.bridge.resource.po.CollectDevice;
4 4 
import org.jfw.apt.annotation.Nullable;
5 5 
import org.jfw.apt.orm.annotation.dao.DAO;
6 6 
import org.jfw.apt.orm.annotation.dao.method.From;
7 7 
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
8 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
8 9 
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
9 
import org.jfw.apt.orm.annotation.dao.method.Where;
10 10 
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
11 11 
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
12 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
12 13 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
13 14 
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
14 15 
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
 
@ -19,6 +20,7 @@ import org.jfw.util.PageQueryResult;
19 20
20 21 
import java.sql.Connection;
21 22 
import java.sql.SQLException;
23 
import java.util.List;
22 24
23 25 
/**
24 26 
 * Created by TT on 2018/8/8.
 
@ -43,6 +45,9 @@ public interface CollectDeviceDao {
43 45 
    CollectDevice query(Connection con, String id) throws SQLException;
44 46
45 47 
    @PageSelect
46 
    @Where("active = '1'")
47 
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)"}) String serverCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
48 
    @OrderBy("ORDER BY CODE")
49 
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)"}) String serverCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
50
51 
    @SelectList
52 
    List<CollectDevice> querydByServer(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM COLLECT_DEVICE WHERE SERVER_ID = ?)") String id) throws SQLException;
48 53 
}

+ 9 - 4
src/main/java/com/ekexiu/project/bridge/system/dao/TransducerDao.java
View File 

@ -1,14 +1,15 @@
1 
package com.ekexiu.project.bridge.system.dao;
1 
package com.ekexiu.project.bridge.resource.dao;
2 2
3 3 
import com.ekexiu.project.bridge.resource.po.Transducer;
4 4 
import org.jfw.apt.annotation.Nullable;
5 5 
import org.jfw.apt.orm.annotation.dao.DAO;
6 6 
import org.jfw.apt.orm.annotation.dao.method.From;
7 7 
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
8 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
8 9 
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
9 
import org.jfw.apt.orm.annotation.dao.method.Where;
10 10 
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
11 11 
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
12 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
12 13 
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
13 14 
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
14 15 
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
 
@ -19,6 +20,7 @@ import org.jfw.util.PageQueryResult;
19 20
20 21 
import java.sql.Connection;
21 22 
import java.sql.SQLException;
23 
import java.util.List;
22 24
23 25 
/**
24 26 
 * Created by TT on 2018/8/8.
 
@ -43,6 +45,9 @@ public interface TransducerDao {
43 45 
    Transducer query(Connection con, String id) throws SQLException;
44 46
45 47 
    @PageSelect
46 
    @Where("active = '1'")
47 
    PageQueryResult<Transducer> pageQuery(Connection con, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM COLLECT_DEVICE WHERE CODE = ?)"}) String collectDeviceCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
48 
    @OrderBy("ORDER BY CODE")
49 
    PageQueryResult<Transducer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM COLLECT_DEVICE WHERE CODE = ?)"}) String collectDeviceCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
50
51 
    @SelectList
52 
    List<Transducer> queryByDevice(Connection con, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM TRANSDUCER WHERE DEVICE_ID = ?)") String id) throws SQLException;
48 53 
}

+ 409 - 0
src/main/java/com/ekexiu/project/bridge/resource/service/BridgeService.java
View File 

@ -0,0 +1,409 @@
1 
package com.ekexiu.project.bridge.resource.service;
2
3 
import com.ekexiu.project.bridge.resource.dao.BridgeDao;
4 
import com.ekexiu.project.bridge.resource.dao.BridgeServerDao;
5 
import com.ekexiu.project.bridge.resource.dao.CollectDeviceDao;
6 
import com.ekexiu.project.bridge.resource.dao.TransducerDao;
7 
import com.ekexiu.project.bridge.resource.po.Bridge;
8 
import com.ekexiu.project.bridge.resource.po.BridgeServer;
9 
import com.ekexiu.project.bridge.resource.po.CollectDevice;
10 
import com.ekexiu.project.bridge.resource.po.Transducer;
11 
import com.ekexiu.project.bridge.system.vo.SessionUser;
12 
import org.jfw.apt.annotation.Autowrie;
13 
import org.jfw.apt.annotation.Nullable;
14 
import org.jfw.apt.web.annotation.LoginUser;
15 
import org.jfw.apt.web.annotation.Path;
16 
import org.jfw.apt.web.annotation.operate.Get;
17 
import org.jfw.apt.web.annotation.operate.Post;
18 
import org.jfw.apt.web.annotation.param.JdbcConn;
19 
import org.jfw.apt.web.annotation.param.Upload;
20 
import org.jfw.util.PageQueryResult;
21 
import org.jfw.util.StringUtil;
22 
import org.jfw.util.web.fileupload.Item;
23 
import org.jfw.util.web.fileupload.UploadItemIterator;
24
25 
import java.io.File;
26 
import java.io.FileOutputStream;
27 
import java.io.InputStream;
28 
import java.io.OutputStream;
29 
import java.sql.Connection;
30 
import java.sql.SQLException;
31 
import java.util.LinkedList;
32 
import java.util.List;
33 
import java.util.concurrent.atomic.AtomicInteger;
34
35 
/**
36 
 * Created by TT on 2018/8/8.
37 
 */
38 
@Path
39 
public class BridgeService {
40
41 
    private static final AtomicInteger FN_IDX = new AtomicInteger(1);
42
43 
    private File imgPath;
44
45 
    @Autowrie
46 
    private BridgeDao bridgeDao;
47 
    @Autowrie
48 
    private BridgeServerDao bridgeServerDao;
49 
    @Autowrie
50 
    private CollectDeviceDao collectDeviceDao;
51 
    @Autowrie
52 
    private TransducerDao transducerDao;
53
54 
    public BridgeDao getBridgeDao() {
55 
        return bridgeDao;
56 
    }
57
58 
    public void setBridgeDao(BridgeDao bridgeDao) {
59 
        this.bridgeDao = bridgeDao;
60 
    }
61
62 
    public BridgeServerDao getBridgeServerDao() {
63 
        return bridgeServerDao;
64 
    }
65
66 
    public void setBridgeServerDao(BridgeServerDao bridgeServerDao) {
67 
        this.bridgeServerDao = bridgeServerDao;
68 
    }
69
70 
    public CollectDeviceDao getCollectDeviceDao() {
71 
        return collectDeviceDao;
72 
    }
73
74 
    public void setCollectDeviceDao(CollectDeviceDao collectDeviceDao) {
75 
        this.collectDeviceDao = collectDeviceDao;
76 
    }
77
78 
    public TransducerDao getTransducerDao() {
79 
        return transducerDao;
80 
    }
81
82 
    public void setTransducerDao(TransducerDao transducerDao) {
83 
        this.transducerDao = transducerDao;
84 
    }
85
86
87 
    /**
88 
     * 上传文件
89 
     *
90 
     * @param it
91 
     * @return
92 
     * @throws Exception
93 
     */
94 
    @Path("/bridge/upload")
95 
    @Post
96 
    public List<UploadFile> upload(@Upload UploadItemIterator it) throws Exception {
97 
        List<UploadFile> ret = new LinkedList<UploadFile>();
98 
        try {
99 
            while (it.hasNext()) {
100 
                Item item = it.next();
101 
                if (!item.isFormField()) {
102 
                    String name = normalizeFileName(item.getName());
103 
                    int index = name.lastIndexOf('.');
104 
                    String ext = index >= 0 ? name.substring(index + 1) : "";
105 
                    ext = ext.trim();
106 
                    long fileLen = 0;
107 
                    int len = 0;
108 
                    UploadFile uf = this.buildTargetFile(ext);
109 
                    uf.setName(name);
110 
                    File file = uf.getFn();
111 
                    ret.add(uf);
112 
                    byte[] buf = new byte[8092];
113 
                    OutputStream of = new FileOutputStream(file);
114 
                    try {
115 
                        InputStream in = item.getInputStream();
116 
                        try {
117 
                            while ((len = in.read(buf)) >= 0) {
118 
                                if (len > 0) {
119 
                                    of.write(buf, 0, len);
120 
                                    fileLen += len;
121 
                                }
122 
                            }
123 
                            uf.setSize(fileLen);
124 
                        } finally {
125 
                            in.close();
126 
                        }
127 
                    } finally {
128 
                        of.close();
129 
                    }
130 
                }
131 
            }
132 
            return ret;
133 
        } catch (Exception e) {
134 
            this.remove(ret);
135 
            throw e;
136 
        } finally {
137 
            if (it != null)
138 
                it.clean();
139 
        }
140 
    }
141
142
143
144 
    @Post
145 
    @Path("/bridge")
146 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Bridge bridge) throws SQLException {
147 
        String id = StringUtil.buildUUID();
148 
        bridge.setId(id);
149 
        bridge.setActive(true);
150 
        bridge.setCreator(sessionUser.getId());
151 
        bridge.setModifier(sessionUser.getId());
152 
        this.bridgeDao.insert(con, bridge);
153 
        return id;
154 
    }
155
156 
    @Get
157 
    @Path("/bridge/byUser")
158 
    public PageQueryResult<Bridge> query(@JdbcConn Connection con, String uid, @Nullable Boolean active, int pageSize, int pageNo) throws SQLException {
159 
        return this.bridgeDao.pageQuery(con, active, uid, pageSize, pageNo);
160 
    }
161
162
163
164 
    @Get
165 
    @Path("/bridge/qo")
166 
    public Bridge queryBridge(@JdbcConn Connection con, String id) throws SQLException {
167 
        return this.bridgeDao.query(con, id);
168 
    }
169
170 
    @Get
171 
    @Path("/bridge/delete")
172 
    public void delete(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
173 
        this.bridgeDao.logicDelete(con, sessionUser.getId(), id);
174 
    }
175
176 
    @Post
177 
    @Path("/bridge/update")
178 
    public void update(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Bridge bridge) throws SQLException {
179 
        bridge.setModifier(sessionUser.getId());
180 
        this.bridgeDao.update(con, bridge);
181 
    }
182
183 
    @Get
184 
    @Path("/bridge/pq")
185 
    public PageQueryResult<Bridge> pageQuery(@JdbcConn Connection con, @Nullable Boolean active, @Nullable String name, @Nullable String code, int pageSize, int pageNo) throws SQLException {
186 
        return this.bridgeDao.pageQuery(con, active, name == null ? null : "%" + name + "%", code, pageSize, pageNo);
187 
    }
188
189 
    @Post
190 
    @Path("/server")
191 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {
192 
        String id = StringUtil.buildUUID();
193 
        bridgeServer.setId(id);
194 
        bridgeServer.setActive(true);
195 
        bridgeServer.setCreator(sessionUser.getId());
196 
        bridgeServer.setModifier(sessionUser.getId());
197 
        this.bridgeServerDao.insert(con, bridgeServer);
198 
        return id;
199 
    }
200
201 
    @Get
202 
    @Path("/server/qo")
203 
    public BridgeServer queryServer(@JdbcConn Connection con, String id) throws SQLException {
204 
        return this.bridgeServerDao.query(con, id);
205 
    }
206
207 
    @Get
208 
    @Path("/server/pq")
209 
    public PageQueryResult<BridgeServer> pageQueryServer(@JdbcConn Connection con, @Nullable Boolean active, @Nullable String bcode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
210 
        return this.bridgeServerDao.pageQuery(con, active, bcode, code, pageSize, pageNo);
211 
    }
212
213 
    @Post
214 
    @Path("/server/update")
215 
    public void updateServer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {
216 
        bridgeServer.setModifier(sessionUser.getId());
217 
        this.bridgeServerDao.update(con, bridgeServer);
218 
    }
219
220 
    @Get
221 
    @Path("/server/byBridge")
222 
    public List<BridgeServer> queryByBridge(@JdbcConn Connection con,String id)throws SQLException {
223 
        return this.bridgeServerDao.queryByBridge(con, id);
224 
    }
225
226 
    @Get
227 
    @Path("/server/delete")
228 
    public void deleteServer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser
229 
            , String id) throws SQLException {
230 
        this.bridgeServerDao.logicDelete(con, sessionUser.getId(), id);
231 
    }
232
233 
    @Post
234 
    @Path("/device")
235 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
236 
        String id = StringUtil.buildUUID();
237 
        collectDevice.setId(id);
238 
        collectDevice.setActive(true);
239 
        collectDevice.setCreator(sessionUser.getId());
240 
        collectDevice.setModifier(sessionUser.getId());
241 
        this.collectDeviceDao.insert(con, collectDevice);
242 
        return id;
243 
    }
244
245 
    @Get
246 
    @Path("/device/qo")
247 
    public CollectDevice queryDevice(@JdbcConn Connection con, String id) throws SQLException {
248 
        return this.collectDeviceDao.query(con, id);
249 
    }
250
251 
    @Get
252 
    @Path("/device/pq")
253 
    public PageQueryResult<CollectDevice> pageQueryDevice(@JdbcConn Connection con, @Nullable Boolean active, @Nullable String scode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
254 
        return this.collectDeviceDao.pageQuery(con, active, scode, code, pageSize, pageNo);
255 
    }
256
257 
    @Post
258 
    @Path("/device/update")
259 
    public void updateDevice(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
260 
        collectDevice.setModifier(sessionUser.getId());
261 
        this.collectDeviceDao.update(con, collectDevice);
262 
    }
263
264 
    @Get
265 
    @Path("/device/delete")
266 
    public void deleteDevice(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
267 
        this.collectDeviceDao.logicDelete(con, sessionUser.getId(), id);
268 
    }
269
270 
    @Get
271 
    @Path("/device/byServer")
272 
    public List<CollectDevice> queryByServer(@JdbcConn Connection con,String id)throws SQLException {
273 
        return this.collectDeviceDao.querydByServer(con, id);
274 
    }
275
276 
    @Post
277 
    @Path("/transducer")
278 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
279 
        String id = StringUtil.buildUUID();
280 
        transducer.setId(id);
281 
        transducer.setActive(true);
282 
        transducer.setCreator(sessionUser.getId());
283 
        transducer.setModifier(sessionUser.getId());
284 
        this.transducerDao.insert(con, transducer);
285 
        return id;
286 
    }
287
288 
    @Get
289 
    @Path("/transducer/qo")
290 
    public Transducer queryTransducer(@JdbcConn Connection con, String id) throws SQLException {
291 
        return this.transducerDao.query(con, id);
292 
    }
293
294 
    @Get
295 
    @Path("/transducer/pq")
296 
    public PageQueryResult<Transducer> pageQueryTransducer(@JdbcConn Connection con, @Nullable Boolean active, @Nullable String cdCode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
297 
        return this.transducerDao.pageQuery(con, active, cdCode, code, pageSize, pageNo);
298 
    }
299
300 
    @Post
301 
    @Path("/transducer/update")
302 
    public void updateTransducer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
303 
        transducer.setModifier(sessionUser.getId());
304 
        this.transducerDao.update(con, transducer);
305 
    }
306
307 
    @Get
308 
    @Path("/transducer/delete")
309 
    public void deleteTransducer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
310 
        this.transducerDao.logicDelete(con, sessionUser.getId(), id);
311 
    }
312
313 
    @Get
314 
    @Path("/transducer/byDevice")
315 
    public List<Transducer> queryByDevcie(@JdbcConn Connection con,String id)throws SQLException {
316 
        return this.transducerDao.queryByDevice(con, id);
317 
    }
318
319
320
321 
    private void remove(List<UploadFile> list) {
322 
        for (UploadFile file : list) {
323 
            if (file.fn != null)
324 
                file.fn.delete();
325 
        }
326 
    }
327
328 
    private UploadFile buildTargetFile(String ext) {
329 
        StringBuilder sb = new StringBuilder();
330 
        sb.append(System.currentTimeMillis() / (1000 * 60 * 60 * 24));
331 
        File path = new File(this.imgPath, sb.toString());
332 
        if (!path.exists()) {
333 
            synchronized (this) {
334 
                if (!path.mkdirs())
335 
                    throw new RuntimeException("mkdir error[" + path + "]");
336 
                FN_IDX.set(1);
337 
            }
338 
        }
339 
        File file;
340 
        do {
341 
            String fn = FN_IDX.toString();
342 
            if (ext.isEmpty()) {
343 
                file = new File(path, fn);
344 
            } else {
345 
                file = new File(path, fn + "." + ext);
346 
            }
347 
            FN_IDX.incrementAndGet();
348 
        } while (file.exists());
349 
        sb.append("/").append(file.getName());
350 
        UploadFile uf = new UploadFile();
351 
        uf.setFn(file);
352 
        uf.setUri("/" + sb.toString());
353 
        return uf;
354 
    }
355
356 
    private String normalizeFileName(String fn) {
357 
        int index = fn.indexOf('\\');
358 
        if (index >= 0) {
359 
            fn = fn.substring(fn.lastIndexOf('\\') + 1);
360 
        }
361 
        index = fn.indexOf('/');
362 
        if (index >= 0) {
363 
            fn = fn.substring(fn.lastIndexOf('/') + 1);
364 
        }
365 
        if (fn.length() == 0)
366 
            throw new RuntimeException("invalid filename in Multipart/data request");
367 
        return fn;
368 
    }
369
370 
    public static class UploadFile {
371 
        private String name;
372 
        private String uri;
373 
        private long size;
374 
        private transient File fn;
375
376 
        public File getFn() {
377 
            return fn;
378 
        }
379
380 
        public void setFn(File fn) {
381 
            this.fn = fn;
382 
        }
383
384 
        public String getName() {
385 
            return name;
386 
        }
387
388 
        public void setName(String name) {
389 
            this.name = name;
390 
        }
391
392 
        public String getUri() {
393 
            return uri;
394 
        }
395
396 
        public void setUri(String uri) {
397 
            this.uri = uri;
398 
        }
399
400 
        public long getSize() {
401 
            return size;
402 
        }
403
404 
        public void setSize(long size) {
405 
            this.size = size;
406 
        }
407 
    }
408
409 
}

+ 4 - 0
src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java
View File 

@ -62,4 +62,8 @@ public interface UserDao {
62 62 
    @From(Notice.class)
63 63 
    @IncludeFixSet("modifyTime")
64 64 
    int updateNotice(Connection con, @Set String cnt,@Set String modifier) throws SQLException;
65
66 
    @Nullable
67 
    @SelectOne
68 
    User queryByAccount(Connection con,String account)throws SQLException;
65 69 
}

+ 106 - 368
src/main/java/com/ekexiu/project/bridge/system/service/SysService.java
View File 

@ -1,13 +1,6 @@
1 1 
package com.ekexiu.project.bridge.system.service;
2 2
3 
import com.ekexiu.project.bridge.resource.po.Bridge;
4 
import com.ekexiu.project.bridge.resource.po.BridgeServer;
5 
import com.ekexiu.project.bridge.resource.po.CollectDevice;
6 
import com.ekexiu.project.bridge.resource.po.Transducer;
7 
import com.ekexiu.project.bridge.system.dao.BridgeDao;
8 
import com.ekexiu.project.bridge.system.dao.BridgeServerDao;
9 
import com.ekexiu.project.bridge.system.dao.CollectDeviceDao;
10 
import com.ekexiu.project.bridge.system.dao.TransducerDao;
3 
import com.ekexiu.project.bridge.mobile.MobilePhoneService;
11 4 
import com.ekexiu.project.bridge.system.dao.UserDao;
12 5 
import com.ekexiu.project.bridge.system.po.User;
13 6 
import com.ekexiu.project.bridge.system.vo.SessionUser;
 
@ -22,28 +15,25 @@ import org.jfw.apt.web.annotation.operate.Get;
22 15 
import org.jfw.apt.web.annotation.operate.Post;
23 16 
import org.jfw.apt.web.annotation.param.JdbcConn;
24 17 
import org.jfw.apt.web.annotation.param.SessionVal;
25 
import org.jfw.apt.web.annotation.param.Upload;
26 18 
import org.jfw.util.PageQueryResult;
27 19 
import org.jfw.util.StringUtil;
20 
import org.jfw.util.context.JfwAppContext;
28 21 
import org.jfw.util.exception.JfwBaseException;
29 
import org.jfw.util.web.fileupload.Item;
30 
import org.jfw.util.web.fileupload.UploadItemIterator;
22 
import org.jfw.util.state.StateCode;
31 23
32 24 
import java.io.File;
33 
import java.io.FileOutputStream;
34 
import java.io.InputStream;
35 
import java.io.OutputStream;
36 25 
import java.sql.Connection;
37 26 
import java.sql.SQLException;
38 27 
import java.util.ArrayList;
39 
import java.util.LinkedList;
40 28 
import java.util.List;
29 
import java.util.Random;
30 
import java.util.concurrent.TimeUnit;
41 31 
import java.util.concurrent.atomic.AtomicInteger;
42 32
43 33 
/**
44 34 
 * Created by TT on 2018/8/7.
45 35 
 */
46 
@Path
36 
@Path("/sys")
47 37 
public class SysService {
48 38
49 39 
    public static final String DEFAULT_PW_STR = StringUtil.md5("123456");
 
@ -52,48 +42,14 @@ public class SysService {
52 42
53 43 
    private File imgPath;
54 44
45 
    private String regMobilePhoneReplaceKey;
46 
    private String regMobilePhoneContentTemplate;
47 
    private long timeLimitWithRegMobilePhone = 3 * 60 * 1000;
48
55 49 
    @Autowrie
56 50 
    private UserDao userDao;
57 51 
    @Autowrie
58 
    private BridgeDao bridgeDao;
59 
    @Autowrie
60 
    private BridgeServerDao bridgeServerDao;
61 
    @Autowrie
62 
    private CollectDeviceDao collectDeviceDao;
63 
    @Autowrie
64 
    private TransducerDao transducerDao;
65
66 
    public BridgeDao getBridgeDao() {
67 
        return bridgeDao;
68 
    }
69
70 
    public void setBridgeDao(BridgeDao bridgeDao) {
71 
        this.bridgeDao = bridgeDao;
72 
    }
73
74 
    public BridgeServerDao getBridgeServerDao() {
75 
        return bridgeServerDao;
76 
    }
77
78 
    public void setBridgeServerDao(BridgeServerDao bridgeServerDao) {
79 
        this.bridgeServerDao = bridgeServerDao;
80 
    }
81
82 
    public CollectDeviceDao getCollectDeviceDao() {
83 
        return collectDeviceDao;
84 
    }
85
86 
    public void setCollectDeviceDao(CollectDeviceDao collectDeviceDao) {
87 
        this.collectDeviceDao = collectDeviceDao;
88 
    }
89
90 
    public TransducerDao getTransducerDao() {
91 
        return transducerDao;
92 
    }
93
94 
    public void setTransducerDao(TransducerDao transducerDao) {
95 
        this.transducerDao = transducerDao;
96 
    }
52 
    private MobilePhoneService mobilePhoneService;
97 53
98 54 
    public UserDao getUserDao() {
99 55 
        return userDao;
 
@ -103,76 +59,28 @@ public class SysService {
103 59 
        this.userDao = userDao;
104 60 
    }
105 61
106 
    /**
107 
     * 上传文件
108 
     *
109 
     * @param it
110 
     * @return
111 
     * @throws Exception
112 
     */
113 
    @Path("/bridge/upload")
114 
    @Post
115 
    public List<UploadFile> upload(@Upload UploadItemIterator it) throws Exception {
116 
        List<UploadFile> ret = new LinkedList<UploadFile>();
117 
        try {
118 
            while (it.hasNext()) {
119 
                Item item = it.next();
120 
                if (!item.isFormField()) {
121 
                    String name = normalizeFileName(item.getName());
122 
                    int index = name.lastIndexOf('.');
123 
                    String ext = index >= 0 ? name.substring(index + 1) : "";
124 
                    ext = ext.trim();
125 
                    long fileLen = 0;
126 
                    int len = 0;
127 
                    UploadFile uf = this.buildTargetFile(ext);
128 
                    uf.setName(name);
129 
                    File file = uf.getFn();
130 
                    ret.add(uf);
131 
                    byte[] buf = new byte[8092];
132 
                    OutputStream of = new FileOutputStream(file);
133 
                    try {
134 
                        InputStream in = item.getInputStream();
135 
                        try {
136 
                            while ((len = in.read(buf)) >= 0) {
137 
                                if (len > 0) {
138 
                                    of.write(buf, 0, len);
139 
                                    fileLen += len;
140 
                                }
141 
                            }
142 
                            uf.setSize(fileLen);
143 
                        } finally {
144 
                            in.close();
145 
                        }
146 
                    } finally {
147 
                        of.close();
148 
                    }
149 
                }
150 
            }
151 
            return ret;
152 
        } catch (Exception e) {
153 
            this.remove(ret);
154 
            throw e;
155 
        } finally {
156 
            if (it != null)
157 
                it.clean();
158 
        }
62 
    public MobilePhoneService getMobilePhoneService() {
63 
        return mobilePhoneService;
159 64 
    }
160 65
66 
    public void setMobilePhoneService(MobilePhoneService mobilePhoneService) {
67 
        this.mobilePhoneService = mobilePhoneService;
68 
    }
161 69
162 70 
    @SetSession("JFW_SESSION_LOGIN_USER=result")
163 
    @Path("/user/login")
71 
    @Path("/login")
164 72 
    @Post
165 
    public SessionUser login(@JdbcConn Connection con, String account, String pw,String vc,@Nullable @SessionVal("PIC_LOGIN") String code,@DefaultValue("0") @SessionVal("TIMEOUT_PIC_LOGIN") long timeout) throws SQLException {
166 
       if(code ==null){
167 
    	   return null;
168 
       }
169 
       if(!vc.equals(code)){
170 
    	   return null;
171 
       }
172 
       if(System.currentTimeMillis()>timeout){
173 
    	   return null;
174 
       }
175 
    	User user = userDao.login(con, account, StringUtil.md5(pw));
73 
    public SessionUser login(@JdbcConn Connection con, String account, String pw, String vc, @Nullable @SessionVal("PIC_LOGIN") String code, @DefaultValue("0") @SessionVal("TIMEOUT_PIC_LOGIN") long timeout) throws SQLException {
74 
        if (code == null) {
75 
            return null;
76 
        }
77 
        if (!vc.equals(code)) {
78 
            return null;
79 
        }
80 
        if (System.currentTimeMillis() > timeout) {
81 
            return null;
82 
        }
83 
        User user = userDao.login(con, account, StringUtil.md5(pw));
176 84 
        if (user != null) {
177 85 
            return makeSessionUser(user);
178 86 
        }
 
@ -180,19 +88,19 @@ public class SysService {
180 88 
    }
181 89
182 90 
    @Get
183 
    @Path("/user")
91 
    @Path("")
184 92 
    public SessionUser get(@LoginUser SessionUser user) {
185 93 
        return user;
186 94 
    }
187 95
188 96 
    @Get
189 
    @Path("/user/logout")
97 
    @Path("/logout")
190 98 
    @InvalidSession
191 99 
    public void logout() {
192 100 
    }
193 101
194 102 
    @Post
195 
    @Path("/user/insert")
103 
    @Path("/insert")
196 104 
    public void insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
197 105 
        user.setId(StringUtil.buildUUID());
198 106 
        user.setActive(true);
 
@ -204,26 +112,26 @@ public class SysService {
204 112 
    }
205 113
206 114 
    @Get
207 
    @Path("/user/qo")
115 
    @Path("/qo")
208 116 
    public SessionUser query(@JdbcConn Connection con, String id) throws SQLException {
209 117 
        return makeSessionUser(this.userDao.query(con, id));
210 118 
    }
211 119
212 120 
    @Post
213 
    @Path("/user/update")
121 
    @Path("/update")
214 122 
    public void update(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
215 123 
        user.setModifier(sessionUser.getId());
216 124 
        this.userDao.update(con, user);
217 125 
    }
218 126
219 127 
    @Get
220 
    @Path("/user/ban")
128 
    @Path("/ban")
221 129 
    public void ban(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
222 130 
        this.userDao.ban(con, sessionUser.getId(), id);
223 131 
    }
224 132
225 133 
    @Get
226 
    @Path("/user/pq")
134 
    @Path("/pq")
227 135 
    public PageQueryResult<SessionUser> pageQuery(@JdbcConn Connection con, @Nullable String account, @Nullable String name, @Nullable String comp, int pageSize, int pageNo) throws SQLException {
228 136 
        PageQueryResult<User> pageQueryResult = this.userDao.pageQuery(con, account, name == null ? null : "%" + name + "%", comp == null ? null : "%" + comp + "%", pageSize, pageNo);
229 137 
        List<User> users = pageQueryResult.getData();
 
@ -236,7 +144,6 @@ public class SysService {
236 144 
            ret.setPageNo(pageQueryResult.getPageNo());
237 145 
            ret.setPageSize(pageQueryResult.getPageSize());
238 146 
            ret.setTotal(pageQueryResult.getTotal());
239
240 147 
            ret.setData(sessionUsers);
241 148 
            return ret;
242 149 
        }
 
@ -244,13 +151,13 @@ public class SysService {
244 151 
    }
245 152
246 153 
    @Get
247 
    @Path("/user/resetPw")
154 
    @Path("/resetPw")
248 155 
    public void resetPw(@JdbcConn(true) Connection con, String id) throws SQLException {
249 156 
        this.userDao.changePw(con, DEFAULT_PW_STR, id);
250 157 
    }
251 158
252 159 
    @Post
253 
    @Path("/user/changePw")
160 
    @Path("/changePw")
254 161 
    public void changePw(@JdbcConn(true) Connection con, String id, String oldPw, String newPw) throws SQLException, JfwBaseException {
255 162 
        User user = this.userDao.query(con, id);
256 163 
        if (user != null && StringUtil.md5(oldPw).equals(StringUtil.md5(user.getPasswd()))) {
 
@ -260,255 +167,85 @@ public class SysService {
260 167 
        }
261 168 
    }
262 169
263 
    @Post
264 
    @Path("/bridge")
265 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Bridge bridge) throws SQLException {
266 
        String id = StringUtil.buildUUID();
267 
        bridge.setId(id);
268 
        bridge.setActive(true);
269 
        bridge.setCreator(sessionUser.getId());
270 
        bridge.setModifier(sessionUser.getId());
271 
        this.bridgeDao.insert(con, bridge);
272 
        return id;
273 
    }
274
275 
    @Get
276 
    @Path("/bridge/byUser")
277 
    public PageQueryResult<Bridge> query(@JdbcConn Connection con,String uid,@Nullable Boolean active,int pageSize,int pageNo)throws SQLException{
278 
    	return this.bridgeDao.pageQuery(con, active, uid, pageSize, pageNo);
279 
    }
280
281 
    @Get
282 
    @Path("/bridge/qo")
283 
    public Bridge queryBridge(@JdbcConn Connection con, String id) throws SQLException {
284 
        return this.bridgeDao.query(con, id);
285 
    }
286
287 
    @Get
288 
    @Path("/bridge/delete")
289 
    public void delete(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
290 
        this.bridgeDao.logicDelete(con, sessionUser.getId(), id);
291 
    }
292
293 
    @Post
294 
    @Path("/bridge/update")
295 
    public void update(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Bridge bridge) throws SQLException {
296 
        bridge.setModifier(sessionUser.getId());
297 
        this.bridgeDao.update(con, bridge);
298 
    }
299
300 
    @Get
301 
    @Path("/bridge/pq")
302 
    public PageQueryResult<Bridge> pageQuery(@JdbcConn Connection con, @Nullable String name, @Nullable String code, int pageSize, int pageNo) throws SQLException {
303 
        return this.bridgeDao.pageQuery(con, name == null ? null : "%" + name + "%", code, pageSize, pageNo);
304 
    }
305
306 
    @Post
307 
    @Path("/bridgeServer")
308 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {
309 
        String id = StringUtil.buildUUID();
310 
        bridgeServer.setId(id);
311 
        bridgeServer.setActive(true);
312 
        bridgeServer.setCreator(sessionUser.getId());
313 
        bridgeServer.setModifier(sessionUser.getId());
314 
        this.bridgeServerDao.insert(con, bridgeServer);
315 
        return id;
316 
    }
317
318 
    @Get
319 
    @Path("/bridgeServer/qo")
320 
    public BridgeServer queryBS(@JdbcConn Connection con, String id) throws SQLException {
321 
        return this.bridgeServerDao.query(con, id);
322 
    }
323
324 
    @Get
325 
    @Path("/bridgeServer/pq")
326 
    public PageQueryResult<BridgeServer> pageQueryBS(@JdbcConn Connection con, @Nullable String bcode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
327 
        return this.bridgeServerDao.pageQuery(con, bcode, code, pageSize, pageNo);
328 
    }
329
330 
    @Post
331 
    @Path("/bridgeServer/update")
332 
    public void updateBS(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {
333 
        bridgeServer.setModifier(sessionUser.getId());
334 
        this.bridgeServerDao.update(con, bridgeServer);
335 
    }
336
337 
    @Get
338 
    @Path("/bridgeServer/delete")
339 
    public void deleteBS(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser
340 
            , String id) throws SQLException {
341 
        this.bridgeServerDao.logicDelete(con, sessionUser.getId(), id);
342 
    }
343
344 
    @Post
345 
    @Path("/collectDevice")
346 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
347 
        String id = StringUtil.buildUUID();
348 
        collectDevice.setId(id);
349 
        collectDevice.setActive(true);
350 
        collectDevice.setCreator(sessionUser.getId());
351 
        collectDevice.setModifier(sessionUser.getId());
352 
        this.collectDeviceDao.insert(con, collectDevice);
353 
        return id;
354 
    }
355
356 
    @Get
357 
    @Path("/collectDevice/qo")
358 
    public CollectDevice queryCD(@JdbcConn Connection con, String id) throws SQLException {
359 
        return this.collectDeviceDao.query(con, id);
360 
    }
361
362 
    @Get
363 
    @Path("/collectDevice/pq")
364 
    public PageQueryResult<CollectDevice> pageQueryCD(@JdbcConn Connection con, @Nullable String scode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
365 
        return this.collectDeviceDao.pageQuery(con, scode, code, pageSize, pageNo);
366 
    }
367
368 
    @Post
369 
    @Path("/collectDevice/update")
370 
    public void updateCD(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
371 
        collectDevice.setModifier(sessionUser.getId());
372 
        this.collectDeviceDao.update(con, collectDevice);
373 
    }
374
375 
    @Get
376 
    @Path("/collectDevice/delete")
377 
    public void deleteCD(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
378 
        this.collectDeviceDao.logicDelete(con, sessionUser.getId(), id);
379 
    }
380
381 
    @Post
382 
    @Path("/transducer")
383 
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
384 
        String id = StringUtil.buildUUID();
385 
        transducer.setId(id);
386 
        transducer.setActive(true);
387 
        transducer.setCreator(sessionUser.getId());
388 
        transducer.setModifier(sessionUser.getId());
389 
        this.transducerDao.insert(con, transducer);
390 
        return id;
391 
    }
392
393 
    @Get
394 
    @Path("/transducer/qo")
395 
    public Transducer queryTransducer(@JdbcConn Connection con, String id) throws SQLException {
396 
        return this.transducerDao.query(con, id);
397 
    }
398
399 
    @Get
400 
    @Path("/transducer/pq")
401 
    public PageQueryResult<Transducer> pageQueryT(@JdbcConn Connection con, @Nullable String cdCode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
402 
        return this.transducerDao.pageQuery(con, cdCode, code, pageSize, pageNo);
403 
    }
404
405 
    @Post
406 
    @Path("/transducer/update")
407 
    public void updateTransducer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
408 
        transducer.setModifier(sessionUser.getId());
409 
        this.transducerDao.update(con, transducer);
410 
    }
411
412 
    @Get
413 
    @Path("/transducer/delete")
414 
    public void deleteTransducer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
415 
        this.transducerDao.logicDelete(con, sessionUser.getId(), id);
416 
    }
417
418 170 
    @Post
419 171 
    @Path("/notice")
420 
    public void updateNotice(@JdbcConn(true)Connection con,@LoginUser SessionUser sessionUser,String cnt)throws SQLException {
172 
    public void updateNotice(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String cnt) throws SQLException {
421 173 
        this.userDao.updateNotice(con, cnt, sessionUser.getId());
422 174 
    }
423 175
424
425 
    private void remove(List<UploadFile> list) {
426 
        for (UploadFile file : list) {
427 
            if (file.fn != null)
428 
                file.fn.delete();
429 
        }
430 
    }
431
432 
    private UploadFile buildTargetFile(String ext) {
433 
        StringBuilder sb = new StringBuilder();
434 
        sb.append(System.currentTimeMillis() / (1000 * 60 * 60 * 24));
435 
        File path = new File(this.imgPath, sb.toString());
436 
        if (!path.exists()) {
437 
            synchronized (this) {
438 
                if (!path.mkdirs())
439 
                    throw new RuntimeException("mkdir error[" + path + "]");
440 
                FN_IDX.set(1);
176 
    @SetSession("")
177 
    @Get
178 
    @Path("/regmobilephone")
179 
    public String regMobilePhone(@JdbcConn(false) Connection con, String account, @DefaultValue("true") boolean checkExists, String vc, @Nullable @SessionVal(value = "PIC_MOBILE", remove = true) String code, @Nullable String token)
180 
            throws JfwBaseException, SQLException {
181 
        if (token != null) {
182 
            if (!vc.equals(code)) {
183 
                throw new JfwBaseException(20001, "valid code error");
441 184 
            }
442 
        }
443 
        File file;
444 
        do {
445 
            String fn = FN_IDX.toString();
446 
            if (ext.isEmpty()) {
447 
                file = new File(path, fn);
448 
            } else {
449 
                file = new File(path, fn + "." + ext);
185 
        } else {
186 
            if (code == null) {
187 
                throw new IllegalArgumentException("not found session value:verification");
188 
            }
189 
            if (!vc.toUpperCase().equals(code)) {
190 
                throw new JfwBaseException(20001, "valid code error");
450 191 
            }
451 
            FN_IDX.incrementAndGet();
452 
        } while (file.exists());
453 
        sb.append("/").append(file.getName());
454 
        UploadFile uf = new UploadFile();
455 
        uf.setFn(file);
456 
        uf.setUri("/" + sb.toString());
457 
        return uf;
458 
    }
459
460 
    private String normalizeFileName(String fn) {
461 
        int index = fn.indexOf('\\');
462 
        if (index >= 0) {
463 
            fn = fn.substring(fn.lastIndexOf('\\') + 1);
464 
        }
465 
        index = fn.indexOf('/');
466 
        if (index >= 0) {
467 
            fn = fn.substring(fn.lastIndexOf('/') + 1);
468 
        }
469 
        if (fn.length() == 0)
470 
            throw new RuntimeException("invalid filename in Multipart/data request");
471 
        return fn;
472 
    }
473
474 
    public static class UploadFile {
475 
        private String name;
476 
        private String uri;
477 
        private long size;
478 
        private transient File fn;
479
480 
        public File getFn() {
481 
            return fn;
482 
        }
483
484 
        public void setFn(File fn) {
485 
            this.fn = fn;
486 
        }
487
488 
        public String getName() {
489 
            return name;
490 
        }
491
492 
        public void setName(String name) {
493 
            this.name = name;
494 
        }
495
496 
        public String getUri() {
497 
            return uri;
498 192 
        }
499
500 
        public void setUri(String uri) {
501 
            this.uri = uri;
193 
        if (checkExists) {
194 
            User user = this.userDao.queryByAccount(con, account);
195 
            if (null != user) {
196 
                return null;
197 
            }
502 198 
        }
503
504 
        public long getSize() {
505 
            return size;
199 
        StateCode<String, String> sc = new StateCode<String, String>();
200 
        final String key = JfwAppContext.cacheObjectAndGenKey(sc);
201 
        try {
202 
            Random rd = new Random();
203 
            int vi = rd.nextInt(10000);
204 
            String vcode = String.format("%04d", vi);
205 
            sc.setKey(account);
206 
            sc.setValue(vcode);
207 
            this.mobilePhoneService.sendMessage(account, this.regMobilePhoneContentTemplate, this.regMobilePhoneReplaceKey, vcode);
208 
            long ct = System.currentTimeMillis();
209 
            long et = ct + this.timeLimitWithRegMobilePhone + 5000;
210 
            sc.setBuildTime(ct);
211 
            sc.setExpiredTime(et);
212 
            JfwAppContext.getScheduledExecutorService().schedule(new Runnable() {
213 
                @Override
214 
                public void run() {
215 
                    JfwAppContext.removeCachedObject(key);
216 
                }
217 
            }, this.timeLimitWithRegMobilePhone + 10000, TimeUnit.MILLISECONDS);
218 
        } catch (Exception e) {
219 
            JfwAppContext.removeCachedObject(key);
220 
            throw new JfwBaseException(10012, "send mobile phone message to " + account + " error", e);
506 221 
        }
222 
        return key;
223 
    }
224
225 
    //@Post
226 
    //@Path("/resetPasswordWithMobilePhone")
227 
    //public boolean resetPassword(@JdbcConn(true) Connection con, String state, String mobilePhone, String pw, String vc) throws SQLException, JfwBaseException {
228 
    //    @SuppressWarnings("unchecked")
229 
    //    StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
230 
    //    if (sc == null) {
231 
    //        throw new JfwBaseException("验证超时");
232 
    //    }
233 
    //    if (sc.getExpiredTime() < System.currentTimeMillis()) {
234 
    //        throw new JfwBaseException("验证超时");
235 
    //    }
236 
    //    try {
237 
    //        if (!sc.getKey().equals(mobilePhone) || !sc.getValue().equals(vc))
238 
    //            return false;
239 
    //        int ret = this.userDao.updatePasswdWithMobile(con, StringUtil.md5(pw), DATE.format(new Date()), mobilePhone);
240 
    //        if (ret == 0) {
241 
    //            return this.userDao.updatePasswordWithMobileOrEmail(con, StringUtil.md5(pw), mobilePhone) > 0;
242 
    //        }
243 
    //        return ret > 0;
244 
    //    } finally {
245 
    //        JfwAppContext.removeCachedObject(state);
246 
    //    }
247 
    //}
507 248
508 
        public void setSize(long size) {
509 
            this.size = size;
510 
        }
511 
    }
512 249
513 250 
    private static SessionUser makeSessionUser(User user) {
514 251 
        SessionUser sessionUser = new SessionUser();
 
@ -521,6 +258,7 @@ public class SysService {
521 258 
        sessionUser.setPhone(user.getPhone());
522 259 
        sessionUser.setRemark(user.getRemark());
523 260 
        sessionUser.setType(user.getType());
261 
        sessionUser.setActive(user.isActive());
524 262 
        return sessionUser;
525 263 
    }
526 264 
}

+ 10 - 0
src/main/java/com/ekexiu/project/bridge/system/vo/SessionUser.java
View File 

@ -15,6 +15,8 @@ public class SessionUser {
15 15 
    private String remark;
16 16 
    private int type;
17 17
18 
    private boolean active;;
19
18 20 
    public String getId() {
19 21 
        return id;
20 22 
    }
 
@ -86,4 +88,12 @@ public class SessionUser {
86 88 
    public void setType(int type) {
87 89 
        this.type = type;
88 90 
    }
91
92 
    public boolean isActive() {
93 
        return active;
94 
    }
95
96 
    public void setActive(boolean active) {
97 
        this.active = active;
98 
    }
89 99 
}