同步user，添加等

.gitignore

@@ -1,6 +1,6 @@
 logs/
 .idea/
-target/
+*/target/
 files/
 *.log
 *.iml

zxdt-api/src/main/java/api/controller/online/MessageController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -91,6 +92,27 @@ public class MessageController extends BaseController {
         }
     }
 
+    @ApiOperation("删除通过khuser")
+    @Log(title = "删除聊天消息通过khuser",businessType = BusinessType.DELETE)
+    @DeleteMapping("/deletebykhuser/{khuser}")
+    public AjaxResult delete(@PathVariable String khuser)  {
+        LambdaQueryWrapper<Message> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(Message::getKhUser,khuser);
+        boolean result = messageService.delete(queryWrapper);
+        if (result) {
+            return Success("成功");
+        } else {
+            return Error("删除失败");
+        }
+    }
+
+
+
+
+
+
+
+
     @ApiOperation("留言列表")
     @Log(title = "查询留言消息列表",businessType = BusinessType.QUERY)
     @GetMapping("/leavelist")

zxdt-api/src/main/java/api/controller/online/QuickReplyController.java

@@ -44,6 +44,7 @@ public class QuickReplyController extends BaseController {
         qw.eq(input.getCreateTime() != null , QuickReply::getCreateTime, input.getCreateTime());
         qw.like(!StringHelper.isEmpty(input.getDelBy()), QuickReply::getDelBy, input.getDelBy());
         qw.eq(input.getDelTime() != null , QuickReply::getDelTime, input.getDelTime());
+        qw.orderByDesc(QuickReply::getQuickreplyId);
         Page<QuickReply> page = GetPage(pageInput);
         if (page != null) {
             IPage<QuickReply> iPage = quickreplyService.getListPage(page, qw);

zxdt-api/src/main/java/api/controller/system/UserController.java

@@ -3,6 +3,7 @@ package api.controller.system;
 import api.entity.database.call.CallLog;
 import api.entity.database.sf.SfPlanSeats;
 import api.entity.database.system.*;
+import api.entity.input.system.CustomerInput;
 import api.entity.view.call.CallLogView;
 import api.entity.view.order.WorkOrderBaseView;
 import api.entity.view.system.CustomerView;

zxdt-api/src/main/java/api/controller/system/WxRelatedController.java

@@ -0,0 +1,337 @@
+package api.controller.system;
+
+import api.controller.BaseController;
+import api.entity.database.system.User;
+import api.entity.input.system.CustomerInput;
+import api.entity.input.system.OrderInput;
+import api.model.AjaxResult;
+import api.service.system.IUserService;
+import api.util.annotation.Anonymous;
+import api.util.annotation.Log;
+import api.util.enums.BusinessType;
+import api.util.helper.HttpHelper;
+import api.util.helper.SecretHelper;
+import api.util.helper.SpringHelper;
+import api.util.helper.StringHelper;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@Api(value = "微信和工单相关的", tags = "微信和工单相关的")
+@RestController
+@RequestMapping("/system/wxrelated")
+public class WxRelatedController extends BaseController {
+    @Autowired
+    private IUserService userService;
+    @ApiOperation("外部新增用户")
+    @Log(title = "外部新增用户", businessType = BusinessType.INSERT)
+    @PostMapping("/externaladd")
+    @Anonymous
+    public AjaxResult externaladd(@RequestBody User user,HttpServletRequest request) {
+
+
+        String uuid= request.getHeader("uuid");
+        String pass= request.getHeader("pass");
+
+       String md5str= SecretHelper.MD5("huawuxitong%@"+uuid);
+        if(!md5str.equals(pass)){
+            return Error("验证失败");
+        }
+
+         if (!userService.checkUserNameUnique(user)) {
+            return Error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        if (StringHelper.isEmpty(user.getPassword()))
+            return Error("请输入密码");
+        if (StringHelper.isEmpty(user.getUserName()))
+            return Error("请输入姓名");
+        if (StringHelper.isEmpty(user.getNickName()))
+            return Error("请输入工号");
+        user.setStatus("0");
+        user.setDelFlag("0");
+        user.setPassword(user.getPassword());
+        user.setCreateBy(user.getCreateBy());
+        user.setCreateTime(new Date());
+
+        boolean result = userService.insert(user);
+        if (result) {
+            return Success("新增成功");
+        } else {
+            return Error("新增失败");
+        }
+    }
+    @ApiOperation("外部新增用户list")
+    @Log(title = "外部新增用户list", businessType = BusinessType.INSERT)
+    @PostMapping("/externaladduserlist")
+    @Anonymous
+    public AjaxResult externaladduserlist(@RequestBody List<User> userlist,HttpServletRequest request) {
+
+
+        String uuid= request.getHeader("uuid");
+        String pass= request.getHeader("pass");
+
+        String md5str= SecretHelper.MD5("huawuxitong%@"+uuid);
+        if(!md5str.equals(pass)){
+            return Error("验证失败");
+        }
+
+        Integer res=0;
+        for (User user : userlist){
+            if (!userService.checkUserNameExternalUnique(user)) {
+                continue;
+            }
+            if (StringHelper.isEmpty(user.getPassword()))
+                continue;
+            if (StringHelper.isEmpty(user.getUserName()))
+                continue;
+            if (StringHelper.isEmpty(user.getNickName()))
+                continue;
+            user.setStatus("0");
+            user.setDelFlag("0");
+            user.setPassword(user.getPassword());
+            user.setCreateBy(user.getCreateBy());
+            user.setCreateTime(new Date());
+
+            boolean result = userService.insert(user);
+            if(result){
+                res=res+1;
+            }
+
+
+        }
+        return Success("同步成功");
+
+
+    }
+
+    @ApiOperation("外部删除用户")
+    @Log(title = "外部删除用户", businessType = BusinessType.INSERT)
+    @PostMapping("/externaldelete")
+    @Anonymous
+    public AjaxResult externaldelete(@RequestBody User user,HttpServletRequest request) {
+
+
+        String uuid= request.getHeader("uuid");
+        String pass= request.getHeader("pass");
+
+        String md5str= SecretHelper.MD5("huawuxitong%@"+uuid);
+        if(!md5str.equals(pass)){
+            return Error("验证失败");
+        }
+        LambdaUpdateWrapper<User> uw = new LambdaUpdateWrapper<>();
+        uw.set(User::getDelFlag, "2").eq(User::getExternalId, user.getExternalId());
+        boolean result = userService.updateBatch(uw);
+        if (result) {
+            return Success("删除成功");
+        } else {
+            return Error("删除失败");
+        }
+    }
+
+
+    @ApiOperation("外部接口修改系统用户user")
+    @Log(title = "外部接口修改系统用户user", businessType = BusinessType.UPDATE)
+    @PostMapping("/externaledit")
+    @Anonymous
+    public AjaxResult externaledit(@RequestBody User user,HttpServletRequest request) {
+        String uuid= request.getHeader("uuid");
+        String pass= request.getHeader("pass");
+
+        String md5str= SecretHelper.MD5("huawuxitong%@"+uuid);
+        if(!md5str.equals(pass)){
+            return Error("验证失败");
+        }
+
+
+
+
+
+        LambdaUpdateWrapper<User> usermodel=new LambdaUpdateWrapper<>();
+        usermodel.eq(User::getExternalId,user.getExternalId());
+
+       if(! userService.exists(usermodel))
+       {
+           //不存在这个就去添加
+
+
+           user.setStatus("0");
+           user.setDelFlag("0");
+           user.setPassword(user.getPassword());
+           user.setCreateBy(user.getCreateBy());
+           user.setCreateTime(new Date());
+           userService.insert(user);
+          return Success("添加成功");
+       }
+
+
+
+
+        if(!StringHelper.isEmpty(user.getPassword())){
+            usermodel.set(User::getPassword,user.getPassword());
+        }
+        if(!StringHelper.isEmpty(user.getUserName())) {
+
+            LambdaQueryWrapper<User> qw=new LambdaQueryWrapper<>();
+            qw.eq(User::getUserName, user.getUserName());
+            qw.ne(User::getExternalId,user.getExternalId());
+
+            if(! userService.exists(qw)){
+                usermodel.set(User::getUserName, user.getUserName());
+            }
+        }
+        boolean result = userService.updateBatch(usermodel);
+        if (result) {
+            return Success("修改成功");
+        } else {
+            return Error("修改失败");
+        }
+    }
+
+//以下是调用vs的
+
+
+    @ApiOperation("调用外部接口获取市民信息通过微信id")
+    @Log(title = "调用外部接口获取市民信息通过微信id", businessType = BusinessType.UPDATE)
+    @GetMapping("/getcusdata")
+    @Anonymous
+    public AjaxResult getcusdata(String wxid) {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+        String param="wxid="+wxid;
+        String datares= HttpHelper.sendGet(huawuURL+"Customer/GetCusDatabyWx",param);
+        return  Success("外部接口获取市民信息通过微信id成功",datares);
+
+    }
+
+    @ApiOperation("调用外部接口编辑话务系统的市民信息")
+    @Log(title = "调用外部接口编辑话务系统的市民信息", businessType = BusinessType.UPDATE)
+    @GetMapping("/editcus")
+    @Anonymous
+    public AjaxResult editcus(CustomerInput input) {
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+
+//        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+//        String param="F_CustomerId=132668&F_CustomerEName=wxnamenew&F_CustomerName=瑟吉欧";
+//        String datares= HttpHelper.sendPost(huawuURL+"Customer/AddOrEditCusDataByWx",param);
+
+//        input.setF_CustomerId(13266L);
+//        input.setF_CustomerEName("wxnamenew");
+//        input.setF_CustomerName("瑟吉欧");
+        String datares= HttpHelper.sendJson(huawuURL+"Customer/AddOrEditCusDataByWx", JSON.toJSONString(input));
+
+        return  Success("外部接口编辑市民信息成功",datares);
+
+    }
+    @ApiOperation("调用外部接口通过wxid获取市民的历史工单信息")
+    @Log(title = "调用外部接口通过wxid获取市民的历史工单信息", businessType = BusinessType.UPDATE)
+    @GetMapping("/gethistoryorders")
+    @Anonymous
+    public AjaxResult gethistoryorders(String wxid) {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+        String param="wxid="+wxid;
+        String datares= HttpHelper.sendGet(huawuURL+"Order/getOrderDataByWx",param);
+        return  Success("外部接口获取市民信息通过微信id成功",datares);
+
+    }
+
+
+    @ApiOperation("调用外部接口添加工单")
+    @Log(title = "调用外部接口通过wxid获取市民的历史工单信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/addorder")
+    @Anonymous
+    public AjaxResult addorder(@RequestBody Map<String,Object> map) {
+        String  huawuURL=  SpringHelper.getRequiredProperty("huawuURL");
+        String datares= HttpHelper.sendJson(huawuURL+"WXInterFace/workOrderAddData",JSON.toJSONString(map));//
+        if(Objects.equals(datares, "True")){
+            return  Success("添加工单成功",datares);
+        }
+        else {
+            return Error("添加失败");
+        }
+
+    }
+
+
+    @ApiOperation("调用外部接口添加工单")
+    @Log(title = "调用外部接口通过wxid获取市民的历史工单信息", businessType = BusinessType.UPDATE)
+    @GetMapping("/addcuss")
+    @Anonymous
+    public AjaxResult addcuss() {
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+        CustomerInput in=new CustomerInput();
+        in.setF_CustomerId(0L);
+        in.setF_CustomerEName("534354354dsjkdljsklfd");
+
+        String param="wxid="+in.getF_CustomerEName();
+        String datares= HttpHelper.sendGet(huawuURL+"Customer/AddCusDataByWx",param);
+        return Success(datares);
+    }
+
+    @ApiOperation("调用外部接口获取字典下拉框，nld，clfs")
+    @Log(title = "调用外部接口获取字典下拉框", businessType = BusinessType.UPDATE)
+    @GetMapping("/getnld")
+    @Anonymous
+    public AjaxResult getnld(String diccodetype) {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+        String param="dicCodeType="+diccodetype;
+        String datares= HttpHelper.sendGet(huawuURL+"WXInterFace/GetDicList",param);
+        return  Success("获取字段成功",datares);
+
+    }
+
+    @ApiOperation("获取机许线的车站")
+    @Log(title = "获取机许线的车站", businessType = BusinessType.UPDATE)
+    @GetMapping("/getstation")
+    @Anonymous
+    public AjaxResult getstation() {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+
+        String datares= HttpHelper.sendGet(huawuURL+"WXInterFace/GetDicSelectStation");
+        return  Success("获取机许线的车站",datares);
+
+    }
+    @ApiOperation("获取业务类型")
+    @Log(title = "获取业务类型", businessType = BusinessType.UPDATE)
+    @GetMapping("/gettypelist")
+    @Anonymous
+    public AjaxResult gettypelist() {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+
+        String datares= HttpHelper.sendGet(huawuURL+"WXInterFace/GetWorkOrderTypeModelList");
+        return  Success("获取业务类型",datares);
+
+    }
+    @ApiOperation("获取转单部门")
+    @Log(title = "获取转单部门", businessType = BusinessType.UPDATE)
+    @GetMapping("/getdeptuserlist")
+    @Anonymous
+    public AjaxResult getdeptuserlist() {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+        String datares= HttpHelper.sendGet(huawuURL+"WXInterFace/GetDepartmentAndUserJsonModelTrun");
+        return  Success("获取转单部门",datares);
+    }
+    @ApiOperation("获取标签")
+    @Log(title = "获取标签", businessType = BusinessType.UPDATE)
+    @GetMapping("/gettaglist")
+    @Anonymous
+    public AjaxResult gettaglist() {
+
+        String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+        String datares= HttpHelper.sendGet(huawuURL+"WXInterFace/GetTagList");
+        return  Success("获取标签",datares);
+    }
+
+
+}

zxdt-api/src/main/resources/application-dev.yml

@@ -76,4 +76,8 @@ spring:
 
 startover: 192.168.1.15
 
+huawuURL: http://192.168.8.10:9908/
+
+huawuURL22:  http://localhost:41969/
+
 

zxdt-api/src/main/resources/application-production.yml

@@ -75,4 +75,5 @@ spring:
     username:
     password:
 
-startover: 192.168.1.15
+startover: 192.168.1.15
+huawuURL: http://10.160.153.117/

zxdt-api/src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    #active: production
-    active: dev
+     active: production
+    #active: dev
   servlet:
     multipart:
       max-file-size: 20MB #单个文件最大为20M

zxdt-entity/src/main/java/api/entity/database/system/User.java

@@ -32,11 +32,19 @@ public class User {
      */
     @ApiModelProperty("部门ID")
     private Long deptId;
+
+    @ApiModelProperty("用户账号,工号")
+    private String userName;
+
+    @ApiModelProperty("话务的userID")
+    private Long externalId;
+
+
     /**
      * 用户账号
      */
-    @ApiModelProperty("用户账号,工号")
-    private String userName;
+    @ApiModelProperty("用户部门name")
+    private String deptName;
     /**
      * 用户昵称
      */

zxdt-entity/src/main/java/api/entity/input/system/CustomerInput.java

@@ -0,0 +1,89 @@
+package api.entity.input.system;
+
+import api.entity.database.system.User;
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * 话务系统的市民信息
+ * 
+ * @author jiayi
+ */
+@Data
+public class CustomerInput
+{
+
+
+
+    /**
+     * 用户ID
+     */
+    private Long F_CustomerId;
+
+    /**
+     * 性别
+     */
+    private String F_CustomerPym;
+
+    /**
+     * 姓名
+     */
+    private String F_CustomerName;
+
+    /**
+     * 微信号
+     */
+    private String F_CustomerEName;
+
+    /**
+     * 微博号
+     */
+    private String F_PostCode;
+
+    /**
+     * 年龄段
+     */
+    private String F_CustomerCode;
+
+    /**
+     * 归属地
+     */
+    private String F_CustomerLayer;
+
+    /**
+     * 来电电话
+     */
+    private String F_Telephone;
+
+    /**
+     * 回复电话
+     */
+    private String F_Mobile;
+
+    //常进站
+    private  Long  F_DeviceCount;
+    //常进站
+    private String  F_Fax;
+
+
+    //常出站
+    private  Long  F_AfterSaleNameID;
+    //常出站
+    private String  F_Email;
+    //事发站点
+    private  Long  F_ProductLineID;
+
+    //事发站点
+    private String  F_Website;
+    /// 客户属性编码1、语音 2、微信 ，3，微博  客户来源
+    private String  F_Kind;
+    /// 最近联络方式 客户属性1、语音 2、留言 ，3，微信、,4、微博、
+    private String  F_CustomerNature;
+    //  客户等级编码1 、2、 3、
+    private String  F_ScaleResume;
+    //  客户等级1、一般客户 2、特别关注 3、黑名单
+    private String      F_CustomerClass;
+    // 创建人
+    public Long F_CreateBy;
+}

zxdt-entity/src/main/java/api/entity/input/system/OrderInput.java

@@ -0,0 +1,91 @@
+package api.entity.input.system;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OrderInput {
+
+    private Integer  F_CUSTOMERID;
+    private Integer F_WORKORDERID;
+
+    private String F_WORKORDERFROM;
+    private String F_CUSTOMERNAME;
+    private String   F_RETURNVISITPROBLEM;
+
+
+
+
+    private Integer F_REPAIRLEVEL;//": "41",  业务类型id  T_Wo_WorkOrderType表的id
+
+
+    private Integer  F_WORKORDERLEVELID;// 事发车站id
+    private String  F_WORKORDERNAME;  //事发车站名称
+    private String F_CONTENT;//": "商易行APP二维码故障这是内容。",
+    private Integer     F_WORKORDERTYPEID;  // 处理方式  1转单 3客服处理
+    private Date F_REQUESTSERVICETIME ;// 要求处理部门的【回复】时间
+    private String  F_RETURNVISITCONTENT;// 回复内容
+
+
+
+
+    /// 客户电话
+    /// </summary>
+    private String F_CUSTOMERTELEPHONE;
+    /// 0未处理 1处理中  2已办结（结束） 3待回访 4待定责 5已定责，已处理
+    /// 新加的：8待处理撤回审批中(转办)  9 待定责撤回审批中（客服处理和转办）   10 已处理撤回审批中（客服处理）
+    /// </summary>
+    private Integer F_WORKORDERSTATEID;
+    /// <summary>
+    /// 工单状态名称
+    /// </summary>
+    private String  F_REPAIRREQUEST;
+
+    /// <summary>
+    /// 处理方式名称
+    /// </summary>
+    private String F_INSTALLADDRESS;
+
+
+    /// <summary>
+    /// 业务类型名称 ：选的最小类的名称 例如：投诉安检工作人员
+    /// </summary>
+    private String F_ADSLACCOUNT ;
+    /// <summary>
+    /// 业务类别 20210715 -- 3 投诉 6 咨询 14 建议 18表扬 19挂失
+    /// </summary>
+    private Integer  F_FILEFLAG;
+    /// <summary>
+    ///业务类别名称 ：咨询 投诉 表扬 建议 挂失
+    /// </summary>
+    private String F_HOUSING;
+
+    /// <summary>
+    /// 对接受理部门
+    /// </summary>
+    private String F_DEPTCODE;
+
+    /// <summary>
+    /// 受理人员姓名
+    /// </summary>
+    private String F_USERNAME;
+
+    /// <summary>
+    /// 计划回访时间
+    /// </summary>
+    private Date F_RETURNVISITTIME;
+
+    /// <summary>
+    /// 是否回访 0 不回访 1 回访
+    /// </summary>
+    private Integer  F_RETURNVISITFLAG;
+
+
+
+    private Integer  F_REPAIRMANID;
+
+    //创建人的话务系统里的userid
+    private Integer  F_CREATEBY;
+    private CustomerInput CustomerBaseModel ;
+}

zxdt-service/src/main/java/api/service/system/IUserService.java

@@ -35,7 +35,7 @@ public interface IUserService extends IBaseService<User> {
      * @return 用户信息集合信息
      */
     public List<User> selectUnallocatedList(User user);
-
+    boolean checkUserNameExternalUnique(User user ) ;
     /**
      * 校验用户名称是否唯一
      *

zxdt-service/src/main/java/api/service/system/impl/UserServiceImpl.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -107,6 +108,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         }
         return true;
     }
+    @Override
+    public boolean checkUserNameExternalUnique(User user ) {
+        LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
+        qw.eq(User::getUserName, user.getUserName()).eq(User::getDelFlag, "0");
+        List<User> userList =this.getList(qw);
+        if (!StringHelper.isNull(userList) && userList.stream().count()>0) {
+
+            return false;
+        }
+        return true;
+    }
 
     /**
      * 校验用户昵称是否唯一

zxdt-service/src/main/java/api/service/websocket/WebSocket.java

@@ -4,6 +4,7 @@ import api.entity.database.online.AutoReply;
 import api.entity.database.online.Message;
 import api.entity.database.system.Customer;
 import api.entity.input.online.MessageInput;
+import api.entity.input.system.CustomerInput;
 import api.entity.view.online.MessageView;
 import api.service.online.IAutoReplyService;
 import api.service.online.IMessageService;
@@ -645,6 +646,10 @@ public class WebSocket {
         if (!customers.containsKey(sendUser)) {
             customers.put(sendUser, 2);
             addCustomer(sendUser, 2, null);
+            log.info("添加customwe"+sendUser);
+
+
+
         }
 
         String kf = khkfs.get(sendUser);
@@ -833,6 +838,21 @@ public class WebSocket {
             customer.setFIsdelete(0L);
             webSocket.customerService.insert(customer);
         }
+        // 调用vs的接口
+        try{
+            String  huawuURL= SpringHelper.getRequiredProperty("huawuURL");
+            log.info("huawuURL---"+huawuURL);
+
+
+            String param="wxid="+userCode;
+            String datares= HttpHelper.sendGet(huawuURL+"Customer/AddCusDataByWx",param);
+
+            log.info("datares---"+datares);
+        }catch(Exception e) {
+            log.info(e.toString());
+        }
+
+
     }
 
     //客服置忙

zxdt-util/src/main/java/api/util/helper/HttpHelper.java

@@ -1,16 +1,24 @@
 package api.util.helper;
 
+import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.bouncycastle.jcajce.provider.digest.MD5;
 import org.springframework.stereotype.Component;
 
 import javax.net.ssl.*;
 import java.io.*;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.*;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 @Component
 @Slf4j
@@ -52,10 +60,17 @@ public class HttpHelper {
         BufferedReader in = null;
         try
         {
-            String urlNameString = StringHelper.isEmpty(param) ? url + "?" + param : url;
+            String urlNameString = !StringHelper.isEmpty(param) ? url + "?" + param : url;
             log.info("sendGet - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
             URLConnection connection = realUrl.openConnection();
+             Map<String,String> map=new HashMap<>();
+             UUID uuid=UUID.randomUUID();
+             map.put("uuid", uuid.toString() );
+             map.put("pass",SecretHelper.MD5("liaotianxitong%@"+uuid.toString()));
+          for (Map.Entry<String,String> entry: map.entrySet()){
+              connection.setRequestProperty(entry.getKey(),entry.getValue());
+          }
             connection.setRequestProperty("accept", "*/*");
             connection.setRequestProperty("connection", "Keep-Alive");
             connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
@@ -118,6 +133,14 @@ public class HttpHelper {
             log.info("sendPost - {}", url);
             URL realUrl = new URL(url);
             URLConnection conn = realUrl.openConnection();
+            Map<String,String> map=new HashMap<>();
+            UUID uuid=UUID.randomUUID();
+            map.put("uuid", uuid.toString() );
+            map.put("pass",SecretHelper.MD5("liaotianxitong%@"+uuid.toString()));
+            for (Map.Entry<String,String> entry: map.entrySet()){
+                conn.setRequestProperty(entry.getKey(),entry.getValue());
+            }
+
             conn.setRequestProperty("accept", "*/*");
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
@@ -228,6 +251,102 @@ public class HttpHelper {
         return result.toString();
     }
 
+    public  static String sendJson(String url,String json) {
+
+        try{
+        HttpClient httpClient = HttpClients.createDefault(); // 创建HTTP POST请求
+        HttpPost httpPost = new HttpPost(url);
+
+            Map<String,String> map=new HashMap<>();
+            UUID uuid=UUID.randomUUID();
+            map.put("uuid", uuid.toString() );
+            map.put("pass",SecretHelper.MD5("liaotianxitong%@"+uuid.toString()));
+            for (Map.Entry<String,String> entry: map.entrySet()){
+                httpPost.addHeader(entry.getKey(),entry.getValue());
+            }
+
+
+
+
+            // 设置HTTP POST请求的实体（JSON参数）
+        StringEntity entity = new StringEntity( json,"UTF-8");
+        entity.setContentType("application/json");
+
+        httpPost.setEntity(entity);
+
+
+
+
+        // 执行HTTP POST请求
+        HttpResponse response = httpClient.execute(httpPost);
+
+        // 打印响应状态
+        System.out.println("Response Code : " + response.getStatusLine().getStatusCode());
+
+        // 读取服务器响应内容
+        String responseBody = EntityUtils.toString(response.getEntity());
+        System.out.println("Response Body : " + responseBody);
+        return responseBody;
+
+    }catch (Exception e) {
+        e.printStackTrace();
+    }
+        return  "";
+    }
+
+    public  static  String sendJsonPost(String url, String jsonData){
+        PrintWriter out=null;
+        BufferedReader in =null;
+        StringBuilder result=new StringBuilder();
+        try {
+            URL realurl = new URL(url);
+            URLConnection con = realurl.openConnection();
+            HttpURLConnection conn = (HttpURLConnection) con;
+            conn.setRequestMethod("POST");
+            conn.setConnectTimeout(5 * 1000);
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible;MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Content-Type",
+                    "application/json"); // 设置内容类型
+// 发送POST请求必须设置如下两行 conn.setDoOutput(true); conn.setDoInput(true);
+            conn.setUseCaches(false);
+// 获舰URLConnection对象对应的输出流
+            out = new PrintWriter(new OutputStreamWriter(
+                    conn.getOutputStream(), "utf-8"));
+            out.write(jsonData);
+            out.flush();
+            in = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+
+            }
+            byte[] bresult = result.toString().getBytes();
+            result = new StringBuilder(new String(bresult, "utf-8"));
+
+        }  catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+finally {
+            try {
+                if(out!=null){
+                    out.close();
+                }if(in!=null){
+                    in.close();
+                }
+
+            }
+            catch (IOException ex){
+                ex.printStackTrace();
+            }
+        }
+        return result.toString();
+
+    }
     private static class TrustAnyTrustManager implements X509TrustManager
     {
         @Override