fix:

1. 修改 SaleRules 中一些字段
2. 其他修改

logs/messagequeue/messagequeue.log

 
 [INFO]2021-03-16 10:29:07[run][启动程序即开始消费响应消息队列]
-[INFO]2021-03-16 10:29:07[run][响应消息队列当前长度：0]
+[INFO]2021-03-16 10:29:07[run][响应消息队列当前长度：0]
\ No newline at end of file
+[INFO]2021-03-16 14:22:24[run][启动程序即开始消费响应消息队列]
+[INFO]2021-03-16 14:22:24[run][响应消息队列当前长度：0]
\ No newline at end of file

src/main/java/com/yutu/base/controller/DownLoadController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("files/")
+@RequestMapping("statementApi/")
 public class DownLoadController {
 
     private Logger logger = Logger.getLogger("download");

src/main/java/com/yutu/base/controller/UploadController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
-@RequestMapping("files/")
+@RequestMapping("statementApi/")
 public class UploadController {
     Logger logger = Logger.getLogger("upload");
     @Autowired
@@ -27,7 +27,7 @@ public class UploadController {
 
     @RequestMapping(value = "privateFreight/upload.do",method = RequestMethod.POST)
     public Response uploadPrivateFreight(@RequestBody String requestBody){
-        logger.info("上传销售规则,参数:"+requestBody);
+        logger.info("上传私有运价底价配置,参数:"+requestBody);
         Response response =  uploadService.uploadPrivateFreight(requestBody);
         logger.info("上传结果："+response);
         return response;

src/main/java/com/yutu/base/entity/ExtraData.java

@@ -2,37 +2,44 @@ package com.yutu.base.entity;
 
 import java.io.Serializable;
 
-public class ExtraData<T> implements Serializable{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	private T paramData;
-	private String msg;
-	public T getParamData() {
-		return paramData;
-	}
-	public void setParamData(T paramData) {
-		this.paramData = paramData;
-	}
-	public String getMsg() {
-		return msg;
-	}
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-	public ExtraData(T paramData, String msg) {
-		super();
-		this.paramData = paramData;
-		this.msg = msg;
-	}
-	public ExtraData() {
-		super();
-	}
-	@Override
-	public String toString() {
-		return "ExtraData [paramData=" + paramData + ", msg=" + msg + "]";
-	}
-	
+public class ExtraData<T> implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+    private T paramData;
+    private String msg;
+
+    public T getParamData() {
+        return paramData;
+    }
+
+    public void setParamData(T paramData) {
+        this.paramData = paramData;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public ExtraData(T paramData, String msg) {
+        super();
+        this.paramData = paramData;
+        this.msg = msg;
+    }
+
+    public ExtraData() {
+        super();
+    }
+
+    @Override
+    public String toString() {
+        return "ExtraData [paramData=" + paramData + ", msg=" + msg + "]";
+    }
+
 }

src/main/java/com/yutu/base/entity/NoteResult.java

@@ -2,61 +2,71 @@ package com.yutu.base.entity;
 
 import java.io.Serializable;
 
-public class NoteResult implements Serializable{
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 状态码 0-成功  2-失败
-	 */
-	private int status;
-	/**
-	 * 消息提示,如(成功)
-	 */
-	private String msg;
-	/**
-	 * 额外信息
-	 */
-	private String info;
-	/**
-	 * 设置要返回的具体数据
-	 */
-	private Object data;//返回的数据
-	public NoteResult(){
-		
-	}
-	public NoteResult(int status, String msg, Object data) {
-		this.status = status;
-		this.msg = msg;
-		this.data = data;
-	}
-	
-	public Object getData() {
-		return data;
-	}
-	public void setData(Object data) {
-		this.data = data;
-	}
-	public int getStatus() {
-		return status;
-	}
-	public void setStatus(int status) {
-		this.status = status;
-	}
-	public String getMsg() {
-		return msg;
-	}
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-	public String getInfo() {
-		return info;
-	}
-	public void setInfo(String info) {
-		this.info = info;
-	}
-	@Override
-	public String toString() {
-		return "NoteResult [status=" + status + ", msg=" + msg + ", info="
-				+ info + ", data=" + data + "]";
-	}
-	
+public class NoteResult implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 状态码 0-成功  2-失败
+     */
+    private int status;
+    /**
+     * 消息提示,如(成功)
+     */
+    private String msg;
+    /**
+     * 额外信息
+     */
+    private String info;
+    /**
+     * 设置要返回的具体数据
+     */
+    private Object data;//返回的数据
+
+    public NoteResult() {
+
+    }
+
+    public NoteResult(int status, String msg, Object data) {
+        this.status = status;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    @Override
+    public String toString() {
+        return "NoteResult [status=" + status + ", msg=" + msg + ", info="
+                + info + ", data=" + data + "]";
+    }
+
 }

src/main/java/com/yutu/base/entity/SaleRules.java

@@ -42,17 +42,13 @@ public class SaleRules implements Serializable {
 
 	private BigDecimal adultPricePoint;//成人价格加点
 	private Integer adultAddPrice;//成人加价
-	private Integer adultAddTax;//成人税费加价
-	private BigDecimal adultTaxPoint;//成人税费加点
-	
-	
+
+
 	private BigDecimal childPricePoint;//儿童价格加点
 	private Integer childAddPrice;//儿童加价
-	private Integer childAddTax;//儿童税费加价
-	private BigDecimal childTaxPoint;//儿童税费加点
-	
+
 	private String operator;//操作员名称
-	
+
 	private Date createTime;
 	private Date updateTime;
 	private Integer deleted;//删除标识，0默认未删除，1已删除
@@ -98,12 +94,8 @@ public class SaleRules implements Serializable {
 		this.minProfit = minProfit;
 		this.adultPricePoint = adultPricePoint;
 		this.adultAddPrice = adultAddPrice;
-		this.adultAddTax = adultAddTax;
-		this.adultTaxPoint = adultTaxPoint;
 		this.childPricePoint = childPricePoint;
 		this.childAddPrice = childAddPrice;
-		this.childAddTax = childAddTax;
-		this.childTaxPoint = childTaxPoint;
 		this.operator = operator;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -139,12 +131,8 @@ public class SaleRules implements Serializable {
 		this.minProfit = minProfit;
 		this.adultPricePoint = adultPricePoint;
 		this.adultAddPrice = adultAddPrice;
-		this.adultAddTax = adultAddTax;
-		this.adultTaxPoint = adultTaxPoint;
 		this.childPricePoint = childPricePoint;
 		this.childAddPrice = childAddPrice;
-		this.childAddTax = childAddTax;
-		this.childTaxPoint = childTaxPoint;
 		this.operator = operator;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -331,22 +319,6 @@ public class SaleRules implements Serializable {
 		this.adultAddPrice = adultAddPrice;
 	}
 
-	public Integer getAdultAddTax() {
-		return adultAddTax;
-	}
-
-	public void setAdultAddTax(Integer adultAddTax) {
-		this.adultAddTax = adultAddTax;
-	}
-
-	public BigDecimal getAdultTaxPoint() {
-		return adultTaxPoint;
-	}
-
-	public void setAdultTaxPoint(BigDecimal adultTaxPoint) {
-		this.adultTaxPoint = adultTaxPoint;
-	}
-
 	public BigDecimal getChildPricePoint() {
 		return childPricePoint;
 	}
@@ -363,22 +335,6 @@ public class SaleRules implements Serializable {
 		this.childAddPrice = childAddPrice;
 	}
 
-	public Integer getChildAddTax() {
-		return childAddTax;
-	}
-
-	public void setChildAddTax(Integer childAddTax) {
-		this.childAddTax = childAddTax;
-	}
-
-	public BigDecimal getChildTaxPoint() {
-		return childTaxPoint;
-	}
-
-	public void setChildTaxPoint(BigDecimal childTaxPoint) {
-		this.childTaxPoint = childTaxPoint;
-	}
-
 	public String getOperator() {
 		return operator;
 	}
@@ -427,7 +383,7 @@ public class SaleRules implements Serializable {
 	public void setCostPrice(Integer costPrice) {
 		this.costPrice = costPrice;
 	}
-	
+
 	public String getRuleCode() {
 		return ruleCode;
 	}
@@ -559,12 +515,8 @@ public class SaleRules implements Serializable {
 				", minProfit=" + minProfit +
 				", adultPricePoint=" + adultPricePoint +
 				", adultAddPrice=" + adultAddPrice +
-				", adultAddTax=" + adultAddTax +
-				", adultTaxPoint=" + adultTaxPoint +
 				", childPricePoint=" + childPricePoint +
 				", childAddPrice=" + childAddPrice +
-				", childAddTax=" + childAddTax +
-				", childTaxPoint=" + childTaxPoint +
 				", operator='" + operator + '\'' +
 				", createTime=" + createTime +
 				", updateTime=" + updateTime +
@@ -613,12 +565,8 @@ public class SaleRules implements Serializable {
 				Objects.equals(minProfit, saleRules.minProfit) &&
 				Objects.equals(adultPricePoint, saleRules.adultPricePoint) &&
 				Objects.equals(adultAddPrice, saleRules.adultAddPrice) &&
-				Objects.equals(adultAddTax, saleRules.adultAddTax) &&
-				Objects.equals(adultTaxPoint, saleRules.adultTaxPoint) &&
 				Objects.equals(childPricePoint, saleRules.childPricePoint) &&
 				Objects.equals(childAddPrice, saleRules.childAddPrice) &&
-				Objects.equals(childAddTax, saleRules.childAddTax) &&
-				Objects.equals(childTaxPoint, saleRules.childTaxPoint) &&
 				Objects.equals(operator, saleRules.operator) &&
 				Objects.equals(createTime, saleRules.createTime) &&
 				Objects.equals(updateTime, saleRules.updateTime) &&
@@ -639,6 +587,6 @@ public class SaleRules implements Serializable {
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(id, customerId, channelId, store, ruleCode, carrier, org, dst, routeType, policyType, policyDesc, point, costPrice, saleSdate, saleEdate, ticketDays, tripSdate, tripEdate, status, maxPrice, minPrice, minProfit, adultPricePoint, adultAddPrice, adultAddTax, adultTaxPoint, childPricePoint, childAddPrice, childAddTax, childTaxPoint, operator, createTime, updateTime, deleted, notApplicableFlightNum, applyFlightNum, remainCabinNum, cabinCode, flightCycle, floorPrice, floorTax, fitShare, fitNationality, disFitNationality, ageRange, attention);
+		return Objects.hash(id, customerId, channelId, store, ruleCode, carrier, org, dst, routeType, policyType, policyDesc, point, costPrice, saleSdate, saleEdate, ticketDays, tripSdate, tripEdate, status, maxPrice, minPrice, minProfit, adultPricePoint, adultAddPrice, childPricePoint, childAddPrice, operator, createTime, updateTime, deleted, notApplicableFlightNum, applyFlightNum, remainCabinNum, cabinCode, flightCycle, floorPrice, floorTax, fitShare, fitNationality, disFitNationality, ageRange, attention);
 	}
 }

src/main/java/com/yutu/base/entity/SaleStore.java

@@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.sql.Timestamp;
 
+/**
+ * 店铺管理 salestore
+ */
 public class SaleStore {
 	private String id;
 	private String customerId;
@@ -185,6 +188,6 @@ public class SaleStore {
 				+ ", createtime=" + createtime + ", updatetime=" + updatetime + "]";
 	}
 
-	
-	
+
+
 }

src/main/java/com/yutu/base/service/SaleRulesService.java

@@ -50,25 +50,17 @@ public class SaleRulesService {
 
             if(oldRule.getAdultPricePoint() !=null ){
                 if ((oldRule.getAdultPricePoint().subtract(newRule.getAdultPricePoint()).compareTo(BigDecimal.ZERO) != 0) ||
-                        oldRule.getAdultAddPrice() != newRule.getAdultAddPrice() ||
-                        (oldRule.getAdultTaxPoint().subtract(newRule.getAdultTaxPoint()).compareTo(BigDecimal.ZERO) != 0) ||
-                        oldRule.getAdultAddTax() != newRule.getAdultAddTax()) {
+                        oldRule.getAdultAddPrice() != newRule.getAdultAddPrice()) {
                     builder.append("成人返点/留钱变化:[" + oldRule.getAdultPricePoint() + "/" + oldRule.getAdultAddPrice() +
-                            "/" + oldRule.getAdultTaxPoint() + "/" + oldRule.getAdultAddTax() +
-                            "-->" + newRule.getAdultPricePoint() + "/" + newRule.getAdultAddPrice() +
-                            "/" + newRule.getAdultTaxPoint() + "/" + newRule.getAdultAddTax() + "];");
+                            "-->" + newRule.getAdultPricePoint() + "/" + newRule.getAdultAddPrice() +"];");
                 }
             }
 
             if(oldRule.getChildPricePoint() !=null ){
                 if ((oldRule.getChildPricePoint().subtract(newRule.getChildPricePoint()).compareTo(BigDecimal.ZERO) != 0) ||
-                        !oldRule.getChildAddPrice().equals(newRule.getChildAddPrice()) ||
-                        (oldRule.getChildTaxPoint().subtract(newRule.getChildTaxPoint()).compareTo(BigDecimal.ZERO) != 0) ||
-                        !oldRule.getChildAddTax().equals(newRule.getChildAddTax())) {
+                        !oldRule.getChildAddPrice().equals(newRule.getChildAddPrice())) {
                     builder.append("儿童返点/留钱变化:[" + oldRule.getChildPricePoint() + "/" + oldRule.getChildAddPrice() +
-                            "/" + oldRule.getChildTaxPoint() + "/" + oldRule.getChildAddTax() +
-                            "-->" + newRule.getChildPricePoint() + "/" + newRule.getChildAddPrice() +
-                            "/" + newRule.getChildTaxPoint() + "/" + newRule.getChildAddTax() + "];");
+                            "-->" + newRule.getChildPricePoint() + "/" + newRule.getChildAddPrice() +"];");
                 }
             }
 

src/main/java/com/yutu/base/service/ScheduleService.java

@@ -33,11 +33,12 @@ public class ScheduleService implements CommandLineRunner {
 
     //政策操作日志缓存队列
     public static BlockingQueue<SaleLog> saleLogQueue = new LinkedBlockingQueue<>();
-    public static void setSaleLogQueue(SaleLog saleLog){
+
+    public static void setSaleLogQueue(SaleLog saleLog) {
         try {
             saleLogQueue.put(saleLog);
-        }catch (Exception exception) {
-            logger.error("政策操作日志设置失败" + JSONObject.toJSONString(saleLog),exception);
+        } catch (Exception exception) {
+            logger.error("政策操作日志设置失败" + JSONObject.toJSONString(saleLog), exception);
         }
     }
 
@@ -49,42 +50,42 @@ public class ScheduleService implements CommandLineRunner {
     /**
      * 政策操作日志通过队列写入MongoDB
      */
-    private void startScheduleTask(){
+    private void startScheduleTask() {
         ExecutorService threadPool = Executors.newFixedThreadPool(1);
         Runnable saveSaleLog = new Runnable() {
             @Override
             public void run() {
-                if(saleLogQueue == null) {
+                if (saleLogQueue == null) {
                     logger.error("saleLogQueue is null");
                     return;
                 }
                 List<SaleLog> list = new ArrayList<>();
                 SaleLog saleLog = null;
-                while (true){
+                while (true) {
                     try {
                         list.clear();
                         int num = 0;
                         Long difference = 0L;
 
                         int size = saleLogQueue.size() > 100 ? 100 : saleLogQueue.size();
-                        if(size > 0) {
+                        if (size > 0) {
                             for (int i = 0; i < size; i++) {
                                 saleLog = saleLogQueue.take();
                                 list.add(saleLog);
                             }
-                            if(list.size()>0){
+                            if (list.size() > 0) {
                                 Long startTime = System.currentTimeMillis();
                                 //saveSaleLogsToMongoDBBatch(list);//批量插入
                                 saveSaleLogsToMongoDBBatchNew(list);
                                 Long endTime = System.currentTimeMillis();
                                 difference = endTime - startTime;
-                                logger.info("执行新增 SaleLog 数量:"+list.size()+"条! 成功:"+list.size()+"条!"
-                                        +" 耗时长:"+String.valueOf(difference)+"ms,剩余"+saleLogQueue.size()+"条日志数据");
+                                logger.info("执行新增 SaleLog 数量:" + list.size() + "条! 成功:" + list.size() + "条!"
+                                        + " 耗时长:" + String.valueOf(difference) + "ms,剩余" + saleLogQueue.size() + "条日志数据");
                             }
-                        }else {
+                        } else {
                             Thread.sleep(1000);
                         }
-                    }catch (Exception e) {
+                    } catch (Exception e) {
                         logger.error("销售政策操作日志写入异常-----", e);
                     }
                 }
@@ -94,35 +95,35 @@ public class ScheduleService implements CommandLineRunner {
     }
 
     //MongoDB.logcenter数据库入库(批量插入)
-    public void saveSaleLogsToMongoDBBatch(List<SaleLog> saleLogList){
+    public void saveSaleLogsToMongoDBBatch(List<SaleLog> saleLogList) {
         JSONArray array = new JSONArray();
-        if(saleLogList==null || saleLogList.size()==0){
+        if (saleLogList == null || saleLogList.size() == 0) {
             return;
         }
-        for(int i=0;i<saleLogList.size();i++){
+        for (int i = 0; i < saleLogList.size(); i++) {
             SaleLog saleLog = saleLogList.get(i);
             JSONObject object = new JSONObject();
-            object.put("Id",saleLog.getId());
-            object.put("customerId",saleLog.getCustomerId());
-            object.put("referenceId",saleLog.getReferenceId());
-            object.put("logType",saleLog.getLogType());
-            object.put("operatorAction",saleLog.getOperatorAction());
-            object.put("extraData",saleLog.getExtraData());
-            object.put("operatorId",saleLog.getOperatorId());
-            object.put("operator",saleLog.getOperator());
-            object.put("createTime",saleLog.getCreateTime());
+            object.put("Id", saleLog.getId());
+            object.put("customerId", saleLog.getCustomerId());
+            object.put("referenceId", saleLog.getReferenceId());
+            object.put("logType", saleLog.getLogType());
+            object.put("operatorAction", saleLog.getOperatorAction());
+            object.put("extraData", saleLog.getExtraData());
+            object.put("operatorId", saleLog.getOperatorId());
+            object.put("operator", saleLog.getOperator());
+            object.put("createTime", saleLog.getCreateTime());
             array.add(object);
         }
-        try{
-            HttpsSendData.getPost(polestarLogsServicesUrl+"saleLog/saveSaleLogBatch",JSONObject.toJSONString(array));
-        }catch (Exception e){
-            logger.error("政策日志写入MongoDB异常",e);
+        try {
+            HttpsSendData.getPost(polestarLogsServicesUrl + "saleLog/saveSaleLogBatch", JSONObject.toJSONString(array));
+        } catch (Exception e) {
+            logger.error("政策日志写入MongoDB异常", e);
         }
         return;
     }
 
     //政策日志结构变动，mongodb新数据库需要新字段
-    public void saveSaleLogsToMongoDBBatchNew(List<SaleLog> saleLogList){
+    public void saveSaleLogsToMongoDBBatchNew(List<SaleLog> saleLogList) {
         try {
             if (saleLogList == null || saleLogList.size() == 0) {
                 return;
@@ -135,13 +136,13 @@ public class ScheduleService implements CommandLineRunner {
             //通过政策IdList 查询获取政策创建时间  得到 Map<referenceId,ruleCreateTime>
             Map<String, Date> ruleCreateTimeMap = new HashMap<>();
             List<String> ruleCreateTimeList = getRuleCreateTimeListBy(referenceIdList);
-            if(ruleCreateTimeList.size() == 0){
+            if (ruleCreateTimeList.size() == 0) {
                 return;
             }
             for (int i = 0; i < ruleCreateTimeList.size(); i++) {
                 String ruleCreateTimeStr = ruleCreateTimeList.get(i);
-                String ruleCreateTime = ruleCreateTimeStr.substring(ruleCreateTimeStr.indexOf("^")+1);
-                ruleCreateTimeMap.put(ruleCreateTimeStr.substring(0,ruleCreateTimeStr.indexOf("^")), sdf.parse(ruleCreateTime));
+                String ruleCreateTime = ruleCreateTimeStr.substring(ruleCreateTimeStr.indexOf("^") + 1);
+                ruleCreateTimeMap.put(ruleCreateTimeStr.substring(0, ruleCreateTimeStr.indexOf("^")), sdf.parse(ruleCreateTime));
             }
             JSONArray array = JSONArray.parseArray(JSONArray.toJSONString(saleLogList));
             //遍历更新SaleLog
@@ -149,10 +150,10 @@ public class ScheduleService implements CommandLineRunner {
             for (int i = 0; i < array.size(); i++) {
                 JSONObject saleLog = array.getJSONObject(i);
                 String referenceId = saleLog.getString("referenceId");
-                saleLog.put("ruleCreateTime",ruleCreateTimeMap.get(referenceId));
+                saleLog.put("ruleCreateTime", ruleCreateTimeMap.get(referenceId));
                 arrayNew.add(saleLog);
             }
-            HttpsSendData.getPost(polestarLogsServicesUrl+"saleLog/saveSaleLogBatch",JSONObject.toJSONString(arrayNew));
+            HttpsSendData.getPost(polestarLogsServicesUrl + "saleLog/saveSaleLogBatch", JSONObject.toJSONString(arrayNew));
         } catch (Exception e) {
             logger.error("政策日志写入MongoDB异常", e);
         }
@@ -160,17 +161,16 @@ public class ScheduleService implements CommandLineRunner {
     }
 
     //获取政策创建时间
-    public List<String> getRuleCreateTimeListBy(List<String> referenceIdList){
+    public List<String> getRuleCreateTimeListBy(List<String> referenceIdList) {
         List<String> resultArr = new ArrayList<>();
         String url = productServiceUrl + "SaleRules/getRuleCreateTimeListBy.do";
-        String result = HttpsSendData.getPost(url,JSONArray.toJSONString(referenceIdList));
-        if(StringUtils.isBlank(result)){
+        String result = HttpsSendData.getPost(url, JSONArray.toJSONString(referenceIdList));
+        if (StringUtils.isBlank(result)) {
             return resultArr;
         }
-        resultArr = JSONArray.parseArray(result,String.class);
+        resultArr = JSONArray.parseArray(result, String.class);
         return resultArr;
     }
 
 
-
 }

src/main/java/com/yutu/base/service/UploadService.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yutu.base.entity.*;
 import com.yutu.base.utils.HttpsSendData;
-import com.yutu.base.utils.commonUtil;
+import com.yutu.base.utils.CommonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -101,7 +101,7 @@ public class UploadService {
                         updateList.add(rules);
                     } else {
                         if(rules.getId() == null || rules.getId().length() != 36 )
-                            rules.setId(commonUtil.createId());
+                            rules.setId(CommonUtil.createId());
                         insertList.add(rules);
                     }
                 }
@@ -117,7 +117,7 @@ public class UploadService {
                 for (SaleRules rules : insertList) {
                     ExtraData<SaleRules> extraData = new ExtraData<SaleRules>(rules, "成功");
                     String operatotAtion = operator + "上传新增";
-                    SaleLog saleLog = new SaleLog(commonUtil.createId(), customerId, rules.getId(), "saleRule", operatotAtion,
+                    SaleLog saleLog = new SaleLog(CommonUtil.createId(), customerId, rules.getId(), "saleRule", operatotAtion,
                             JSONObject.toJSONString(extraData), null, operator, createTime);
                     ScheduleService.setSaleLogQueue(saleLog);//入队列
                     index ++;
@@ -140,7 +140,7 @@ public class UploadService {
                     SaleRules oldRule = JSONObject.parseObject(saleRulesObj.getJSONObject("data").toJSONString(),SaleRules.class);
                     String extraData = new SaleRulesService().getExtraData(oldRule, rules);
                     String operatotAtion = operator + "上传更新";
-                    SaleLog saleLog = new SaleLog(commonUtil.createId(), customerId, rules.getId(), "saleRule", operatotAtion,
+                    SaleLog saleLog = new SaleLog(CommonUtil.createId(), customerId, rules.getId(), "saleRule", operatotAtion,
                             extraData, null, operator, new Date());
                     ScheduleService.setSaleLogQueue(saleLog);//入队列
                     index ++;
@@ -676,7 +676,7 @@ public class UploadService {
                         updateList.add(privateFreight);
                     } else {
                         if(privateFreight.getId() == null || privateFreight.getId().length() != 36 )
-                            privateFreight.setId(commonUtil.createId());
+                            privateFreight.setId(CommonUtil.createId());
                         insertList.add(privateFreight);
                     }
                 }

src/main/java/com/yutu/base/utils/commonUtil.java → src/main/java/com/yutu/base/utils/CommonUtil.java

@@ -19,7 +19,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
 
-public class commonUtil {
+public class CommonUtil {
 	/**使用统一的UTF-8方式获得字符串md5值*/
     public final static String getMD5(String s) {
         char hexDigits[]={'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};