|
|
@@ -8,8 +8,11 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
@@ -25,11 +28,13 @@ import org.springframework.web.bind.annotation.ResponseStatus;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
|
import com.uas.platform.b2b.dao.UserDao;
|
|
|
+import com.uas.platform.b2b.model.AccessToken;
|
|
|
import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.EnterpriseDetail;
|
|
|
import com.uas.platform.b2b.model.QueriableMember;
|
|
|
import com.uas.platform.b2b.model.QueriableUser;
|
|
|
import com.uas.platform.b2b.model.User;
|
|
|
+import com.uas.platform.b2b.service.AccessTokenService;
|
|
|
import com.uas.platform.b2b.service.AttachService;
|
|
|
import com.uas.platform.b2b.service.EnterpriseService;
|
|
|
import com.uas.platform.b2b.service.MonthProdioService;
|
|
|
@@ -63,13 +68,16 @@ public class PublicQueryController {
|
|
|
|
|
|
@Autowired
|
|
|
private AttachService attachService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private UserDao userDao;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private EnterpriseDao enterpriseDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private AccessTokenService accessTokenService;
|
|
|
+
|
|
|
/**
|
|
|
* 按企业名称、简称、UU号等查找企业信息
|
|
|
*
|
|
|
@@ -79,8 +87,7 @@ public class PublicQueryController {
|
|
|
@RequestMapping(value = "/members", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ResponseStatus(value = HttpStatus.OK)
|
|
|
- public ModelMap queryEnterprise(String name, String shortName, Long uu)
|
|
|
- throws UnsupportedEncodingException {
|
|
|
+ public ModelMap queryEnterprise(String name, String shortName, Long uu) throws UnsupportedEncodingException {
|
|
|
ModelMap returnMap = new ModelMap();
|
|
|
if (!StringUtils.isEmpty(name)) {
|
|
|
List<Enterprise> enterprises = enterpriseService.findByName(name);
|
|
|
@@ -88,11 +95,9 @@ public class PublicQueryController {
|
|
|
returnMap.put("name", QueriableMember.getMembers(enterprises));
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(shortName)) {
|
|
|
- Set<Enterprise> enterprises = enterpriseService
|
|
|
- .findByShortName(shortName);
|
|
|
+ Set<Enterprise> enterprises = enterpriseService.findByShortName(shortName);
|
|
|
if (!CollectionUtils.isEmpty(enterprises))
|
|
|
- returnMap.put("shortName",
|
|
|
- QueriableMember.getMembers(enterprises));
|
|
|
+ returnMap.put("shortName", QueriableMember.getMembers(enterprises));
|
|
|
}
|
|
|
if (uu != null) {
|
|
|
Enterprise enterprise = enterpriseService.findById(uu);
|
|
|
@@ -110,9 +115,7 @@ public class PublicQueryController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/batch/members", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public Map<String, Object> queryEnterprises(
|
|
|
- @RequestParam("data") String data)
|
|
|
- throws UnsupportedEncodingException {
|
|
|
+ public Map<String, Object> queryEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
|
if (!StringUtils.isEmpty(data)) {
|
|
|
List<String> accounts = null;
|
|
|
// data = URLDecoder.decode(data, "UTF-8");
|
|
|
@@ -156,8 +159,7 @@ public class PublicQueryController {
|
|
|
@RequestMapping(value = "/members/{enUU}/users/{userUU}", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ResponseStatus(value = HttpStatus.OK)
|
|
|
- public QueriableUser getUser(@PathVariable("enUU") Long enUU,
|
|
|
- @PathVariable("userUU") Long userUU) {
|
|
|
+ public QueriableUser getUser(@PathVariable("enUU") Long enUU, @PathVariable("userUU") Long userUU) {
|
|
|
User user = userService.findUserByEnUUAndUserUU(enUU, userUU);
|
|
|
if (user != null)
|
|
|
return new QueriableUser(user);
|
|
|
@@ -172,24 +174,21 @@ public class PublicQueryController {
|
|
|
@RequestMapping(value = "/members/UserEnterprise", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ResponseStatus(value = HttpStatus.OK)
|
|
|
- public Map<String, Object> getUserEnterprise(String enName,
|
|
|
- String enBusinesscode, String emMobile, String emPassword, String emName)
|
|
|
+ public Map<String, Object> getUserEnterprise(String enName, String enBusinesscode, String emMobile, String emPassword, String emName)
|
|
|
throws UnsupportedEncodingException {
|
|
|
// ModelMap returnMap = new ModelMap();
|
|
|
Map<String, Object> infos = new HashMap<String, Object>();
|
|
|
boolean ok = false;
|
|
|
String error = null;
|
|
|
// 首先查找营业执照号与企业名称是否存在
|
|
|
- if (!StringUtils.isEmpty(enName)
|
|
|
- && !StringUtils.isEmpty(enBusinesscode)) {
|
|
|
+ if (!StringUtils.isEmpty(enName) && !StringUtils.isEmpty(enBusinesscode)) {
|
|
|
List<Enterprise> enterprises = enterpriseService.findByName(enName);
|
|
|
if (!CollectionUtils.isEmpty(enterprises)) {
|
|
|
for (Enterprise os : enterprises) {
|
|
|
if (os.getEnBussinessCode().equals(enBusinesscode)) {
|
|
|
- List<User> users = userService.findUsersByEnUU(os
|
|
|
- .getUu());
|
|
|
+ List<User> users = userService.findUsersByEnUU(os.getUu());
|
|
|
for (User user : users) {
|
|
|
- if (user.getUserTel()!=null&&user.getUserTel().equals(emMobile)) {
|
|
|
+ if (user.getUserTel() != null && user.getUserTel().equals(emMobile)) {
|
|
|
ok = true;
|
|
|
infos.put("enuu", os.getUu());
|
|
|
infos.put("emuu", user.getUserUU());
|
|
|
@@ -198,24 +197,24 @@ public class PublicQueryController {
|
|
|
}
|
|
|
}
|
|
|
User user = null;
|
|
|
- if(ok==false){
|
|
|
+ if (ok == false) {
|
|
|
user = new User();
|
|
|
user.setUserName(emName);// 管理员姓名
|
|
|
- user.setUserTel(emMobile);
|
|
|
- user.setEnable(Constant.YES);
|
|
|
+ user.setUserTel(emMobile);
|
|
|
+ user.setEnable(Constant.YES);
|
|
|
user.addEnterprise(os);// 添加userenterpris对应关系
|
|
|
User newUser = userDao.save(user);
|
|
|
newUser.setUserPwd(Md5Utils.encode(emPassword, newUser.getUserUU()));
|
|
|
userDao.save(newUser);
|
|
|
- if(os.getEnAdminuu()!=null){
|
|
|
-
|
|
|
- }else{
|
|
|
+ if (os.getEnAdminuu() != null) {
|
|
|
+
|
|
|
+ } else {
|
|
|
os.setEnAdminuu(newUser.getUserUU());
|
|
|
os.setEnAdminPassword(emPassword);
|
|
|
os = enterpriseDao.save(os);// 再次保存enterprise
|
|
|
- enterpriseDao.callInitProcedure(os.getUu());//设置对照关系
|
|
|
+ enterpriseDao.callInitProcedure(os.getUu());// 设置对照关系
|
|
|
}
|
|
|
- ok=true;
|
|
|
+ ok = true;
|
|
|
infos.put("enuu", os.getUu());
|
|
|
infos.put("emuu", newUser.getUserUU());
|
|
|
infos.put("enSecret", os.getAccessSecret());
|
|
|
@@ -227,8 +226,7 @@ public class PublicQueryController {
|
|
|
}
|
|
|
} else {
|
|
|
try {
|
|
|
- Enterprise enterprise = enterpriseService
|
|
|
- .findByenBussinessCode(enBusinesscode);
|
|
|
+ Enterprise enterprise = enterpriseService.findByenBussinessCode(enBusinesscode);
|
|
|
if (enterprise != null) {
|
|
|
error = "企业名称与营业执照号不符!";
|
|
|
infos.put("enName", enterprise.getEnName());
|
|
|
@@ -261,10 +259,8 @@ public class PublicQueryController {
|
|
|
|
|
|
@RequestMapping(value = "/search", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public JSONObject getMonthProdio(Long month, String brand, String vendor,
|
|
|
- String date) {
|
|
|
- JSONObject json = monthProdIoService.getMonthProdio(month, brand,
|
|
|
- vendor, date);
|
|
|
+ public JSONObject getMonthProdio(Long month, String brand, String vendor, String date) {
|
|
|
+ JSONObject json = monthProdIoService.getMonthProdio(month, brand, vendor, date);
|
|
|
return json;
|
|
|
}
|
|
|
|
|
|
@@ -279,8 +275,7 @@ public class PublicQueryController {
|
|
|
map.put("tel", userService.isTelUseable(enter.getEnAdminTel()));
|
|
|
// map.put("email",
|
|
|
// userService.isEmailUseable(enter.getEnAdminEmail()));
|
|
|
- map.put("bussinessCode", enterpriseService.bussinessCodeEnable(enter
|
|
|
- .getEnBussinessCode()));
|
|
|
+ map.put("bussinessCode", enterpriseService.bussinessCodeEnable(enter.getEnBussinessCode()));
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
@@ -291,28 +286,23 @@ public class PublicQueryController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/erpRegister", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Map<String, Object> register(String data)
|
|
|
- throws UnsupportedEncodingException {
|
|
|
+ public Map<String, Object> register(String data) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
|
Map<String, Object> infos = new HashMap<String, Object>();
|
|
|
- Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr,
|
|
|
- Enterprise.class);// 需要把字符串转成Object
|
|
|
+ Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);// 需要把字符串转成Object
|
|
|
boolean ok = false;
|
|
|
String error = null;
|
|
|
Map<String, Object> checkinfos = checkRegister(newEnterprise);
|
|
|
if (checkinfos != null && checkinfos.get("ok").equals(true)) {
|
|
|
if (checkinfos.get("enName").equals(newEnterprise.getEnName())) {
|
|
|
- error = "注册失败!企业名称" + checkinfos.get("enName")
|
|
|
- + "已注册,注册的营业执照号为" + checkinfos.get("enBussinessCode")
|
|
|
- + "注册人:" + checkinfos.get("emName");
|
|
|
+ error = "注册失败!企业名称" + checkinfos.get("enName") + "已注册,注册的营业执照号为" + checkinfos.get("enBussinessCode") + "注册人:"
|
|
|
+ + checkinfos.get("emName");
|
|
|
} else {
|
|
|
- error = "注册失败!营业执照号" + checkinfos.get("enBussinessCode")
|
|
|
- + "已注册,注册的企业名称为" + checkinfos.get("enName") + "注册人:"
|
|
|
+ error = "注册失败!营业执照号" + checkinfos.get("enBussinessCode") + "已注册,注册的企业名称为" + checkinfos.get("enName") + "注册人:"
|
|
|
+ checkinfos.get("emName");
|
|
|
}
|
|
|
} else {
|
|
|
- Enterprise regEnterprise = enterpriseService
|
|
|
- .registerERPEnterprise(newEnterprise);
|
|
|
+ Enterprise regEnterprise = enterpriseService.registerERPEnterprise(newEnterprise);
|
|
|
if (regEnterprise == null) {// 营业执照码验证
|
|
|
error = "注册失败!";
|
|
|
} else {
|
|
|
@@ -332,24 +322,20 @@ public class PublicQueryController {
|
|
|
|
|
|
public Map<String, Object> checkRegister(Enterprise enterprise) {
|
|
|
Map<String, Object> checkinfos = new HashMap<String, Object>();
|
|
|
- List<Enterprise> enterprises = enterpriseService.findByName(enterprise
|
|
|
- .getEnName());
|
|
|
+ List<Enterprise> enterprises = enterpriseService.findByName(enterprise.getEnName());
|
|
|
boolean ok = false;
|
|
|
if (!CollectionUtils.isEmpty(enterprises)) {
|
|
|
ok = true;
|
|
|
checkinfos.put("enName", enterprise.getEnName());
|
|
|
- checkinfos.put("enBussinessCode", enterprises.get(0)
|
|
|
- .getEnBussinessCode());
|
|
|
+ checkinfos.put("enBussinessCode", enterprises.get(0).getEnBussinessCode());
|
|
|
checkinfos.put("emName", enterprises.get(0).getEnAdminName());
|
|
|
} else {
|
|
|
try {
|
|
|
- Enterprise newenterprise = enterpriseService
|
|
|
- .findByenBussinessCode(enterprise.getEnBussinessCode());
|
|
|
+ Enterprise newenterprise = enterpriseService.findByenBussinessCode(enterprise.getEnBussinessCode());
|
|
|
if (newenterprise != null) {
|
|
|
ok = true;
|
|
|
checkinfos.put("enName", newenterprise.getEnName());
|
|
|
- checkinfos.put("enBussinessCode",
|
|
|
- newenterprise.getEnBussinessCode());
|
|
|
+ checkinfos.put("enBussinessCode", newenterprise.getEnBussinessCode());
|
|
|
checkinfos.put("emName", newenterprise.getEnAdminName());
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
@@ -359,7 +345,7 @@ public class PublicQueryController {
|
|
|
checkinfos.put("ok", ok);
|
|
|
return checkinfos;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 按企业名称、简称、UU号等查找企业信息
|
|
|
*
|
|
|
@@ -369,21 +355,42 @@ public class PublicQueryController {
|
|
|
@RequestMapping(value = "/enterprises", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ResponseStatus(value = HttpStatus.OK)
|
|
|
- public List<EnterpriseDetail> queryEnterprise(String name, String shortName)
|
|
|
- throws UnsupportedEncodingException {
|
|
|
- List<EnterpriseDetail> members=new ArrayList<EnterpriseDetail>();
|
|
|
+ public List<EnterpriseDetail> queryEnterprise(String name, String shortName) throws UnsupportedEncodingException {
|
|
|
+ List<EnterpriseDetail> members = new ArrayList<EnterpriseDetail>();
|
|
|
if (!StringUtils.isEmpty(name)) {
|
|
|
Set<Enterprise> enterprises = enterpriseService.findByNameKey(name);
|
|
|
if (!CollectionUtils.isEmpty(enterprises))
|
|
|
members.addAll(EnterpriseDetail.getMembers(enterprises));
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(shortName)) {
|
|
|
- Set<Enterprise> enterprises = enterpriseService
|
|
|
- .findByShortName(shortName);
|
|
|
+ Set<Enterprise> enterprises = enterpriseService.findByShortName(shortName);
|
|
|
if (!CollectionUtils.isEmpty(enterprises))
|
|
|
members.addAll(EnterpriseDetail.getMembers(enterprises));
|
|
|
- }
|
|
|
+ }
|
|
|
return members;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取及验证token接口
|
|
|
+ *
|
|
|
+ * @author yingp
|
|
|
+ *
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/token", method = RequestMethod.GET)
|
|
|
+ @ResponseBody
|
|
|
+ public ResponseEntity<ModelMap> getUserByToken(HttpServletRequest request, String access_token) {
|
|
|
+ ModelMap data = new ModelMap();
|
|
|
+ AccessToken token = accessTokenService.findOne(access_token);
|
|
|
+ if (token == null) {
|
|
|
+ data.put("error", "验证信息错误或已过期");
|
|
|
+ return new ResponseEntity<ModelMap>(data, HttpStatus.NOT_FOUND);
|
|
|
+ }
|
|
|
+ data.put("user", token.getUser());
|
|
|
+ data.put("userUU", token.getUserUU());
|
|
|
+ data.put("enUU", token.getEnUU());
|
|
|
+ data.put("bind", token.getBind());
|
|
|
+ accessTokenService.delete(token.getId());
|
|
|
+ return new ResponseEntity<ModelMap>(data, HttpStatus.OK);
|
|
|
+ }
|
|
|
+
|
|
|
}
|