优化

platform-common/src/main/java/com/platform/common/util/HttpUtil.java

@@ -18,7 +18,11 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +37,21 @@ import java.util.Set;
 @Slf4j
 public class HttpUtil {
 
+    public static String getRequestParams(HttpServletRequest request) throws IOException {
+        request.setCharacterEncoding("UTF-8");
+        BufferedReader br = new BufferedReader(
+                new InputStreamReader((ServletInputStream) request.getInputStream(), "utf-8"));
+        StringBuffer sb = new StringBuffer("");
+        String temp;
+        while ((temp = br.readLine()) != null) {
+            sb.append(temp);
+        }
+        br.close();
+        String respStr = sb.toString();
+        log.info("请求数据："+respStr);
+        return respStr;
+    }
+
     /**
      * get请求，url参数拼装在url后面即可
      *

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -23,6 +23,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private String refuseRemark;//被拒备注
+
+
     private LocalDate needDate;//需求日期
 
     private LocalDate planGetDate;//计划到货日期

platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseOrder.java

@@ -24,6 +24,7 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+    private String refuseRemark;//被拒备注
     private LocalDate needDate;//需求日期
 
     private LocalDate planGetDate;//计划到货日期

platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseOrderVO.java

@@ -24,6 +24,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+    private String refuseRemark;//被拒备注
+
     private LocalDate needDate;//需求日期
 
     private LocalDate planGetDate;//计划到货日期

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongYouResponseUtil.java

@@ -0,0 +1,79 @@
+package com.platform.rest.controller.yongyou;
+
+import com.platform.common.util.JsonUtils;
+import handler.yongyou.response.ToYongYouBaseResponse;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+
+/**
+ * 内蒙古返回封装
+ */
+@Slf4j
+public class YongYouResponseUtil {
+
+    public static String SUCCESS = "成功";
+    public static String EXCEPTION = "返回异常";
+    /**
+     * 普通回调
+     * @return
+     */
+//    public static ToYongYouBaseResponse normalReturn(){
+//        ToYongYouBaseResponse resp = new BaseResponse();
+//        resp.setCode("1");
+//        resp.setMessage(SUCCESS);
+//        return resp;
+//    }
+
+//    public static BaseResponse successReturn(Object obj){
+//        BaseResponse resp = new BaseResponse();
+//        resp.setCode("1");
+//        resp.setMessage(SUCCESS);
+//        resp.setData(obj);
+//        return resp;
+//    }
+
+    /**
+     * 带引导客户的url返回
+     * @param url
+     * @return
+     */
+//    public static BaseResponse redictUrlReturn(String url){
+//        GuaranteeApplyResponse resp = new GuaranteeApplyResponse();
+//        resp.setCode("1");
+//        resp.setMessage(SUCCESS);
+//        ResponseData data = new ResponseData();
+//        data.setRedirecturl(url);
+//        resp.setData(data);
+//        return resp;
+//    }
+
+    /**
+     * 异常放回
+     * @param
+     * @return
+     * @throws Exception
+     */
+//    public static BaseResponse exceptionReturn(String infoData){
+//        BaseResponse resp = new BaseResponse();
+//        resp.setCode("0");
+//        resp.setMessage(infoData);
+//        return resp;
+//    }
+
+    public static void wirteBack(ToYongYouBaseResponse resp, HttpServletResponse response){
+        try {
+            response.setContentType("application/json;charset=utf-8");
+            PrintWriter p = response.getWriter();
+            String respData = JsonUtils.objectToJson(resp);
+            log.info("同步响应明文："+resp);
+            p.print(respData);
+            p.flush();
+            p.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.toString());
+        }
+    }
+}

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -2,9 +2,10 @@ package com.platform.rest.controller.yongyou;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.HttpUtil;
 import com.platform.common.util.JsonUtils;
 import com.platform.common.util.R;
-import com.platform.dao.dto.spareAdd.Inventory;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.spareAdd.InventoryTest;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
@@ -12,11 +13,18 @@ import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.yongyou.YongyouService;
+import com.platform.service.yongyou.PurchaseOrderModNoticeHandler;
+import handler.yongyou.request.FromYongYouBaseRequest;
+import handler.yongyou.request.PurchaseOrderStatusModNoticeRequest;
+import handler.yongyou.response.ToYongYouBaseResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description 备件领用登记单 控制器
  * @Author liuyu
@@ -30,6 +38,10 @@ import org.springframework.web.bind.annotation.*;
 public class YongyouController {
 
     private final YongyouService yongyouService;
+    @Resource
+    private final PurchaseOrderModNoticeHandler purchaseOrderModNoticeHandler;
+
+
 
     /**
      * 查询用友备件分页数据
@@ -44,6 +56,28 @@ public class YongyouController {
         return new R<>(yongyouService.selectPageList(sparePartInfoDTO, pageNum, pageSize));
     }
 
+    @PostMapping("/purchaseOrder/status/mod")
+    public void PurchaseOrderNotice(HttpServletRequest request, HttpServletResponse response){
+        ToYongYouBaseResponse bs = null;
+        FromYongYouBaseRequest req = null;
+        try {
+            String reqStr = HttpUtil.getRequestParams(request);
+            if (StringUtils.isNotBlank(reqStr)) {
+                req = JsonUtils.jsonToModel(reqStr, PurchaseOrderStatusModNoticeRequest.class);
+                bs = purchaseOrderModNoticeHandler.propellingHandle(req, reqStr);
+            }
+        } catch (Exception e) {
+            bs.setResult(false);
+            bs.setMsg("系统错误！");
+            e.printStackTrace();
+            log.error("临沂理赔申请接口出错：" + e.getCause().getMessage());
+//            bs = LinYiResponseUtil.exceptionReturn(e.getMessage());
+        }
+        // 数据回传,这里的bs，默认做了加密处理
+        YongYouResponseUtil.wirteBack(bs, response);
+    }
+
+
     /**
      * 查询用友存量库存分页数据
      *
@@ -96,7 +130,7 @@ public class YongyouController {
     }
 
     @SysLog("请购单删除")
-    @GetMapping("/delete/purcahseOrder/{id}")
+    @DeleteMapping("/delete/purcahseOrder/{id}")
     public R deletePurchaseOrder(@PathVariable String id) {
         return new R<>(yongyouService.deletePurchaseOrder(id));
     }

platform-rest/src/main/resources/application-dev.yml

@@ -89,6 +89,7 @@ ignore:
     - /preparation/preparations/**
     - /longyanpurchaseorder/detail/**
     - /longyanpurchaseorder/order/**
+    - /yongyou/purchaseOrder/status/mod
 platform:
   slf4j:
     data: D://xajg

platform-service/src/main/java/com/platform/service/yongyou/PurchaseOrderModNoticeHandler.java

@@ -0,0 +1,63 @@
+package com.platform.service.yongyou;
+
+import com.alibaba.fastjson.JSONObject;
+import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.JsonUtils;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
+import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
+import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
+import handler.yongyou.BaseRequestHandler;
+import handler.yongyou.request.AddSpareRequest;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
+import handler.yongyou.request.PurchaseOrderStatusModNoticeRequest;
+import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.ToYongYouBaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+@Slf4j
+@Component
+public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
+    @Resource
+    private LongYanPurchaseOrderMapper longYanPurchaseOrderMapper;
+
+    public PurchaseOrderModNoticeHandler(){
+        setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_ADDSPARE.getType());
+    }
+
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        PurchaseOrderStatusModNoticeRequest request = (PurchaseOrderStatusModNoticeRequest)req;
+        LongYanPurchaseOrder order = new LongYanPurchaseOrder();
+        order.setYongYouId(request.getYongYouId());
+        order = longYanPurchaseOrderMapper.selectOne(order);
+        order.setStatus(request.getStatus());
+        order.setRefuseRemark(request.getRemark());
+        order.setUpdateTime(LocalDateTime.now());
+
+        longYanPurchaseOrderMapper.updateByPrimaryKeySelective(order);
+        ToYongYouBaseResponse response = new ToYongYouBaseResponse();
+        R r = new R();
+        response.setResult(true);
+        response.setMsg("成功");
+        r.setData(response);
+        return r;
+    }
+
+    /**
+     * 获取分页数据
+     * @param req
+     * @param resp
+     */
+    @Override
+    public void successResponse(BaseRequest req, BaseResponse resp) {
+        AddSpareRequest request = (AddSpareRequest)req;
+//        AddSpareResponse response = (AddSpareResponse)resp;
+    }
+}

platform-service/src/main/java/handler/yongyou/AddSpareHandler.java

@@ -1,8 +1,11 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -15,6 +18,12 @@ public class AddSpareHandler extends BaseRequestHandler{
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_ADDSPARE.getType());
     }
 
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/BaseRequestHandler.java

@@ -13,7 +13,9 @@ import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import com.platform.dao.entity.upms.ThirdInfoLog;
 import com.platform.service.upms.ThirdInfoLogService;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.ToYongYouBaseResponse;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
@@ -69,6 +71,20 @@ public abstract class BaseRequestHandler {
         return responseStr;
     }
 
+    public ToYongYouBaseResponse propellingHandle(FromYongYouBaseRequest req,String reqStr){
+        ToYongYouBaseResponse respData = null;
+        //获取head
+
+            // 具体处理
+            R resp = successHandler(req);
+            respData = (ToYongYouBaseResponse) resp.getData();
+
+        return respData;
+    }
+
+    public abstract R successHandler(FromYongYouBaseRequest req);
+
+
     /**
      * 生成request log
      *

platform-service/src/main/java/handler/yongyou/DeletePurchaseOrderHandler.java

@@ -1,9 +1,12 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.BaseRequestHandler;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -16,6 +19,12 @@ public class DeletePurchaseOrderHandler extends BaseRequestHandler {
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_DELETEPURCHASEORDER.getType());
     }
 
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetCurrentStockHandler.java

@@ -1,7 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.GetCurrentStockRequest;
 import handler.yongyou.response.BaseResponse;
 import handler.yongyou.response.GetCurrentStockResponse;
@@ -16,6 +19,12 @@ public class GetCurrentStockHandler extends BaseRequestHandler{
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_GETSTOCK.getType());
     }
 
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req
@@ -26,4 +35,4 @@ public class GetCurrentStockHandler extends BaseRequestHandler{
         GetCurrentStockRequest request = (GetCurrentStockRequest)req;
         GetCurrentStockResponse response = (GetCurrentStockResponse)resp;
     }
-}
+}

platform-service/src/main/java/handler/yongyou/GetInventoryListHandler.java

@@ -1,7 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.GetInventoryListRequest;
 import handler.yongyou.response.BaseResponse;
 import handler.yongyou.response.GetInventoryListResponse;
@@ -16,6 +19,12 @@ public class GetInventoryListHandler extends BaseRequestHandler{
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_INVENTORYLIST.getType());
     }
 
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/LoginHandler.java

@@ -1,7 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.LoginRequest;
 import handler.yongyou.response.BaseResponse;
 import handler.yongyou.response.LoginResponse;
@@ -16,6 +19,12 @@ public class LoginHandler extends BaseRequestHandler{
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_LOGIN.getType());
     }
 
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 处理登录用友返回数据
      * 1:保存token，还是每次都调用token接口

platform-service/src/main/java/handler/yongyou/OtherOutHandler.java

@@ -1,7 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.OtherOutAddRequest;
 import handler.yongyou.response.BaseResponse;
 import handler.yongyou.response.OtherOutAddResponse;
@@ -21,6 +24,13 @@ public class OtherOutHandler extends BaseRequestHandler{
     public OtherOutHandler(){
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_OTHEROUT.getType());
     }
+
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 处理出库，退库返回结果
      * 1:保存返回的出库入库单id

platform-service/src/main/java/handler/yongyou/PushPurchaseOrderHandler.java

@@ -1,8 +1,11 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -15,6 +18,13 @@ public class PushPurchaseOrderHandler extends BaseRequestHandler{
         setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_PUSHPURCHASEORDER.getType());
     }
 
+
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/request/FromYongYouBaseRequest.java

@@ -0,0 +1,10 @@
+package handler.yongyou.request;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FromYongYouBaseRequest implements Serializable {
+}

platform-service/src/main/java/handler/yongyou/request/PurchaseOrderStatusModNoticeRequest.java

@@ -0,0 +1,11 @@
+package handler.yongyou.request;
+
+import lombok.Data;
+
+@Data
+public class PurchaseOrderStatusModNoticeRequest extends FromYongYouBaseRequest {
+    private String yongYouId;
+    private Integer status;
+    private String remark;
+
+}

platform-service/src/main/java/handler/yongyou/response/ToYongYouBaseResponse.java

@@ -0,0 +1,14 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 查询响应
+ */
+@Data
+public class ToYongYouBaseResponse implements Serializable {
+    private Boolean result;
+    private String msg;
+}