修改

src/main/java/com/steerinfo/dil/mapper/SaleLogMapper.java

@@ -19,4 +19,7 @@ public interface SaleLogMapper extends IBaseMapper<SaleLog, BigDecimal> {
 
     //查询用户名
     String getUserNameById(Map<String,Object> map);
+
+    //根据总实绩查询订单ID
+    BigDecimal getOrderIdByTotal(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -378,6 +378,9 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
                 continue;   //如果已经确认过了就不继续处理
             }
             mesMap.put("jobName", jobName);
+            //新增日志
+            mesMap.put("userName", jobName);
+            saleLogUtil.logOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")),"钢材科放行",mesMap,SaleLogUtil.UPDATE);
             if(mesMap.get("listId") != null){ //单拼
                 //如果是通过查询的,则需要去判断
                 //if (DataChange.dataToBigDecimal(map.get("isQueryCapacity")).intValue() == 1) {
@@ -533,7 +536,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         //去除掉排队信息
         Integer resultTotalId = queuingRulesMapper.checkoutQQR(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         i =+ queuingRulesMapper.updateSpellingDate(resultTotalId);
-
+        //记录日志
+        saleLogUtil.logOrder(map,"撤销放行",SaleLogUtil.UPDATE);
         return i;
     }
 

src/main/java/com/steerinfo/dil/service/impl/QueueDealWithAsync.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.QmsQueueListMapper;
 import com.steerinfo.dil.mapper.QmsQueueSpellingListMapper;
 import com.steerinfo.dil.mapper.QueuingRulesMapper;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.SaleLogUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
@@ -32,6 +33,9 @@ public class QueueDealWithAsync {
     @Autowired
     private QmsQueueSpellingListMapper qmsQueueSpellingListMapper;
 
+    @Autowired
+    private SaleLogUtil saleLogUtil;
+
     /**
      * 单拼
      * @param nowTime
@@ -42,6 +46,8 @@ public class QueueDealWithAsync {
         List<Map<String, Object>> listListMap = queuingRulesMapper.getAllSureTimeList();
         for (Map<String, Object> map : listListMap) {
             if((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 5400000){
+                //记录日志
+                saleLogUtil.logOrder(map,"超过勾选时间30分钟,自动回滚到队列最后",SaleLogUtil.UPDATE);
                 //如果超过勾选时间30分钟 自动回滚到队列最后--修改为1个小时
                 BigDecimal listId = DataChange.dataToBigDecimal(map.get("listId"));
                 Integer maxListNodeOrder = qmsQueueListMapper.getMaxListNodeOrder(map);
@@ -63,6 +69,8 @@ public class QueueDealWithAsync {
         List<Map<String, Object>> allSureTimeSpellingList = queuingRulesMapper.getAllSureTimeSpellingList();
         for (Map<String, Object> map : allSureTimeSpellingList) {
             if ((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 5400000) {
+                //记录日志
+                saleLogUtil.logOrder(map,"超过勾选时间30分钟,自动回滚到队列最后",SaleLogUtil.UPDATE);
                 BigDecimal spellingResultId = DataChange.dataToBigDecimal(map.get("spellingResultId"));
                 //如果超过勾选时间30分钟 自动回滚到队列最后
                 queuingRulesMapper.updateSpellingListToLast(spellingResultId);

src/main/java/com/steerinfo/dil/util/SaleLogUtil.java

@@ -72,6 +72,47 @@ public class SaleLogUtil {
         }
     }
 
+    /**
+     * 插入运输订单的操作日志
+     * @param descriptoin
+     * @param oprationType 操作类型
+     * @param map 必传
+     * @return
+     */
+    public int logOrder(Map<String,Object> map,String descriptoin,int oprationType){
+        try{
+            SaleLog saleLog=new SaleLog();
+            saleLog.setResultId(saleLogMapper.selectMaxId());
+            saleLog.setOrderId(getOrderId(map));
+            saleLog.setDescription(descriptoin);
+            saleLog.setInsertTime(new Date());
+            saleLog.setInsertUsername(getUserName(map));
+            switch (oprationType){
+                case INSERT:
+                    saleLog.setOprationType("新增");
+                    break;
+                case UPDATE:
+                    saleLog.setOprationType("修改");
+                    break;
+                case DELETE:
+                    saleLog.setOprationType("删除");
+                    break;
+                case OPEN:
+                    saleLog.setOprationType("启用");
+                    break;
+                case CLOSE:
+                    saleLog.setOprationType("关闭");
+                    break;
+                default:
+                    saleLog.setOprationType("未知操作");
+            }
+            return saleLogMapper.insertSelective(saleLog);
+        }catch (Exception e){
+            e.printStackTrace();
+            return -1;
+        }
+    }
+
     /**
      * 处理插入用户名
      * @param map
@@ -94,60 +135,19 @@ public class SaleLogUtil {
         }
     }
 
-    //public static void main(String[] args) throws Exception {
-    //    testMail();
-    //}
-    //
-    //private static void testMail () throws Exception {
-    //    // 给用户发送邮件的邮箱
-    //    final String from = "2361742724@qq.com";
-    //    // 邮箱的用户名
-    //    final String username = "2361742724@qq.com";
-    //    // 邮箱授权码，刚刚保存的授权码，不是qq密码
-    //    final String password = "rfhbbmbqssykebaf";
-    //    // 发送邮件的服务器地址，QQ服务器
-    //    final String host = "smtp.qq.com";
-    //    // 接收人邮箱
-    //    final String to = "987666087@qq.com";
-    //    // 邮件主题
-    //    final String title = "测试用例";
-    //
-    //    // 使用QQ邮箱时配置
-    //    Properties prop = new Properties();
-    //    prop.setProperty("mail.host", "smtp.qq.com");    // 设置QQ邮件服务器
-    //    prop.setProperty("mail.transport.protocol", "smtp");      // 邮件发送协议
-    //    prop.setProperty("mail.smtp.auth", "true");      // 需要验证用户名和密码
-    //    // 关于QQ邮箱，还要设置SSL加密，其他邮箱不需要
-    //    MailSSLSocketFactory sf = new MailSSLSocketFactory();
-    //    sf.setTrustAllHosts(true);
-    //    prop.put("mail.smtp.ssl.enable", "true");
-    //    prop.put("mail.smtp.ssl.socketFactory", sf);
-    //
-    //    // 创建定义整个邮件程序所需的环境信息的 Session 对象，QQ才有，其他邮箱就不用了
-    //    Session session = Session.getDefaultInstance(prop, new Authenticator() {
-    //        @Override
-    //        protected PasswordAuthentication getPasswordAuthentication() {
-    //            // 发件人邮箱用户名，授权码
-    //            return new PasswordAuthentication(username, password);
-    //        }
-    //    });
-    //    // 开启 Session 的 debug 模式，这样就可以查看程序发送 Email 的运行状态
-    //    session.setDebug(true);
-    //    // 通过 session 得到 transport 对象
-    //    Transport ts = session.getTransport();
-    //    // 使用邮箱的用户名和授权码连上邮箱服务器
-    //    ts.connect(host, username, password);
-    //    // 创建邮件，写邮件
-    //    MimeMessage message = new MimeMessage(session);
-    //    message.setFrom(new InternetAddress(from)); // 指明邮件的发件人
-    //    message.setRecipient(Message.RecipientType.TO, new InternetAddress(to));   // 指明邮件的收件人
-    //    message.setSubject(title);     // 邮件主题
-    //    message.setContent("验证码为:8824", "text/html;charset=utf-8");    // 邮件内容
-    //    message
-    //    // 发送邮件
-    //    ts.sendMessage(message, message.getAllRecipients());
-    //    System.out.println("验证码发送成功");
-    //    // 释放资源
-    //    ts.close();
-    //}
+    /**
+     * 获取OrderId
+     * @param map
+     * @return
+     */
+    private BigDecimal getOrderId(Map<String,Object> map) throws Exception {
+        if(map.get("orderId")!=null){
+            return DataChange.dataToBigDecimal(map.get("orderId"));
+        }else if(map.get("resultTotalId")!=null){
+            return saleLogMapper.getOrderIdByTotal(map);
+        }else{
+            throw new Exception("没有订单Id,保存日志失败");
+        }
+    }
+
 }

src/main/resources/com/steerinfo/dil/mapper/SaleLogMapper.xml

@@ -329,4 +329,9 @@
       WHERE USER_ID = #{userId}
       FETCH NEXT 1 ROWS ONLY
     </select>
+    <select id="getOrderIdByTotal" resultType="java.math.BigDecimal">
+      SELECT ORDER_ID FROM TMSTRUCK_TOTAL_RESULT
+      WHERE RESULT_TOTAL_ID = #{resultTotalId}
+      FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>