luobang 7 mesiacov pred
rodič
commit
8d28989acc

+ 16 - 0
src/main/java/com/steerinfo/dil/mapper/LogResultMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.LogResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface LogResultMapper extends IBaseMapper<LogResult, BigDecimal> {
+    @Select("select SEQ_LOG_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+}

+ 244 - 0
src/main/java/com/steerinfo/dil/model/LogResult.java

@@ -0,0 +1,244 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="日志表;外键ID和外键类型为查询参数。")
+public class LogResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键序列号:SEQ_LOG_RESULT(LOG_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键序列号:SEQ_LOG_RESULT",required=true)
+    private BigDecimal logId;
+
+    /**
+     * 日志内容(LOG_CONTENT,VARCHAR,510)
+     */
+    @ApiModelProperty(value="日志内容",required=true)
+    private String logContent;
+
+    /**
+     * 外键ID(FOREIGN_KEY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="外键ID",required=false)
+    private BigDecimal foreignKeyId;
+
+    /**
+     * 外键类型(FOREIGN_KEY_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="外键类型",required=false)
+    private String foreignKeyType;
+
+    /**
+     * 方法名,包含完整路径(METHOD_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="方法名,包含完整路径",required=false)
+    private String methodName;
+
+    /**
+     * 方法描述(METHOD_DESCRIPTION,VARCHAR,50)
+     */
+    @ApiModelProperty(value="方法描述",required=false)
+    private String methodDescription;
+
+    /**
+     * 执行时长(EXE_COST,DECIMAL,38)
+     */
+    @ApiModelProperty(value="执行时长",required=false)
+    private BigDecimal exeCost;
+
+    /**
+     * 文件路径(FILE_PATH,VARCHAR,255)
+     */
+    @ApiModelProperty(value="文件路径",required=false)
+    private String filePath;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 备注(REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String remark;
+
+    /**
+     * 报文1(DATAGRAM1,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文1",required=false)
+    private String datagram1;
+
+    /**
+     * 报文2(DATAGRAM2,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文2",required=false)
+    private String datagram2;
+
+    /**
+     * 报文3(DATAGRAM3,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文3",required=false)
+    private String datagram3;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.logId;
+    }
+
+    @Override
+    public void setId(BigDecimal logId) {
+        this.logId = logId;
+    }
+
+    public BigDecimal getLogId() {
+        return logId;
+    }
+
+    public void setLogId(BigDecimal logId) {
+        this.logId = logId;
+    }
+
+    public String getLogContent() {
+        return logContent;
+    }
+
+    public void setLogContent(String logContent) {
+        this.logContent = logContent == null ? null : logContent.trim();
+    }
+
+    public BigDecimal getForeignKeyId() {
+        return foreignKeyId;
+    }
+
+    public void setForeignKeyId(BigDecimal foreignKeyId) {
+        this.foreignKeyId = foreignKeyId;
+    }
+
+    public String getForeignKeyType() {
+        return foreignKeyType;
+    }
+
+    public void setForeignKeyType(String foreignKeyType) {
+        this.foreignKeyType = foreignKeyType == null ? null : foreignKeyType.trim();
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName == null ? null : methodName.trim();
+    }
+
+    public String getMethodDescription() {
+        return methodDescription;
+    }
+
+    public void setMethodDescription(String methodDescription) {
+        this.methodDescription = methodDescription == null ? null : methodDescription.trim();
+    }
+
+    public BigDecimal getExeCost() {
+        return exeCost;
+    }
+
+    public void setExeCost(BigDecimal exeCost) {
+        this.exeCost = exeCost;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath == null ? null : filePath.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getDatagram1() {
+        return datagram1;
+    }
+
+    public void setDatagram1(String datagram1) {
+        this.datagram1 = datagram1 == null ? null : datagram1.trim();
+    }
+
+    public String getDatagram2() {
+        return datagram2;
+    }
+
+    public void setDatagram2(String datagram2) {
+        this.datagram2 = datagram2 == null ? null : datagram2.trim();
+    }
+
+    public String getDatagram3() {
+        return datagram3;
+    }
+
+    public void setDatagram3(String datagram3) {
+        this.datagram3 = datagram3 == null ? null : datagram3.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", logId=").append(logId);
+        sb.append(", logContent=").append(logContent);
+        sb.append(", foreignKeyId=").append(foreignKeyId);
+        sb.append(", foreignKeyType=").append(foreignKeyType);
+        sb.append(", methodName=").append(methodName);
+        sb.append(", methodDescription=").append(methodDescription);
+        sb.append(", exeCost=").append(exeCost);
+        sb.append(", filePath=").append(filePath);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", remark=").append(remark);
+        sb.append(", datagram1=").append(datagram1);
+        sb.append(", datagram2=").append(datagram2);
+        sb.append(", datagram3=").append(datagram3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 33 - 34
src/main/java/com/steerinfo/dil/service/impl/OmsTransOrderServiceImpl.java

@@ -2043,7 +2043,7 @@ public class OmsTransOrderServiceImpl {
             objectObjectHashMap.put("identityCard",omsTransOrder.getIdentityCard());
             objectObjectHashMap.put("capacityId",omsTransOrder.getCapacityId());
             objectObjectHashMap.put("driverId",omsTransOrder.getDriverId());
-            omsTransOrderService.buluCapacity(map);
+            //omsTransOrderService.buluCapacity(map);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -2713,7 +2713,6 @@ public class OmsTransOrderServiceImpl {
             }
             searchMap.put("businessTypeName",transOrder.get("businessTypeName").toString());
             searchMap.put("billingType",transOrder.get("billingType").toString());
-
             BigDecimal deleted = DataChange.dataToBigDecimal(transOrder.get("deleted"));
             BigDecimal endSeq = DataChange.dataToBigDecimal(transOrder.get("endSeq"));
             BigDecimal currentLineSeq = DataChange.dataToBigDecimal(transOrder.get("currentLineSeq"));
@@ -2732,30 +2731,30 @@ public class OmsTransOrderServiceImpl {
             omsTransOrder.setCurrentLineSeq(sequence);
             omsTransOrder.setOrderStatus(orderStatus);
             //补录车辆档案
-            try{
-                buluCapacity(transOrder);
-            }catch (Exception e){
-                e.printStackTrace();
-                log.error("补录车辆档案失败:"+e.getMessage());
-            }
-            if("采购".equals(transOrder.get("businessScene"))){
-                //采购查询大宗补录卸货实绩
-                try{
-                    findUnloadDetails(omsTransOrder,userName);
-                }catch (Exception e){
-                    e.printStackTrace();
-                    log.error(omsTransOrder.getSerialNumber()+"补录卸货实绩失败:"+e.getMessage());
-                }
-            }
-            if("销售".equals(transOrder.get("businessScene"))){
-                //销售查询大宗补录装货实绩
-                try{
-                    findLoadDetails(omsTransOrder,userName);
-                }catch (Exception e){
-                    e.printStackTrace();
-                    log.error(omsTransOrder.getSerialNumber()+"补录装货实绩失败:"+e.getMessage());
-                }
-            }
+            //try{
+            //    buluCapacity(transOrder);
+            //}catch (Exception e){
+            //    e.printStackTrace();
+            //    log.error("补录车辆档案失败:"+e.getMessage());
+            //}
+            //if("采购".equals(transOrder.get("businessScene"))){
+            //    //采购查询大宗补录卸货实绩
+            //    try{
+            //        findUnloadDetails(omsTransOrder,userName);
+            //    }catch (Exception e){
+            //        e.printStackTrace();
+            //        log.error(omsTransOrder.getSerialNumber()+"补录卸货实绩失败:"+e.getMessage());
+            //    }
+            //}
+            //if("销售".equals(transOrder.get("businessScene"))){
+            //    //销售查询大宗补录装货实绩
+            //    try{
+            //        findLoadDetails(omsTransOrder,userName);
+            //    }catch (Exception e){
+            //        e.printStackTrace();
+            //        log.error(omsTransOrder.getSerialNumber()+"补录装货实绩失败:"+e.getMessage());
+            //    }
+            //}
             if("大宗销售订单".equals(transOrder.get("businessTypeName")) && (transOrder.get("materialName")+"").contains("复磅")){
                 //销售查询是否有同车号,业务类型为型钢销售订单、高线销售订单,未接单但有装货的运单,最近一条。迁移其他实绩
                 replaceResultSpecial(transOrder);
@@ -2767,14 +2766,14 @@ public class OmsTransOrderServiceImpl {
                     omsTransOrder.setDeleted(new BigDecimal(2));
                     omsTransOrder.setUpdateUsername(userName);
                     omsTransOrder.setUpdateTime(new Date());
-                    if (
-                            ("采购".equals(transOrder.get("businessScene")) && "自提".equals(transOrder.get("isSelfMention")))
-                                    || ("销售".equals(transOrder.get("businessScene")) && "非自提".equals(transOrder.get("isSelfMention")))
-                                    || ("生产".equals(transOrder.get("businessScene")))
-                    ) {
-                        //调用结算接口生成详单
-                        emsFeign.emsdetailsordersAdd(searchMap);
-                    }
+                    //if (
+                    //        ("采购".equals(transOrder.get("businessScene")) && "自提".equals(transOrder.get("isSelfMention")))
+                    //                || ("销售".equals(transOrder.get("businessScene")) && "非自提".equals(transOrder.get("isSelfMention")))
+                    //                || ("生产".equals(transOrder.get("businessScene")))
+                    //) {
+                    //    //调用结算接口生成详单
+                    //    //emsFeign.emsdetailsordersAdd(searchMap);
+                    //}
                 }else{
                     //调整运单状态
                     omsTransOrder.setDeleted(new BigDecimal(5));

+ 1 - 1
src/main/java/com/steerinfo/dil/util/HttpUtil.java

@@ -84,7 +84,7 @@ public class HttpUtil {
         HttpClient httpClient = new HttpClient();
         // 设置httpClient连接/执行超时时间(ms)
         httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(1000);
-        httpClient.getHttpConnectionManager().getParams().setSoTimeout(10000);
+        httpClient.getHttpConnectionManager().getParams().setSoTimeout(15000);
         // 创建post请求方法实例对象
         PostMethod postMethod = new PostMethod(url);
         postMethod.addRequestHeader("Content-Type", "application/json;charset=utf-8");

+ 30 - 4
src/main/java/com/steerinfo/dil/util/WMSUtil.java

@@ -1,15 +1,22 @@
 package com.steerinfo.dil.util;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.mapper.LogResultMapper;
+import com.steerinfo.dil.model.LogResult;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 @Component
 public class WMSUtil {
+    @Autowired
+    LogResultMapper logResultMapper;
 
     //日志
     static final Logger log = Logger.getLogger(WMSUtil.class);
@@ -38,19 +45,38 @@ public class WMSUtil {
         JSONObject result = null;
         try{
             String url = wmsHost + urls;
-            log.info("WMS调用"+serviceMap.getString(serviceid)+",参数:"+JSONObject.toJSONString(args));
             JSONObject response = HttpUtil.sendPostArray(url,JSONObject.parseArray(JSONObject.toJSONString(args)),accessToken);
-            log.info("WMS调用"+serviceMap.getString(serviceid)+",返回:"+response);
             result = response;
             if(result!=null && result.getBoolean("succeed")){
-                log.info("WMS推送成功!");
+
             }else{
                 throw new Exception(""+result);
             }
         }catch (Exception e){
             e.printStackTrace();
-            log.info("WMS推送失败!");
             throw new Exception("WMS推送异常:"+e.getMessage());
+        }finally {
+            try {
+                String info1 = null;
+                String info2 = null;
+                if (result.toString().length() > 3000) {
+                    info1 = result.toString().substring(0,3000);
+                    info2 = result.toString().substring(3000,6000);
+                }else{
+                    info1 = result.toString();
+                }
+                LogResult logResult = new LogResult();
+                logResult.setId(logResultMapper.nextId());
+                logResult.setLogContent(args.get(0).get("dlivDirnoSeq").toString());
+                logResult.setForeignKeyId(null);
+                logResult.setForeignKeyType("推送wms日志:" + serviceid);
+                logResult.setInsertTime(new Date());
+                logResult.setDatagram1(info1);
+                logResult.setDatagram2(info2);
+                logResultMapper.insertSelective(logResult);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return result;
     }

+ 1 - 1
src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
     druid:
       max-active: 50
-      initial-size: 30
+      initial-size: 10
       min-idle: 10
       max-wait: 3000
       # Oracle专属优化参数

+ 444 - 0
src/main/resources/com/steerinfo/dil/mapper/LogResultMapper.xml

@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.LogResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.LogResult">
+        <id column="LOG_ID" jdbcType="DECIMAL" property="logId" />
+        <result column="LOG_CONTENT" jdbcType="VARCHAR" property="logContent" />
+        <result column="FOREIGN_KEY_ID" jdbcType="DECIMAL" property="foreignKeyId" />
+        <result column="FOREIGN_KEY_TYPE" jdbcType="VARCHAR" property="foreignKeyType" />
+        <result column="METHOD_NAME" jdbcType="VARCHAR" property="methodName" />
+        <result column="METHOD_DESCRIPTION" jdbcType="VARCHAR" property="methodDescription" />
+        <result column="EXE_COST" jdbcType="DECIMAL" property="exeCost" />
+        <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+        <result column="DATAGRAM1" jdbcType="VARCHAR" property="datagram1" />
+        <result column="DATAGRAM2" jdbcType="VARCHAR" property="datagram2" />
+        <result column="DATAGRAM3" jdbcType="VARCHAR" property="datagram3" />
+    </resultMap>
+    <sql id="columns">
+        LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+    EXE_COST, FILE_PATH, INSERT_TIME, INSERT_USERNAME, REMARK, DATAGRAM1, DATAGRAM2,
+    DATAGRAM3
+    </sql>
+    <sql id="columns_alias">
+        t.LOG_ID, t.LOG_CONTENT, t.FOREIGN_KEY_ID, t.FOREIGN_KEY_TYPE, t.METHOD_NAME, t.METHOD_DESCRIPTION,
+    t.EXE_COST, t.FILE_PATH, t.INSERT_TIME, t.INSERT_USERNAME, t.REMARK, t.DATAGRAM1,
+    t.DATAGRAM2, t.DATAGRAM3
+    </sql>
+    <sql id="select">
+        SELECT <include refid="columns"/> FROM LOG_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT <include refid="columns_alias"/> FROM LOG_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="logId != null">
+                and LOG_ID = #{logId}
+            </if>
+            <if test="logContent != null and logContent != ''">
+                and LOG_CONTENT = #{logContent}
+            </if>
+            <if test="foreignKeyId != null">
+                and FOREIGN_KEY_ID = #{foreignKeyId}
+            </if>
+            <if test="foreignKeyType != null and foreignKeyType != ''">
+                and FOREIGN_KEY_TYPE = #{foreignKeyType}
+            </if>
+            <if test="methodName != null and methodName != ''">
+                and METHOD_NAME = #{methodName}
+            </if>
+            <if test="methodDescription != null and methodDescription != ''">
+                and METHOD_DESCRIPTION = #{methodDescription}
+            </if>
+            <if test="exeCost != null">
+                and EXE_COST = #{exeCost}
+            </if>
+            <if test="filePath != null and filePath != ''">
+                and FILE_PATH = #{filePath}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK = #{remark}
+            </if>
+            <if test="datagram1 != null and datagram1 != ''">
+                and DATAGRAM1 = #{datagram1}
+            </if>
+            <if test="datagram2 != null and datagram2 != ''">
+                and DATAGRAM2 = #{datagram2}
+            </if>
+            <if test="datagram3 != null and datagram3 != ''">
+                and DATAGRAM3 = #{datagram3}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="logId != null">
+                and LOG_ID = #{logId}
+            </if>
+            <if test="logContent != null and logContent != ''">
+                and LOG_CONTENT LIKE '%${logContent}%'
+            </if>
+            <if test="foreignKeyId != null">
+                and FOREIGN_KEY_ID = #{foreignKeyId}
+            </if>
+            <if test="foreignKeyType != null and foreignKeyType != ''">
+                and FOREIGN_KEY_TYPE LIKE '%${foreignKeyType}%'
+            </if>
+            <if test="methodName != null and methodName != ''">
+                and METHOD_NAME LIKE '%${methodName}%'
+            </if>
+            <if test="methodDescription != null and methodDescription != ''">
+                and METHOD_DESCRIPTION LIKE '%${methodDescription}%'
+            </if>
+            <if test="exeCost != null">
+                and EXE_COST = #{exeCost}
+            </if>
+            <if test="filePath != null and filePath != ''">
+                and FILE_PATH LIKE '%${filePath}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK LIKE '%${remark}%'
+            </if>
+            <if test="datagram1 != null and datagram1 != ''">
+                and DATAGRAM1 LIKE '%${datagram1}%'
+            </if>
+            <if test="datagram2 != null and datagram2 != ''">
+                and DATAGRAM2 LIKE '%${datagram2}%'
+            </if>
+            <if test="datagram3 != null and datagram3 != ''">
+                and DATAGRAM3 LIKE '%${datagram3}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from LOG_RESULT
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from LOG_RESULT
+        where 1!=1
+        <if test="logContent != null and logContent != ''">
+            or LOG_CONTENT = #{logContent}
+        </if>
+        <if test="foreignKeyId != null">
+            or FOREIGN_KEY_ID = #{foreignKeyId}
+        </if>
+        <if test="foreignKeyType != null and foreignKeyType != ''">
+            or FOREIGN_KEY_TYPE = #{foreignKeyType}
+        </if>
+        <if test="methodName != null and methodName != ''">
+            or METHOD_NAME = #{methodName}
+        </if>
+        <if test="methodDescription != null and methodDescription != ''">
+            or METHOD_DESCRIPTION = #{methodDescription}
+        </if>
+        <if test="exeCost != null">
+            or EXE_COST = #{exeCost}
+        </if>
+        <if test="filePath != null and filePath != ''">
+            or FILE_PATH = #{filePath}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="remark != null and remark != ''">
+            or REMARK = #{remark}
+        </if>
+        <if test="datagram1 != null and datagram1 != ''">
+            or DATAGRAM1 = #{datagram1}
+        </if>
+        <if test="datagram2 != null and datagram2 != ''">
+            or DATAGRAM2 = #{datagram2}
+        </if>
+        <if test="datagram3 != null and datagram3 != ''">
+            or DATAGRAM3 = #{datagram3}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.LogResult">
+        insert into LOG_RESULT (LOG_ID, LOG_CONTENT, FOREIGN_KEY_ID,
+                                FOREIGN_KEY_TYPE, METHOD_NAME, METHOD_DESCRIPTION,
+                                EXE_COST, FILE_PATH, INSERT_TIME,
+                                INSERT_USERNAME, REMARK, DATAGRAM1,
+                                DATAGRAM2, DATAGRAM3)
+        values (#{logId,jdbcType=DECIMAL}, #{logContent,jdbcType=VARCHAR}, #{foreignKeyId,jdbcType=DECIMAL},
+                #{foreignKeyType,jdbcType=VARCHAR}, #{methodName,jdbcType=VARCHAR}, #{methodDescription,jdbcType=VARCHAR},
+                #{exeCost,jdbcType=DECIMAL}, #{filePath,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{insertUsername,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{datagram1,jdbcType=VARCHAR},
+                #{datagram2,jdbcType=VARCHAR}, #{datagram3,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.LogResult">
+        insert into LOG_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="logId != null">
+                LOG_ID,
+            </if>
+            <if test="logContent != null">
+                LOG_CONTENT,
+            </if>
+            <if test="foreignKeyId != null">
+                FOREIGN_KEY_ID,
+            </if>
+            <if test="foreignKeyType != null">
+                FOREIGN_KEY_TYPE,
+            </if>
+            <if test="methodName != null">
+                METHOD_NAME,
+            </if>
+            <if test="methodDescription != null">
+                METHOD_DESCRIPTION,
+            </if>
+            <if test="exeCost != null">
+                EXE_COST,
+            </if>
+            <if test="filePath != null">
+                FILE_PATH,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="remark != null">
+                REMARK,
+            </if>
+            <if test="datagram1 != null">
+                DATAGRAM1,
+            </if>
+            <if test="datagram2 != null">
+                DATAGRAM2,
+            </if>
+            <if test="datagram3 != null">
+                DATAGRAM3,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="logId != null">
+                #{logId,jdbcType=DECIMAL},
+            </if>
+            <if test="logContent != null">
+                #{logContent,jdbcType=VARCHAR},
+            </if>
+            <if test="foreignKeyId != null">
+                #{foreignKeyId,jdbcType=DECIMAL},
+            </if>
+            <if test="foreignKeyType != null">
+                #{foreignKeyType,jdbcType=VARCHAR},
+            </if>
+            <if test="methodName != null">
+                #{methodName,jdbcType=VARCHAR},
+            </if>
+            <if test="methodDescription != null">
+                #{methodDescription,jdbcType=VARCHAR},
+            </if>
+            <if test="exeCost != null">
+                #{exeCost,jdbcType=DECIMAL},
+            </if>
+            <if test="filePath != null">
+                #{filePath,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram1 != null">
+                #{datagram1,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram2 != null">
+                #{datagram2,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram3 != null">
+                #{datagram3,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.LogResult">
+        update LOG_RESULT
+        set LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
+            FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+            FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+            METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+            METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+            EXE_COST = #{exeCost,jdbcType=DECIMAL},
+            FILE_PATH = #{filePath,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            REMARK = #{remark,jdbcType=VARCHAR},
+            DATAGRAM1 = #{datagram1,jdbcType=VARCHAR},
+            DATAGRAM2 = #{datagram2,jdbcType=VARCHAR},
+            DATAGRAM3 = #{datagram3,jdbcType=VARCHAR}
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.LogResult">
+        update LOG_RESULT
+        <set>
+            <if test="logContent != null">
+                LOG_CONTENT = #{logContent,jdbcType=VARCHAR},
+            </if>
+            <if test="foreignKeyId != null">
+                FOREIGN_KEY_ID = #{foreignKeyId,jdbcType=DECIMAL},
+            </if>
+            <if test="foreignKeyType != null">
+                FOREIGN_KEY_TYPE = #{foreignKeyType,jdbcType=VARCHAR},
+            </if>
+            <if test="methodName != null">
+                METHOD_NAME = #{methodName,jdbcType=VARCHAR},
+            </if>
+            <if test="methodDescription != null">
+                METHOD_DESCRIPTION = #{methodDescription,jdbcType=VARCHAR},
+            </if>
+            <if test="exeCost != null">
+                EXE_COST = #{exeCost,jdbcType=DECIMAL},
+            </if>
+            <if test="filePath != null">
+                FILE_PATH = #{filePath,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                REMARK = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram1 != null">
+                DATAGRAM1 = #{datagram1,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram2 != null">
+                DATAGRAM2 = #{datagram2,jdbcType=VARCHAR},
+            </if>
+            <if test="datagram3 != null">
+                DATAGRAM3 = #{datagram3,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where LOG_ID = #{logId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into LOG_RESULT
+        (LOG_ID,
+        LOG_CONTENT, FOREIGN_KEY_ID, FOREIGN_KEY_TYPE,
+        METHOD_NAME, METHOD_DESCRIPTION,
+        EXE_COST, FILE_PATH, INSERT_TIME,
+        INSERT_USERNAME, REMARK, DATAGRAM1,
+        DATAGRAM2, DATAGRAM3)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.logId,jdbcType=DECIMAL},
+        #{item.logContent,jdbcType=VARCHAR}, #{item.foreignKeyId,jdbcType=DECIMAL}, #{item.foreignKeyType,jdbcType=VARCHAR},
+        #{item.methodName,jdbcType=VARCHAR}, #{item.methodDescription,jdbcType=VARCHAR},
+        #{item.exeCost,jdbcType=DECIMAL}, #{item.filePath,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, #{item.datagram1,jdbcType=VARCHAR},
+        #{item.datagram2,jdbcType=VARCHAR}, #{item.datagram3,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update LOG_RESULT
+        set
+        LOG_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.logId,jdbcType=DECIMAL}
+        </foreach>
+        ,LOG_CONTENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.logContent,jdbcType=VARCHAR}
+        </foreach>
+        ,FOREIGN_KEY_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyId,jdbcType=DECIMAL}
+        </foreach>
+        ,FOREIGN_KEY_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.foreignKeyType,jdbcType=VARCHAR}
+        </foreach>
+        ,METHOD_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.methodName,jdbcType=VARCHAR}
+        </foreach>
+        ,METHOD_DESCRIPTION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.methodDescription,jdbcType=VARCHAR}
+        </foreach>
+        ,EXE_COST=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.exeCost,jdbcType=DECIMAL}
+        </foreach>
+        ,FILE_PATH=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.filePath,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.remark,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM1=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram1,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM2=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram2,jdbcType=VARCHAR}
+        </foreach>
+        ,DATAGRAM3=
+        <foreach collection="list" item="item" index="index" separator=" " open="case LOG_ID" close="end">
+            when #{item.logId,jdbcType=DECIMAL} then #{item.datagram3,jdbcType=VARCHAR}
+        </foreach>
+        where LOG_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.logId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from LOG_RESULT
+        where LOG_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+</mapper>