完善内部推送功能

fs-danaus

2021-05-14 6260523a4654e2a4992958a7d2ef517d431bc02b

完善内部推送功能

 WebRoot/js/index/funcLink.js

@@ -1291,7 +1291,7 @@
            }
            var key=sfs[i];
            try{
                k=k.toLowerCase();
                key = key.toLowerCase();
                if (typeof (mygrid) != "undefined") {
                    prossDate(key, mygrid, rows, k);
                }

 src/com/yc/action/grid/GTGrid.java

@@ -500,8 +500,6 @@
                    //表示在出错处理里判断是执行了取消确认出的错
                    isactionCanel = true;
                    //----
                    //  String s=null;
                    // s= s.replace("a","");
                } catch (Exception e1) {
                    throw new ApplicationException(this.getErrorMsg(e1));
                }

 src/com/yc/api/bean/CartEntity.java

@@ -13,7 +13,8 @@
    private String photoPath;
    private String brand;
    private Double price;
    private Double salesPrice ;
    private Double salesPrice;
    private Double manualPrice;
    private Double discount;
    private String amount;
}

 src/com/yc/api/controller/QrCodeController.java

@@ -29,7 +29,6 @@
import com.yc.utils.SessionKey;
import org.apache.commons.lang.text.StrBuilder;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -308,8 +307,8 @@
                for (CartEntity cartEntity : carts) {
                    sb.append("    insert into t710205 (UserCode,UserName,CltCode,CltName,MatCode,MatName,Special,PhotoPath, \n")
                            .append("      Quantity,Price,Amount,WeightUom,DateAdded,VoucherDocCode,\n")
                            .append("      refDocCode,refFormId,refFormType,refRowId,isSelected,MatGroupStatus,SalesPrice,Discount)  \n")
                            .append("    values(" + GridUtils.prossSqlParm(postCartEntity.getUserCode()) + "," + GridUtils.prossSqlParm(userName) + "," + GridUtils.prossSqlParm(postCartEntity.getCltCode()) + "," + GridUtils.prossSqlParm(postCartEntity.getCltName()) + "," + GridUtils.prossSqlParm(cartEntity.getMatCode()) + "," + GridUtils.prossSqlParm(cartEntity.getMatName()) + "," + GridUtils.prossSqlParm(cartEntity.getSpecial()) + " ," + GridUtils.prossSqlParm(cartEntity.getPhotoPath()) + "," + cartEntity.getQuantity() + "," + cartEntity.getPrice() + "," + cartEntity.getAmount() + ",null,getdate(),null," + GridUtils.prossSqlParm(postCartEntity.getRefDocCode()) + "," + postCartEntity.getRefFormId() + "," + postCartEntity.getRefFormType() + "," + GridUtils.prossSqlParm(postCartEntity.getRefRowId()) + ",1,1," + cartEntity.getSalesPrice() + "," + cartEntity.getDiscount() + ")\n")
                            .append("      refDocCode,refFormId,refFormType,refRowId,isSelected,MatGroupStatus,SalesPrice,Discount,ManualPrice)  \n")
                            .append("    values(" + GridUtils.prossSqlParm(postCartEntity.getUserCode()) + "," + GridUtils.prossSqlParm(userName) + "," + GridUtils.prossSqlParm(postCartEntity.getCltCode()) + "," + GridUtils.prossSqlParm(postCartEntity.getCltName()) + "," + GridUtils.prossSqlParm(cartEntity.getMatCode()) + "," + GridUtils.prossSqlParm(cartEntity.getMatName()) + "," + GridUtils.prossSqlParm(cartEntity.getSpecial()) + " ," + GridUtils.prossSqlParm(cartEntity.getPhotoPath()) + "," + cartEntity.getQuantity() + "," + cartEntity.getPrice() + "," + cartEntity.getAmount() + ",null,getdate(),null," + GridUtils.prossSqlParm(postCartEntity.getRefDocCode()) + "," + postCartEntity.getRefFormId() + "," + postCartEntity.getRefFormType() + "," + GridUtils.prossSqlParm(postCartEntity.getRefRowId()) + ",1,1," + cartEntity.getSalesPrice() + "," + cartEntity.getDiscount() + "," + cartEntity.getManualPrice() + ")\n")
                            .append("    SELECT @CartId =isnull(@CartId,'')+cast(@@IDENTITY as varchar) +','; \n");
                }
                sb.append(" select @CartId=left(@cartId,len(@cartId)-1) \n");

 src/com/yc/api/schedule/AttendanceSchedule.java

@@ -119,20 +119,22 @@
                                            alais, t180252.getTitle(), extras));
                            if (flag) {
                                //推送成功
                                //log.info(dataSourceEntity.getSystemDescribe()+":"+usercode+">推送成功");
                                seqList.add(String.valueOf(t180252.getSeq()));

                            }
                        } catch (APIConnectionException e) {
                            // Connection error, should retry later
                            System.out.println("Connection error, should retry later" + e.getMessage());
                            log.error(usercode + " Connection error, should retry later" + e.getMessage());
                        } catch (APIRequestException e) {
                            // Should review the error, and fix the request
                            System.out.println("dbid: " + dataSourceEntity.getDbId());
                            System.out.println("HTTP Status: " + e.getStatus());
                            System.out.println("Error Code: " + e.getErrorCode());
                            System.out.println("Error Message: " + e.getErrorMessage());
                            log.error("dbid: " + dataSourceEntity.getDbId() + ">" + usercode);
                            log.error("HTTP Status: " + e.getStatus());
                            log.error("Error Code: " + e.getErrorCode());
                            log.error("Error Message: " + e.getErrorMessage());

                        } catch (Exception e) {
                            log.error(dataSourceEntity.getSystemDescribe() + ":" + usercode + ">推送出错:" + e.getMessage());
                            e.printStackTrace();
                        }
                    }

 src/com/yc/open/mutual/controller/MutualController.java

@@ -808,8 +808,10 @@
                    if (erroCode != 0) {
                        throw new ApplicationException(GridUtils.prossRowSetDataType_String(map, "msg"), erroCode);
                    }
                    //更新callBackMsg为空，表示已删除成功,就算自身取消确认失败也不需要再执行删除操作
                    mutualServiceIfc.updateCallBackMsgBy130301(docCode);
                    if (actionType == 1) {
                        //更新callBackMsg为空，表示已删除成功,就算自身取消确认失败也不需要再执行删除操作
                        mutualServiceIfc.updateCallBackMsgBy130301(docCode);
                    }
                }
            } finally {
                SpObserver.setDBtoInstance();

 src/com/yc/open/mutual/service/MutualServiceImpl.java

@@ -504,7 +504,8 @@
    public Map reduction120201(T120201Entity t120201Entity) {
        return this.jdbcTemplate.queryForMap("set nocount  on \n" +
                "  declare @docCode varchar(50),@Memo varchar(50), @LinkDocInfo varchar(50),@refCode varchar(50)=? \n" +
                " select @docCode=doccode from _Sys_SaveRecForDeleted where refcode=@docCode \n" +
                " select @docCode=doccode from _Sys_SaveRecForDeleted where refcode=@refCode and DocStatus = 0\n" +
                "  if isnull(@docCode,'')<>''" +
                "  exec p9746 @docCode=@docCode,@UserCode = 'SYSTEM',@UserName = '系统管理员',@Memo=@Memo,@LinkDocInfo=@LinkDocInfo \n" +
                " select @Memo as memo,@LinkDocInfo as linkDocInfo", t120201Entity.getDocCode());
    }