Compare commits

..

No commits in common. "6bd755c81ed435c8768b991a3fb0bcf7b4625a62" and "0ff28c7aadde19a85e2b7ef1a165b097edb34789" have entirely different histories.

5 changed files with 329 additions and 400 deletions

View File

@ -214,28 +214,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.15</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
<version>1.69</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.69</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.69</version>
</dependency>
<!-- JAX-WS API --> <!-- JAX-WS API -->
<dependency> <dependency>
<groupId>javax.xml.ws</groupId> <groupId>javax.xml.ws</groupId>

View File

@ -6,12 +6,10 @@ import cn.zhxu.okhttps.HttpResult;
import cn.zhxu.okhttps.OkHttps; import cn.zhxu.okhttps.OkHttps;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.common.task.forest.MyTaskClient; import com.ruoyi.common.task.forest.MyTaskClient;
import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.sign.Md5Utils; import com.ruoyi.common.utils.sign.Md5Utils;
import com.ruoyi.project.oil.domain.monitor.ThDevice; import com.ruoyi.project.oil.domain.monitor.ThDevice;
import com.ruoyi.project.oil.mapper.ThDeviceMapper;
import com.ruoyi.project.outside.service.OutSideService; import com.ruoyi.project.outside.service.OutSideService;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -20,7 +18,6 @@ import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
@Component @Component
public class EquTask { public class EquTask {
@ -31,8 +28,6 @@ public class EquTask {
private MyTaskClient myClient; private MyTaskClient myClient;
@Autowired @Autowired
private OutSideService outSideService; private OutSideService outSideService;
@Autowired
private ThDeviceMapper thDeviceMapper;
/** /**
* 港口原有设备对接 * 港口原有设备对接
*/ */
@ -47,9 +42,11 @@ public class EquTask {
JSONObject tokenByJson = httpResult.getBody().toBean(JSONObject.class); JSONObject tokenByJson = httpResult.getBody().toBean(JSONObject.class);
JSONObject dataByJson = tokenByJson.getJSONObject("data"); JSONObject dataByJson = tokenByJson.getJSONObject("data");
String token = dataByJson.getString("token"); String token = dataByJson.getString("token");
ArrayList<ThDevice> equLists = new ArrayList<>(); //查询 数据库 获取 港口以前的 设备信息
ThDevice thDevice = new ThDevice(); ThDevice thDevice = new ThDevice();
thDevice.setDeptId(5l); thDevice.setSn("e75153fd53d243289057ffec33f36cb9");
List<ThDevice> equLists = thDeviceMapper.selectDeviceList(thDevice); thDevice.setName("油气回收voc监测设备3#");
equLists.add(thDevice);
equLists.forEach(e->{ equLists.forEach(e->{
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
@ -58,17 +55,12 @@ public class EquTask {
HttpResult result = OkHttps.sync("http://10.201.35.30:8090/enviSensor/select?" + HttpResult result = OkHttps.sync("http://10.201.35.30:8090/enviSensor/select?" +
"page=1&pageSize=20&valid=0&type=5&sensorUId={sensorUId}&label={label}") "page=1&pageSize=20&valid=0&type=5&sensorUId={sensorUId}&label={label}")
.addPathPara(map) .addPathPara(map)
.addHeader("token", token) .addHeader("token", token)
.get(); .get();
JSONObject vocByJson = result.getBody().toBean(JSONObject.class); JSONObject vocByJson = result.getBody().toBean(JSONObject.class);
JSONObject vocDataByJson = vocByJson.getJSONObject("data"); JSONObject vocDataByJson = vocByJson.getJSONObject("data");
JSONArray vocByArray = vocDataByJson.getJSONArray("array"); JSONArray vocByArray = vocDataByJson.getJSONArray("array");
System.out.println(vocByArray.toString()); System.out.println(vocByArray.toJSONString());
try {
Integer integer = outSideService.insertOldDeviceData(vocByArray.toJSONString());
} catch (JsonProcessingException jsonProcessingException) {
jsonProcessingException.printStackTrace();
}
}); });
} }

View File

@ -1,6 +1,5 @@
package com.ruoyi.common.wsdl; package com.ruoyi.common.wsdl;
import cn.hutool.core.lang.Console;
import cn.hutool.http.webservice.SoapClient; import cn.hutool.http.webservice.SoapClient;
@ -13,24 +12,24 @@ import javax.xml.soap.SOAPMessage;
*/ */
public class TestWsdl { public class TestWsdl {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// 创建SoapClient实例 wsdl协议请求地址:http://xxx.cn/services/GanSuInterface (去掉?wsdl)
SoapClient client = SoapClient.create("http://10.171.19.193:8080/dxpt/ws/shortMessageWs")
// 设置方法名和命名空间命名空间url:http://webservice.xxx.xxx 方法名:getSydwJsonList
// tns 命名空间targetNamespace没有命名空间时直接写方法名即可
.setMethod("tns:returnMassages", "http://service.cxf.com")
// 设置参数最后的false参数表示参数不加命名空间的前缀web
.setParam("in0", "afe9cff39173ff8901917a54c90e448d", false);
// 新建客户端 //获取SOAPMessage实例此步作用是输出请求的XML参数实际开发并不需要
SoapClient client = SoapClient.create("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") SOAPMessage message = client.getMessage();
// 设置要请求的方法此接口方法前缀为web传入对应的命名空间 System.out.println(client.getMsgStr(true));
.setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/")
// 设置参数此处自动添加方法的前缀web
.setParam("phone", "18437762352")
.setParam("msg", "1112121")
.setParam("dwdm", "SGJT-山港集团");
// 发送请求参数true表示返回一个格式化后的XML内容
// 返回内容为XML字符串可以配合XmlUtil解析这个响应
Console.log(client.send(true));
// 发送请求true表示输出的结果格式化处理
String send = client.send(true);
// Document document = DocumentHelper.parseText(send);
// Element root = document.getRootElement();
// String value = root.getStringValue();
System.out.println(send);
// System.out.println(value);
} }
} }

View File

@ -97,36 +97,35 @@ public class SecurityConfig
protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception
{ {
return httpSecurity return httpSecurity
// CSRF禁用因为不使用session // CSRF禁用因为不使用session
.csrf(csrf -> csrf.disable()) .csrf(csrf -> csrf.disable())
// 禁用HTTP响应标头 // 禁用HTTP响应标头
.headers((headersCustomizer) -> { .headers((headersCustomizer) -> {
headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin()); headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
}) })
// 认证失败处理类 // 认证失败处理类
.exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler)) .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
// 基于token所以不需要session // 基于token所以不需要session
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
// 注解标记允许匿名访问的url // 注解标记允许匿名访问的url
.authorizeHttpRequests((requests) -> { .authorizeHttpRequests((requests) -> {
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
// 对于登录login 注册register 验证码captchaImage 允许匿名访问 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
requests.antMatchers("/login","/bbc/**", requests.antMatchers("/login", "/register", "/captchaImage","/outside/*").permitAll()
"/register", "/captchaImage","/outside/*").permitAll() // 静态资源可匿名访问
// 静态资源可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() // 除上面外的所有请求全部需要鉴权认证
// 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated();
.anyRequest().authenticated(); })
}) // 添加Logout filter
// 添加Logout filter .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
.logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler)) // 添加JWT filter
// 添加JWT filter .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class) // 添加CORS filter
// 添加CORS filter .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class) .addFilterBefore(corsFilter, LogoutFilter.class)
.addFilterBefore(corsFilter, LogoutFilter.class) .build();
.build();
} }
/** /**

View File

@ -1,307 +1,268 @@
package com.ruoyi.project.system.controller; //package com.ruoyi.project.system.controller;
//
//
import com.alibaba.fastjson2.JSON; //import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; //import com.alibaba.fastjson2.JSONObject;
import com.banboocloud.Codec.BamboocloudFacade; //import com.banboocloud.Codec.BamboocloudFacade;
import com.ruoyi.common.utils.reflect.ReflectUtils; //import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.framework.web.controller.BaseController; //import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.project.system.domain.SysUser; //import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysDeptService; //import com.ruoyi.project.system.service.ISysDeptService;
import com.ruoyi.project.system.service.ISysPostService; //import com.ruoyi.project.system.service.ISysPostService;
import com.ruoyi.project.system.service.ISysRoleService; //import com.ruoyi.project.system.service.ISysRoleService;
import com.ruoyi.project.system.service.ISysUserService; //import com.ruoyi.project.system.service.ISysUserService;
import com.ruoyi.project.system.utils.BamboocloudUtils; //import com.ruoyi.project.system.utils.BamboocloudUtils;
//
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.User; //import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.security.core.userdetails.UserDetails; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PostMapping; //import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.ResponseBody; //
import org.springframework.web.bind.annotation.RestController; //import javax.servlet.ServletException;
//import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletException; //import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest; //import java.io.BufferedReader;
import javax.servlet.http.HttpServletResponse; //import java.io.IOException;
import java.io.BufferedReader; //import java.io.PrintWriter;
import java.io.IOException; //import java.util.*;
import java.io.PrintWriter; //
import java.util.*; ///**
// * swagger 用户测试方法
/** // * 加密认证
* swagger 用户测试方法 // * @author ruoyi
* 加密认证 // */
* @author ruoyi //
*/ //@RestController
//@RequestMapping("/bbc/user")
@RestController //public class BbcController extends BaseController {
@RequestMapping("/bbc/user") //
public class BbcController extends BaseController { // private String bimRequestId;
//
private String bimRequestId; // private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
//
private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); //
// @Autowired
// private ISysUserService userService;
@Autowired //
private ISysUserService userService; // @Autowired
// private ISysRoleService roleService;
@Autowired //
private ISysRoleService roleService; // @Autowired
// private ISysDeptService deptService;
@Autowired //
private ISysDeptService deptService; // @Autowired
// private ISysPostService postService;
@Autowired //
private ISysPostService postService; //// @ApiOperation("测试")
// @RequestMapping()
// @ApiOperation("测试") // public JSONObject bbcUser() {
@RequestMapping() //
public JSONObject bbcUser() { // JSONObject jsonObject = new JSONObject();
// jsonObject.put("resultCode", "0");
JSONObject jsonObject = new JSONObject(); // jsonObject.put("message", "success");
jsonObject.put("resultCode", "0"); // return jsonObject;
jsonObject.put("message", "success"); //
return jsonObject; // }
//
} //// @ApiOperation("对象属性字段查询")
// @PostMapping("/schemaService")
// @ApiOperation("对象属性字段查询") // public String SchemaService(HttpServletRequest req, HttpServletResponse resp) {
@PostMapping("/schemaService") //
public String SchemaService(HttpServletRequest req, HttpServletResponse resp) { // JSONObject jsonObject = new JSONObject();
//
JSONObject jsonObject = new JSONObject(); // // StringBuilder sb = stringBuilder(req);
// String bodyparam= BamboocloudUtils.getRequestBody(req);
// StringBuilder sb = stringBuilder(req); // logger.info("json--param-->" + bodyparam);
String bodyparam= BamboocloudUtils.getRequestBody(req); // // String bodyparam = sb.toString();
logger.info("json--param-->" + bodyparam); // //解密json字符传
// String bodyparam = sb.toString(); // bodyparam = BamboocloudUtils.getPlaintext(bodyparam, "123456", "AES");
//解密json字符传 // logger.info("json--param-->" + bodyparam);
bodyparam = BamboocloudUtils.getPlaintext(bodyparam, "123456", "AES"); // Map<String, Object> reqmap = (Map<String, Object>) JSON.parse(bodyparam);
logger.info("json--param-->" + bodyparam); // //验证签名
Map<String, Object> reqmap = (Map<String, Object>) JSON.parse(bodyparam); // if (BamboocloudUtils.verify(reqmap, "MD5").booleanValue()) {
//验证签名 // String username = (String) reqmap.get("bimRemoteUser");
if (BamboocloudUtils.verify(reqmap, "MD5").booleanValue()) { // String password = (String) reqmap.get("bimRemotePwd");
String username = (String) reqmap.get("bimRemoteUser"); // //判断接口中的调用名及调用密码是否正确
String password = (String) reqmap.get("bimRemotePwd"); // if (BamboocloudUtils.checkUsernamePassword(username, password)) {
//判断接口中的调用名及调用密码是否正确 //// //添加返回的对象及属性字段名
if (BamboocloudUtils.checkUsernamePassword(username, password)) { //// MapJson mapJson = new MapJson();
// //添加返回的对象及属性字段名 //// Map<String, List<Map<String, Object>>> map = new HashMap<>();
// MapJson mapJson = new MapJson(); //// jsonObject.put("account", mapJson.accountList());
Map<String, List<Map<String, Object>>> map = new HashMap<>(); //// jsonObject.put("organization", mapJson.organizationList());
ArrayList<HashMap<String,Object>> accountList = new ArrayList<>(); //// jsonObject.put("role", mapJson.roleList());
HashMap<String, Object> nameMap = new HashMap<>(); //// jsonObject.put("post", mapJson.postList());
nameMap.put("multivalued",false); //// jsonObject.put("dict", mapJson.dictDataList());
nameMap.put("name","userName"); //// jsonObject.put("bimRequestId", reqmap.get("bimRequestId"));
nameMap.put("required",true); // String mapJs = JSON.toJSONString(jsonObject);
nameMap.put("type","String"); // logger.info(jsonObject.toJSONString());
HashMap<String, Object> passMap = new HashMap<>(); // //返回加密的json字符串
passMap.put("multivalued",false); // mapJs = BamboocloudFacade.encrypt(mapJs, "123456", "AES");
passMap.put("name","password"); // //jsonObject.put(map);
passMap.put("required",true); // //<Object> values = jsonObject.values();
passMap.put("type","String"); // return mapJs;
HashMap<String, Object> mobileMap = new HashMap<>(); // }
mobileMap.put("multivalued",false); // }
mobileMap.put("name","mobile"); // jsonObject.put("bimRequestId", bimRequestId);
mobileMap.put("required",true); // jsonObject.put("resultCode", "505");
mobileMap.put("type","String"); // jsonObject.put("message", "连接失败,请检查连接器配置的参数");
HashMap<String, Object> statusMap = new HashMap<>(); // logger.info(jsonObject.toJSONString());
statusMap.put("multivalued",false); // String mapJs = JSON.toJSONString(jsonObject);
statusMap.put("name","status"); // //返回加密的json字符串
statusMap.put("required",true); // mapJs = BamboocloudFacade.encrypt(mapJs, "123456", "AES");
statusMap.put("type","String"); // return mapJs;
accountList.add(nameMap); // }
accountList.add(passMap); //
accountList.add(mobileMap); //// @ApiOperation("新增用户")
accountList.add(statusMap); //// @ApiImplicitParam(name = "user", value = "新增用户信息", dataType = "User")
jsonObject.put("account", accountList); // @PostMapping("/UserCreateService")
// jsonObject.put("organization", mapJson.organizationList()); // @ResponseBody
// jsonObject.put("role", mapJson.roleList()); // public String userCreateService(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
// jsonObject.put("post", mapJson.postList()); //
// jsonObject.put("dict", mapJson.dictDataList()); // Map<String, Object> schema = new HashMap<String, Object>();
jsonObject.put("bimRequestId", reqmap.get("bimRequestId")); //
String mapJs = JSON.toJSONString(jsonObject); // JSONObject jsonObject = new JSONObject();
logger.info(jsonObject.toJSONString()); //
//返回加密的json字符串 // StringBuilder sb = stringBuilder(req);
mapJs = BamboocloudFacade.encrypt(mapJs, "123456", "AES"); // //修改多值的属性格式方便转换
//jsonObject.put(map); // String bodyparam = sb.toString();
//<Object> values = jsonObject.values(); // bodyparam = BamboocloudUtils.getPlaintext(bodyparam, "123456", "AES");
return mapJs; // String p = bodyparam;
} // String z = "[\"";
} // String y = "\"]";
jsonObject.put("bimRequestId", bimRequestId); // bodyparam.indexOf(z);
jsonObject.put("resultCode", "505"); // bodyparam.indexOf(y);
jsonObject.put("message", "连接失败,请检查连接器配置的参数"); // while (bodyparam.contains(z)) {
logger.info(jsonObject.toJSONString()); // p = bodyparam.substring(bodyparam.indexOf(z), bodyparam.indexOf(y) + 2).replace(z, "\"").replace(y, "\"").replace("\",\"", ",");
String mapJs = JSON.toJSONString(jsonObject); // bodyparam = bodyparam.substring(0, bodyparam.indexOf(z)) + p + bodyparam.substring(bodyparam.indexOf(y) + 2, bodyparam.length());
//返回加密的json字符串 // }
mapJs = BamboocloudFacade.encrypt(mapJs, "123456", "AES"); // logger.info("json--param-->" + bodyparam);
return mapJs; // Map<String, Object> reqmap = (Map<String, Object>) JSON.parse(bodyparam);
} // String username = (String) reqmap.get("bimRemoteUser");
// String password = (String) reqmap.get("bimRemotePwd");
// @ApiOperation("新增用户") //
// @ApiImplicitParam(name = "user", value = "新增用户信息", dataType = "User") // if (BamboocloudUtils.checkUsernamePassword(username, password)) {
@PostMapping("/UserCreateService") // /**
@ResponseBody // * 新增用户
public String userCreateService(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { // */
// //获取用户创建所需的参数
Map<String, Object> schema = new HashMap<String, Object>(); //// User user = createUpdateUser(reqmap);
// SysUser user = new SysUser();
JSONObject jsonObject = new JSONObject(); // //用户创建
// userService.insertUser(user);
StringBuilder sb = stringBuilder(req); // //获取返回给IAM连接器的唯一标识用于后续该条数据的更新修改删除
//修改多值的属性格式方便转换 // String uid = user.getUserId() + "";
String bodyparam = sb.toString(); // if (uid != null) {
bodyparam = BamboocloudUtils.getPlaintext(bodyparam, "123456", "AES"); // schema.put("uid", uid);
String p = bodyparam; // schema.put("bimRequestId", reqmap.get("bimRequestId"));
String z = "[\""; // schema.put("resultCode", "0");
String y = "\"]"; // schema.put("message", "success");
bodyparam.indexOf(z); // } else {
bodyparam.indexOf(y); // schema.put("bimRequestId", reqmap.get("bimRequestId"));
while (bodyparam.contains(z)) { // schema.put("resultCode", "500");
p = bodyparam.substring(bodyparam.indexOf(z), bodyparam.indexOf(y) + 2).replace(z, "\"").replace(y, "\"").replace("\",\"", ","); // schema.put("message", "账号创建失败");
bodyparam = bodyparam.substring(0, bodyparam.indexOf(z)) + p + bodyparam.substring(bodyparam.indexOf(y) + 2, bodyparam.length()); // }
} // String mapJson = JSON.toJSONString(schema);
logger.info("json--param-->" + bodyparam); // mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES");
Map<String, Object> reqmap = (Map<String, Object>) JSON.parse(bodyparam); // return mapJson;
String username = (String) reqmap.get("bimRemoteUser"); // }
String password = (String) reqmap.get("bimRemotePwd"); // schema.put("bimRequestId", reqmap.get("bimRequestId"));
// schema.put("resultCode", "500");
if (BamboocloudUtils.checkUsernamePassword(username, password)) { // schema.put("message", "账号创建失败,请检查连接器配置的参数");
/** // String mapJson = JSON.toJSONString(schema);
* 新增用户 // //返回加密的json字符串
*/ // mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES");
//获取用户创建所需的参数 // return mapJson;
// User user = createUpdateUser(reqmap); // }
String userName = (String) reqmap.get("userName"); //
String pass = (String) reqmap.get("password"); //
//// @ApiOperation("修改用户")
logger.info("reqmap---------->"+reqmap); //// @ApiImplicitParam(name = "user", value = "修改用户信息", dataType = "User")
SysUser user = new SysUser(); // @PostMapping("/UserUpdateService")
user.setUserName(userName); // @ResponseBody
user.setPassword(pass); // public String userUpdateService(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
//用户创建 //
userService.registerUser(user); // Map<String, Object> schema = new HashMap<String, Object>();
//获取返回给IAM连接器的唯一标识用于后续该条数据的更新修改删除 //
String uid = user.getUserId() + ""; // JSONObject jsonObject = new JSONObject();
if (uid != null) { //
schema.put("uid", uid); // StringBuilder sb = stringBuilder(req);
schema.put("bimRequestId", reqmap.get("bimRequestId")); //
schema.put("resultCode", "0"); // String bodyparam = sb.toString();
schema.put("message", "success"); //
} else { // bodyparam = BamboocloudUtils.getPlaintext(bodyparam, "123456", "AES");
schema.put("bimRequestId", reqmap.get("bimRequestId")); // //修改多值的属性格式方便转换
schema.put("resultCode", "500"); // String p = bodyparam;
schema.put("message", "账号创建失败"); // String bdp = bodyparam;
} // String z = "[\"";
String mapJson = JSON.toJSONString(schema); // String y = "\"]";
mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES"); // bodyparam.indexOf(z);
return mapJson; // bodyparam.indexOf(y);
} // while (bodyparam.contains(z)) {
schema.put("bimRequestId", reqmap.get("bimRequestId")); // p = bodyparam.substring(bodyparam.indexOf(z), bodyparam.indexOf(y) + 2).replace(z, "\"").replace(y, "\"").replace("\",\"", ",");
schema.put("resultCode", "500"); // bodyparam = bodyparam.substring(0, bodyparam.indexOf(z)) + p + bodyparam.substring(bodyparam.indexOf(y) + 2, bodyparam.length());
schema.put("message", "账号创建失败,请检查连接器配置的参数"); // }
String mapJson = JSON.toJSONString(schema); // logger.info("json--param-->" + bodyparam);
//返回加密的json字符串 // Map<String, Object> reqmap = (Map<String, Object>) JSON.parse(bodyparam);
mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES"); // String username = (String) reqmap.get("bimRemoteUser");
return mapJson; // String password = (String) reqmap.get("bimRemotePwd");
} // if (BamboocloudUtils.checkUsernamePassword(username, password)) {
// SysUser user = new SysUser();
// //获取用于更新的参数
// @ApiOperation("修改用户") //// user = createUpdateUser(reqmap);
// @ApiImplicitParam(name = "user", value = "修改用户信息", dataType = "User") // //获取用于更新的唯一标识
@PostMapping("/UserUpdateService") // user.setUserId(Long.valueOf(String.valueOf(reqmap.get("bimUid"))));
@ResponseBody // //更新用户
public String userUpdateService(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { // userService.updateUser(user);
// schema.put("bimRequestId", reqmap.get("bimRequestId"));
Map<String, Object> schema = new HashMap<String, Object>(); // schema.put("resultCode", "0");
// schema.put("message", "success");
JSONObject jsonObject = new JSONObject(); // String mapJson = JSON.toJSONString(schema);
// mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES");
StringBuilder sb = stringBuilder(req); // logger.info("response----->" + schema);
// return mapJson;
String bodyparam = sb.toString(); // }
// schema.put("bimRequestId", reqmap.get("bimRequestId"));
bodyparam = BamboocloudUtils.getPlaintext(bodyparam, "123456", "AES"); // schema.put("resultCode", "500");
//修改多值的属性格式方便转换 // schema.put("message", "账号更新失败,请检查连接器配置的参数");
String p = bodyparam; // String mapJson = JSON.toJSONString(schema);
String bdp = bodyparam; // mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES");
String z = "[\""; // logger.info("response----->" + schema);
String y = "\"]"; // return mapJson;
bodyparam.indexOf(z); // }
bodyparam.indexOf(y); //
while (bodyparam.contains(z)) { //
p = bodyparam.substring(bodyparam.indexOf(z), bodyparam.indexOf(y) + 2).replace(z, "\"").replace(y, "\"").replace("\",\"", ","); // public StringBuilder stringBuilder(HttpServletRequest req) {
bodyparam = bodyparam.substring(0, bodyparam.indexOf(z)) + p + bodyparam.substring(bodyparam.indexOf(y) + 2, bodyparam.length()); // BufferedReader br = null;
} // StringBuilder sb = new StringBuilder();
logger.info("json--param-->" + bodyparam); // String str = "";
Map<String, Object> reqmap = (Map<String, Object>) JSON.parse(bodyparam); // try {
String username = (String) reqmap.get("bimRemoteUser"); // br = req.getReader();
String password = (String) reqmap.get("bimRemotePwd"); // while ((str = br.readLine()) != null) {
if (BamboocloudUtils.checkUsernamePassword(username, password)) { // sb.append(str);
SysUser user = new SysUser(); // }
//获取用于更新的参数 // br.close();
// user = createUpdateUser(reqmap); // } catch (IOException e) {
String userName = (String) reqmap.get("userName"); // e.printStackTrace();
String pass = (String) reqmap.get("password"); // if (br != null)
// try {
logger.info("reqmap---------->"+reqmap); // br.close();
user.setUserName(userName); // } catch (IOException eo) {
user.setPassword(pass); // eo.printStackTrace();
//获取用于更新的唯一标识 // }
user.setUserId(Long.valueOf(String.valueOf(reqmap.get("bimUid")))); // } finally {
//更新用户 // if (br != null) {
userService.updateUserStatus(user); // try {
schema.put("bimRequestId", reqmap.get("bimRequestId")); // br.close();
schema.put("resultCode", "0"); // } catch (IOException e) {
schema.put("message", "success"); // e.printStackTrace();
String mapJson = JSON.toJSONString(schema); // }
mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES"); // }
logger.info("response----->" + schema); // }
return mapJson; // return sb;
} // }
schema.put("bimRequestId", reqmap.get("bimRequestId")); //
schema.put("resultCode", "500"); //}
schema.put("message", "账号更新失败,请检查连接器配置的参数"); //
String mapJson = JSON.toJSONString(schema);
mapJson = BamboocloudFacade.encrypt(mapJson, "123456", "AES");
logger.info("response----->" + schema);
return mapJson;
}
public StringBuilder stringBuilder(HttpServletRequest req) {
BufferedReader br = null;
StringBuilder sb = new StringBuilder();
String str = "";
try {
br = req.getReader();
while ((str = br.readLine()) != null) {
sb.append(str);
}
br.close();
} catch (IOException e) {
e.printStackTrace();
if (br != null)
try {
br.close();
} catch (IOException eo) {
eo.printStackTrace();
}
} finally {
if (br != null) {
try {
br.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return sb;
}
}