|
|
@@ -49,6 +49,8 @@ public class Controller extends BaseClass {
|
|
|
public String hostipport;//访问地址url 如http://localhost:8080 http://127.0.0.1:8080
|
|
|
public Date sysdate;
|
|
|
|
|
|
+ public String wechatID;
|
|
|
+
|
|
|
/**
|
|
|
* 构造函数
|
|
|
*
|
|
|
@@ -101,6 +103,12 @@ public class Controller extends BaseClass {
|
|
|
} else if ($classname.contains("publicmethod")) {
|
|
|
siteid = (String) content.getOrDefault("siteid", parameter.defaultsiteid);
|
|
|
}
|
|
|
+
|
|
|
+ if (this.content.containsKey("wechatID")) {
|
|
|
+ wechatID = content.getString("wechatID");
|
|
|
+// System.err.println(wechatID);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -234,34 +242,34 @@ public class Controller extends BaseClass {
|
|
|
lastday = nowday;
|
|
|
userRequestLogMap.clear();
|
|
|
}
|
|
|
-// System.err.println(userid);
|
|
|
-// if (!userRequestLogMap.containsKey(userid)) {
|
|
|
-// Rows rows = dbConnect.runSqlQuery("select tuserrequestlogid from tuserrequestlog where siteid='" + siteid + "' and tenterprise_userid='" + userid + "' and convert(varchar(10),fdate,120)=convert(varchar(10),getdate(),120) ");
|
|
|
-// if (rows.isEmpty()) {
|
|
|
-// long tuserrequestlogid = createTableID("tuserrequestlog", "tuserrequestlogid");
|
|
|
-// SQLFactory sqlFactory = new SQLFactory(this, "请求日志插入");
|
|
|
-// sqlFactory.addParameter("tuserrequestlogid", tuserrequestlogid);
|
|
|
-// sqlFactory.addParameter("siteid", siteid);
|
|
|
-// sqlFactory.addParameter("tenterprise_userid", userid);
|
|
|
-// sqlFactory.addParameter("tagentsid", tagentsid);
|
|
|
-// String status = dbConnect.runSqlUpdate(sqlFactory.getSQL());
|
|
|
-// if ("true".equals(status)) {
|
|
|
-// userRequestLogMap.put(userid, tuserrequestlogid);
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// userRequestLogMap.put(userid, rows.get(0).getLong("tuserrequestlogid"));
|
|
|
-// }
|
|
|
-// userRequestLogcountMap.put(userid, 1L);
|
|
|
-// } else {
|
|
|
-// long count = userRequestLogcountMap.get(userid) + 1;
|
|
|
-// if (count > 9) {
|
|
|
-// userRequestLogcountMap.put(userid, 1L);
|
|
|
-// long tuserrequestlogid = userRequestLogMap.get(userid);
|
|
|
-// dbConnect.runSqlUpdate("update tuserrequestlog set flastrequestdate=getdate(),frequesttimes=frequesttimes+" + count + " where siteid='" + siteid + "' and tenterprise_userid='" + userid + "' and tuserrequestlogid=" + tuserrequestlogid);
|
|
|
-// } else {
|
|
|
-// userRequestLogcountMap.put(userid, count);
|
|
|
-// }
|
|
|
-// }
|
|
|
+ System.err.println(userid);
|
|
|
+ if (!userRequestLogMap.containsKey(userid)) {
|
|
|
+ Rows rows = dbConnect.runSqlQuery("select tuserrequestlogid from tuserrequestlog where siteid='" + siteid + "' and tenterprise_userid='" + userid + "' and convert(varchar(10),fdate,120)=convert(varchar(10),getdate(),120) ");
|
|
|
+ if (rows.isEmpty()) {
|
|
|
+ long tuserrequestlogid = createTableID("tuserrequestlog", "tuserrequestlogid");
|
|
|
+ SQLFactory sqlFactory = new SQLFactory(this, "请求日志插入");
|
|
|
+ sqlFactory.addParameter("tuserrequestlogid", tuserrequestlogid);
|
|
|
+ sqlFactory.addParameter("siteid", siteid);
|
|
|
+ sqlFactory.addParameter("tenterprise_userid", userid);
|
|
|
+ sqlFactory.addParameter("tagentsid", tagentsid);
|
|
|
+ String status = dbConnect.runSqlUpdate(sqlFactory.getSQL());
|
|
|
+ if ("true".equals(status)) {
|
|
|
+ userRequestLogMap.put(userid, tuserrequestlogid);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ userRequestLogMap.put(userid, rows.get(0).getLong("tuserrequestlogid"));
|
|
|
+ }
|
|
|
+ userRequestLogcountMap.put(userid, 1L);
|
|
|
+ } else {
|
|
|
+ long count = userRequestLogcountMap.get(userid) + 1;
|
|
|
+ if (count > 9) {
|
|
|
+ userRequestLogcountMap.put(userid, 1L);
|
|
|
+ long tuserrequestlogid = userRequestLogMap.get(userid);
|
|
|
+ dbConnect.runSqlUpdate("update tuserrequestlog set flastrequestdate=getdate(),frequesttimes=frequesttimes+" + count + " where siteid='" + siteid + "' and tenterprise_userid='" + userid + "' and tuserrequestlogid=" + tuserrequestlogid);
|
|
|
+ } else {
|
|
|
+ userRequestLogcountMap.put(userid, count);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}.start();
|
|
|
}
|
|
|
@@ -496,6 +504,8 @@ public class Controller extends BaseClass {
|
|
|
docfactory.addParameter("siteid", siteid);
|
|
|
docfactory.addParameter("ownertable", ownertable);
|
|
|
docfactory.addParameter_in("ownerid", ownerids);
|
|
|
+ String sql = docfactory.getSQL();
|
|
|
+ System.err.println(sql);
|
|
|
return dbConnect.runSqlQuery(docfactory.getSQL()).toRowsMap("ownerid");
|
|
|
}
|
|
|
|
|
|
@@ -534,16 +544,16 @@ public class Controller extends BaseClass {
|
|
|
*/
|
|
|
public String getHeadPic(long userid) {
|
|
|
// if (!headPicMap.containsKey(userid)) {
|
|
|
- Rows rows = getAttachmentUrl("tenterprise_users", String.valueOf(userid), "headportrait");
|
|
|
- if (!rows.isEmpty()) {
|
|
|
- System.err.println(rows.get(0).getString("fobsurl_thumbnail"));
|
|
|
- if(rows.get(0).getString("fobsurl_thumbnail").equals("")){
|
|
|
- headPicMap.put(userid, rows.get(0).getString("fobsurl"));
|
|
|
- }else{
|
|
|
- headPicMap.put(userid, rows.get(0).getString("fobsurl_thumbnail"));
|
|
|
- }
|
|
|
-
|
|
|
+ Rows rows = getAttachmentUrl("tenterprise_users", String.valueOf(userid), "headportrait");
|
|
|
+ if (!rows.isEmpty()) {
|
|
|
+ System.err.println(rows.get(0).getString("fobsurl_thumbnail"));
|
|
|
+ if (rows.get(0).getString("fobsurl_thumbnail").equals("")) {
|
|
|
+ headPicMap.put(userid, rows.get(0).getString("fobsurl"));
|
|
|
+ } else {
|
|
|
+ headPicMap.put(userid, rows.get(0).getString("fobsurl_thumbnail"));
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
// }
|
|
|
return headPicMap.getOrDefault(userid, "");
|
|
|
}
|
|
|
@@ -668,7 +678,7 @@ public class Controller extends BaseClass {
|
|
|
/**
|
|
|
* 通知前端执行指定方法
|
|
|
*/
|
|
|
- public void sendSystemWebSocketMessage(String classname, String method,long userid) {
|
|
|
+ public void sendSystemWebSocketMessage(String classname, String method, long userid) {
|
|
|
if (parameter.websocketClients.containsKey(userid)) {
|
|
|
JSONObject methodobject = new JSONObject();
|
|
|
methodobject.put("type", "callmethod");
|
|
|
@@ -679,6 +689,7 @@ public class Controller extends BaseClass {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 通知前端执行指定方法
|
|
|
*/
|