crud

src/main/java/com/ygj/yuemum/controller/equipment/EquipmenteHireHeadController.java

@@ -51,4 +51,15 @@ public class EquipmenteHireHeadController {
         return equipmenteHireHead;
     }
 
+    @PostMapping("/equipmentActive")
+    public int equipmentActive(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.equipmentActive(equipmenteHireHead);
+    }
+
+    @PostMapping("/equipmentSettle")
+    public int equipmentSettle(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.equipmentSettle(equipmenteHireHead);
+    }
+
+
 }

src/main/java/com/ygj/yuemum/controller/modoo/ModooApiController.java

@@ -0,0 +1,26 @@
+package com.ygj.yuemum.controller.modoo;
+
+
+import com.ygj.yuemum.service.modoo.ModooApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ModooApiController {
+
+    @Autowired
+    private ModooApiService modooApiService;
+
+    @GetMapping("/equipmentActiveTest")
+    public int equipmentActive(@RequestParam("ei_code") String ei_code) {
+        return modooApiService.equipmentActive(ei_code);
+    }
+
+    @GetMapping("/equipmentSettleTest")
+    public int equipmentSettle(@RequestParam("ei_code") String ei_code) {
+        return modooApiService.equipmentSettle(ei_code);
+    }
+
+}

src/main/java/com/ygj/yuemum/controller/modoo/ModooEquipmentLogController.java

@@ -0,0 +1,25 @@
+package com.ygj.yuemum.controller.modoo;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ygj.yuemum.domain.modoo.ModooEquipmentLog;
+import com.ygj.yuemum.service.modoo.ModooEquipmentLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+public class ModooEquipmentLogController {
+
+    @Autowired
+    private ModooEquipmentLogService modooEquipmentLogService;
+    @PostMapping("/getModooEquipmentLogs")
+    public String getModooEquipmentLogs(@ModelAttribute ModooEquipmentLog modooEquipmentLog) {
+        Map<String, Object> equipmentLogs= modooEquipmentLogService.getModooEquipmentLogs(modooEquipmentLog);
+        String jso = JSONObject.toJSONString(equipmentLogs);
+        return jso;
+    }
+}

src/main/java/com/ygj/yuemum/controller/modoo/modooapi.java

@@ -1,59 +0,0 @@
-//package com.ygj.yuemum.controller.modoo;
-//
-//import java.io.BufferedReader;
-//import java.io.IOException;
-//import java.io.InputStreamReader;
-//import java.io.PrintWriter;
-//import java.net.URL;
-//import java.net.URLConnection;
-//
-//public class modooapi {
-//    public static void main(String args[]) {
-//        PrintWriter out = null;
-//        BufferedReader in = null;
-//        String result = "";
-//        try {
-//            URL realUrl = new URL("http://open.meng-dong.com/api/v1");
-//            // 打开和URL之间的连接
-//            URLConnection conn = realUrl.openConnection();
-//            // 设置通用的请求属性
-//            conn.setRequestProperty("accept", "*/*");
-//            conn.setRequestProperty("connection", "Keep-Alive");
-//            conn.setRequestProperty("user-agent",
-//                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-//            // 发送POST请求必须设置如下两行
-//            conn.setDoOutput(true);
-//            conn.setDoInput(true);
-//            // 获取URLConnection对象对应的输出流
-//            out = new PrintWriter(conn.getOutputStream());
-//            // 发送请求参数
-//            out.print("cmd=1&partner_id=1?partner_key=1");
-//            // flush输出流的缓冲
-//            out.flush();
-//            // 定义BufferedReader输入流来读取URL的响应
-//            in = new BufferedReader(
-//                    new InputStreamReader(conn.getInputStream()));
-//            String line;
-//            while ((line = in.readLine()) != null) {
-//                result += line;
-//            }
-//        } catch (Exception e) {
-//            System.out.println("发送 POST 请求出现异常！"+e);
-//            e.printStackTrace();
-//        }
-//        //使用finally块来关闭输出流、输入流
-//        finally{
-//            try{
-//                if(out!=null){
-//                    out.close();
-//                }
-//                if(in!=null){
-//                    in.close();
-//                }
-//            }
-//            catch(IOException ex){
-//                ex.printStackTrace();
-//            }
-//        }
-//    }
-//}

src/main/java/com/ygj/yuemum/dao/global/modoo.java

@@ -0,0 +1,96 @@
+package com.ygj.yuemum.dao.global;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class modoo {
+    public static void aaaaa(String[] args) throws IOException {
+        String result = "";
+        // 创建httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        // 创建post方式请求对象
+        HttpPost httpPost = new HttpPost("https://yulu.meng-dong.com/access");
+        StringEntity stringEntity = new StringEntity("{\"cmd\":104,\"WebReqHeader\":{\"uuid\":\"1528104729646\",\"ua\":\"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0\",\"seq\":7},\"request\":{\"scene\":1,\"mobile\":\"15011358583\",\"password\":\"abcd1234\",\"role\":2}}", ContentType.APPLICATION_JSON);
+        stringEntity.setContentEncoding("utf-8");
+        httpPost.setEntity(stringEntity);
+        CloseableHttpResponse response = httpClient.execute(httpPost);
+        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+            result = EntityUtils.toString(response.getEntity(), "utf-8");
+        }
+        Map map1 = JSON.parseObject(result);
+        Map map2 = JSON.parseObject(String.valueOf(map1.get("response")));
+        Map map3 = JSON.parseObject(String.valueOf(map2.get("webUserTicket")));
+        String ticket = String.valueOf(map3.get("ticket"));
+        response.close();
+
+    }
+    //--------------- active
+    public int equipmentActive (String ticket) {
+        try {
+            String result = "";
+            // 创建httpclient对象
+            CloseableHttpClient httpClient = HttpClients.createDefault();
+            // 创建post方式请求对象
+            HttpPost httpPost = new HttpPost("https://yulu.meng-dong.com/access");
+            StringEntity stringEntity = new StringEntity("{{\"cmd\":2019,\"userId\":\"471699856\",\"WebReqHeader\":{\"uuid\":\"1528104729646\",\"ua\":\"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0\",\"ticket\":\""+ticket+"\",\"seq\":13},\"request\":{\"psnStr\":\"01009A32\"}}", ContentType.APPLICATION_JSON);
+            stringEntity.setContentEncoding("utf-8");
+            httpPost.setEntity(stringEntity);
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                result = EntityUtils.toString(response.getEntity(), "utf-8");
+            }
+            Map map1 = JSON.parseObject(result);
+            Map map2 = JSON.parseObject(String.valueOf(map1.get("response")));
+            Map map3 = JSON.parseObject(String.valueOf(map2.get("ret")));
+            String code = String.valueOf(map3.get("code"));
+            response.close();
+            if(code != "0" ){
+                return 0;
+            } else {
+                return 1;
+            }
+        } catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+    public int equipmentSettle (String ticket) {
+        try {
+            String result = "";
+            // 创建httpclient对象
+            CloseableHttpClient httpClient = HttpClients.createDefault();
+            // 创建post方式请求对象
+            HttpPost httpPost = new HttpPost("https://yulu.meng-dong.com/access");
+            StringEntity stringEntity = new StringEntity("{\"cmd\":2021,\"userId\":\"471699856\",\"WebReqHeader\":{\"uuid\":\"1528104729646\",\"ua\":\"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0\",\"ticket\":\""+ticket+"\",\"seq\":18},\"request\":{\"psnHex\":\"01009A32\",\"newStatusCode\":6}}", ContentType.APPLICATION_JSON);
+            stringEntity.setContentEncoding("utf-8");
+            httpPost.setEntity(stringEntity);
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                result = EntityUtils.toString(response.getEntity(), "utf-8");
+            }
+            Map map1 = JSON.parseObject(result);
+            Map map2 = JSON.parseObject(String.valueOf(map1.get("response")));
+            String code = String.valueOf(map2.get("code"));
+            response.close();
+            if(code != "0" ){
+                return 0;
+            } else {
+                return 1;
+            }
+        } catch (Exception ex){
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+}
+

src/main/java/com/ygj/yuemum/dao/modoo/ModooEquipmentLogDao.java

@@ -0,0 +1,13 @@
+package com.ygj.yuemum.dao.modoo;
+
+import com.ygj.yuemum.domain.modoo.ModooEquipmentLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ModooEquipmentLogDao {
+
+    List<ModooEquipmentLog> getModooEquipmentLogs(String ml_code);
+    int insertModooEquipmentLog(ModooEquipmentLog equipmentLog);
+}

src/main/java/com/ygj/yuemum/domain/equipment/EquipmentInfo.java

@@ -12,6 +12,15 @@ public class EquipmentInfo {
     private String ei_date;
     private String user;
     private Integer et_mortagage;
+    private Integer ei_rent;
+
+    public Integer getEi_rent() {
+        return ei_rent;
+    }
+
+    public void setEi_rent(Integer ei_rent) {
+        this.ei_rent = ei_rent;
+    }
 
     public Integer getEt_rent() {
         return et_rent;

src/main/java/com/ygj/yuemum/domain/modoo/ModooEquipmentLog.java

@@ -0,0 +1,77 @@
+package com.ygj.yuemum.domain.modoo;
+
+public class ModooEquipmentLog {
+
+    private Integer id;
+    private Integer ml_type;
+    private String cm_phone;
+    private String ml_code;
+    private String ml_date;
+    private String ml_username;
+    private Integer limit;
+    private Integer page;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getMl_type() {
+        return ml_type;
+    }
+
+    public void setMl_type(Integer ml_type) {
+        this.ml_type = ml_type;
+    }
+
+    public String getCm_phone() {
+        return cm_phone;
+    }
+
+    public void setCm_phone(String cm_phone) {
+        this.cm_phone = cm_phone;
+    }
+
+    public String getMl_code() {
+        return ml_code;
+    }
+
+    public void setMl_code(String ml_code) {
+        this.ml_code = ml_code;
+    }
+
+    public String getMl_date() {
+        return ml_date;
+    }
+
+    public void setMl_date(String ml_date) {
+        this.ml_date = ml_date;
+    }
+
+    public String getMl_username() {
+        return ml_username;
+    }
+
+    public void setMl_username(String ml_username) {
+        this.ml_username = ml_username;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+}

src/main/java/com/ygj/yuemum/service/equipment/EquipmentReturnService.java

@@ -4,6 +4,9 @@ import com.ygj.yuemum.dao.equipment.EquipmentReturnDao;
 import com.ygj.yuemum.dao.equipment.EquipmenteHireDetailDao;
 import com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao;
 import com.ygj.yuemum.domain.equipment.*;
+import com.ygj.yuemum.domain.modoo.ModooEquipmentLog;
+import com.ygj.yuemum.service.modoo.ModooApiService;
+import com.ygj.yuemum.service.modoo.ModooEquipmentLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +28,10 @@ public class EquipmentReturnService {
     private EquipmenteHireHeadDao equipmenteHireHeadDao;
     @Autowired
     private EquipmenteHireDetailDao equipmenteHireDetailDao;
+    @Autowired
+    private ModooApiService modooApiService;
+    @Autowired
+    private ModooEquipmentLogService modooEquipmentLogService;
 
 
     public List<EquipmentReturn> selectEquipmentReturn(String cp_orderno) {
@@ -34,6 +41,7 @@ public class EquipmentReturnService {
     public int insertEquipmentReturn(EquipmentReturn equipmentReturn) {
         try {
             //save
+            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             List<EquipmentReturn> checks = equipmentReturnDao.selectEquipmentReturn(equipmentReturn.getEh_code());
             if(checks.size() != 0){
                 return 2;
@@ -60,6 +68,18 @@ public class EquipmentReturnService {
                 equipmentLog.setEl_user(equipmentReturn.getEr_usercode());
                 equipmentLog.setEl_date(sdf.format(new Date()));
                 equipmentLogService.insertEquipmentLog(equipmentLog);
+
+                if(ed.getEt_type().equals("1")){
+                    //modoo active
+                    modooApiService.equipmentSettle(ed.getEd_emcode());
+                }
+                ModooEquipmentLog modooEquipmentLog = new ModooEquipmentLog();
+                modooEquipmentLog.setMl_type(2);
+                modooEquipmentLog.setCm_phone(equipmentReturn.getEh_code());
+                modooEquipmentLog.setMl_code(ed.getEd_emcode());
+                modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
+                modooEquipmentLog.setMl_username(equipmentReturn.getEr_usercode());
+                modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
             }
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/ygj/yuemum/service/equipment/EquipmenteHireHeadService.java

@@ -4,11 +4,16 @@ import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao;
+import com.ygj.yuemum.domain.equipment.EquipmentInfo;
 import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
 import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
+import com.ygj.yuemum.domain.modoo.ModooEquipmentLog;
+import com.ygj.yuemum.service.modoo.ModooApiService;
+import com.ygj.yuemum.service.modoo.ModooEquipmentLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -24,6 +29,10 @@ public class EquipmenteHireHeadService {
     private EquipmenteHireDetailService equipmenteHireDetailService;
     @Autowired
     private EquipmentInfoService equipmentInfoService;
+    @Autowired
+    private ModooApiService modooApiService;
+    @Autowired
+    private ModooEquipmentLogService modooEquipmentLogService;
 
     public Map<String, Object> queryEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead) {
         PageHelper.startPage(equipmenteHireHead.getPage(), equipmenteHireHead.getLimit());
@@ -54,10 +63,11 @@ public class EquipmenteHireHeadService {
 
     public int addEquipmenteHireHead(EquipmenteHireHead equipmenteHireHead) {
         try {
+            DecimalFormat df = new DecimalFormat("000");
             int seq = equipmenteHireHeadDao.getSeq() + 1;
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
-            String orderno = "EH" + sdf.format(new Date()) + "00" + seq;
+            String orderno = "EH" + sdf.format(new Date()) + df.format(seq);
             //add Head
             equipmenteHireHead.setEh_code(orderno);
             equipmenteHireHead.setEh_status(1);
@@ -135,5 +145,47 @@ public class EquipmenteHireHeadService {
         return 1;
     }
 
+    public int equipmentActive(EquipmenteHireHead equipmenteHireHead) {
+        try {
+            SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            equipmenteHireHead.setEh_status(3);
+            equipmenteHireHeadDao.updateByPrimaryKeySelective(equipmenteHireHead);
+            List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailService.selectByPrimaryKey(equipmenteHireHead.getEh_code());
+            for (EquipmenteHireDetail ed : equipmenteHireDetails) {
+                // update updateEIStatus
+                if(ed.getEt_type().equals("1")){
+                    //modoo active
+                    modooApiService.equipmentActive(ed.getEd_emcode());
+                }
+                EquipmentInfo equipmentInfo = new EquipmentInfo();
+                equipmentInfo.setEi_code(ed.getEd_emcode());
+                equipmentInfo.setEi_status(2);
+                equipmentInfoService.updateEIStatus(equipmentInfo);
+                // log
+                ModooEquipmentLog modooEquipmentLog = new ModooEquipmentLog();
+                modooEquipmentLog.setMl_type(1);
+                modooEquipmentLog.setCm_phone(equipmenteHireHead.getEh_cmphone());
+                modooEquipmentLog.setMl_code(ed.getEd_emcode());
+                modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
+                modooEquipmentLog.setMl_username(equipmenteHireHead.getEh_usercode());
+                modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+
+        //modoo if(type==1)
+
+        // log modoo
+
+        return 1;
+    }
+
+    public int equipmentSettle(EquipmenteHireHead equipmenteHireHead) {
+
+        return 1;
+    }
+
 
 }

src/main/java/com/ygj/yuemum/service/modoo/ModooApiService.java

@@ -0,0 +1,110 @@
+package com.ygj.yuemum.service.modoo;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class ModooApiService {
+
+    public int equipmentActive(String ei_code) {
+        try {
+            String result = "";
+            String ticket = getTicket();
+            // 创建httpclient对象
+            CloseableHttpClient httpClient = HttpClients.createDefault();
+            // 创建post方式请求对象
+            HttpPost httpPost = new HttpPost("https://yulu.meng-dong.com/access");
+            String para = "{\"cmd\":2019,\"userId\":\"471699856\",\"WebReqHeader\":{\"uuid\":\"1528104729646\",\"ua\":\"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0\",\"ticket\":\"" + ticket + "\",\"seq\":13},\"request\":{\"psnStr\":\"" + ei_code + "\"}}";
+            StringEntity stringEntity = new StringEntity(para, ContentType.APPLICATION_JSON);
+            stringEntity.setContentEncoding("utf-8");
+            httpPost.setEntity(stringEntity);
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                result = EntityUtils.toString(response.getEntity(), "utf-8");
+            } else {
+                return 0;
+            }
+            Map map1 = JSON.parseObject(result);
+            Map map2 = JSON.parseObject(String.valueOf(map1.get("response")));
+            Map map3 = JSON.parseObject(String.valueOf(map2.get("ret")));
+            String code = String.valueOf(map3.get("code"));
+            response.close();
+            if (code != "0") {
+                return 1;
+            } else {
+                return 0;
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public int equipmentSettle(String ei_code) {
+        try {
+            String result = "";
+            String ticket = getTicket();
+            // 创建httpclient对象
+            CloseableHttpClient httpClient = HttpClients.createDefault();
+            // 创建post方式请求对象
+            HttpPost httpPost = new HttpPost("https://yulu.meng-dong.com/access");
+            StringEntity stringEntity = new StringEntity("{\"cmd\":2021,\"userId\":\"471699856\",\"WebReqHeader\":{\"uuid\":\"1528104729646\",\"ua\":\"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0\",\"ticket\":\""+ticket+"\",\"seq\":18},\"request\":{\"psnHex\":\""+ei_code+"\",\"newStatusCode\":6}}", ContentType.APPLICATION_JSON);
+            stringEntity.setContentEncoding("utf-8");
+            httpPost.setEntity(stringEntity);
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                result = EntityUtils.toString(response.getEntity(), "utf-8");
+            } else {
+                return 0;
+            }
+            Map map1 = JSON.parseObject(result);
+            Map map2 = JSON.parseObject(String.valueOf(map1.get("response")));
+            String code = String.valueOf(map2.get("code"));
+            response.close();
+            if (code != "0") {
+                return 1;
+            } else {
+                return 0;
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public String getTicket() {
+        try {
+            String result = "";
+            // 创建httpclient对象
+            CloseableHttpClient httpClient = HttpClients.createDefault();
+            // 创建post方式请求对象
+            HttpPost httpPost = new HttpPost("https://yulu.meng-dong.com/access");
+            StringEntity stringEntity = new StringEntity("{\"cmd\":104,\"WebReqHeader\":{\"uuid\":\"1528104729646\",\"ua\":\"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0\",\"seq\":7},\"request\":{\"scene\":1,\"mobile\":\"15011358583\",\"password\":\"abcd1234\",\"role\":2}}", ContentType.APPLICATION_JSON);
+            stringEntity.setContentEncoding("utf-8");
+            httpPost.setEntity(stringEntity);
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                result = EntityUtils.toString(response.getEntity(), "utf-8");
+            }
+            Map map1 = JSON.parseObject(result);
+            Map map2 = JSON.parseObject(String.valueOf(map1.get("response")));
+            Map map3 = JSON.parseObject(String.valueOf(map2.get("webUserTicket")));
+            String ticket = String.valueOf(map3.get("ticket"));
+            response.close();
+            return ticket;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+}

src/main/java/com/ygj/yuemum/service/modoo/ModooEquipmentLogService.java

@@ -0,0 +1,38 @@
+package com.ygj.yuemum.service.modoo;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ygj.yuemum.dao.modoo.ModooEquipmentLogDao;
+import com.ygj.yuemum.domain.modoo.ModooEquipmentLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ModooEquipmentLogService {
+
+    @Autowired
+
+    private ModooEquipmentLogDao modooEquipmentLogDao;
+
+    public Map<String, Object> getModooEquipmentLogs(ModooEquipmentLog modooEquipment) {
+        PageHelper.startPage(modooEquipment.getPage(), modooEquipment.getLimit());
+        List<ModooEquipmentLog> modooEquipmentLogs = modooEquipmentLogDao.getModooEquipmentLogs(modooEquipment.getMl_code());
+
+        PageInfo<ModooEquipmentLog> pageInfo = new PageInfo<ModooEquipmentLog>(modooEquipmentLogs);
+        long count = pageInfo.getTotal(); //获取总记录数
+
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", modooEquipmentLogs);
+        tableData.put("total", count);
+        return tableData;
+    }
+
+    public int insertModooEquipmentLog(ModooEquipmentLog modooEquipmentLog) {
+        return modooEquipmentLogDao.insertModooEquipmentLog(modooEquipmentLog);
+    }
+
+}

src/main/java/com/ygj/yuemum/service/pay/CustomerPayService.java

@@ -3,7 +3,6 @@ package com.ygj.yuemum.service.pay;
 import com.ygj.yuemum.dao.equipment.EquipmenteHireDetailDao;
 import com.ygj.yuemum.dao.equipment.EquipmenteHireHeadDao;
 import com.ygj.yuemum.dao.pay.CustomerPayDao;
-import com.ygj.yuemum.domain.equipment.EquipmentInfo;
 import com.ygj.yuemum.domain.equipment.EquipmentLog;
 import com.ygj.yuemum.domain.equipment.EquipmenteHireDetail;
 import com.ygj.yuemum.domain.equipment.EquipmenteHireHead;
@@ -45,11 +44,6 @@ public class CustomerPayService {
             equipmenteHireHeadDao.updateByPrimaryKeySelective(equipmenteHireHead);
             List<EquipmenteHireDetail> equipmenteHireDetails = equipmenteHireDetailDao.selectByPrimaryKey(customerPay.getCp_orderno());
             for (EquipmenteHireDetail ed : equipmenteHireDetails) {
-                // update updateEIStatus
-                EquipmentInfo equipmentInfo = new EquipmentInfo();
-                equipmentInfo.setEi_code(ed.getEd_emcode());
-                equipmentInfo.setEi_status(2);
-                equipmentInfoService.updateEIStatus(equipmentInfo);
                 // log
                 EquipmentLog equipmentLog = new EquipmentLog();
                 equipmentLog.setEi_code(ed.getEd_emcode());

src/main/resources/mybatis/mapper/modoo/ModooEquipmentLogMapper.xml

@@ -0,0 +1,61 @@
+<?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.ygj.yuemum.dao.modoo.ModooEquipmentLogDao" >
+
+    <resultMap id="BaseResultMap" type="com.ygj.yuemum.domain.modoo.ModooEquipmentLog" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="ml_type" property="ml_type" jdbcType="INTEGER" />
+        <result column="cm_phone" property="cm_phone" jdbcType="VARCHAR" />
+        <result column="ml_code" property="ml_code" jdbcType="VARCHAR" />
+        <result column="ml_date" property="ml_date" jdbcType="DATE" />
+        <result column="ml_username" property="ml_username" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <!--获取所有数据-->
+    <select id="getModooEquipmentLogs" resultType="com.ygj.yuemum.domain.modoo.ModooEquipmentLog" parameterType="java.lang.String" >
+        select
+        id,ml_type,cm_phone,ml_code,ml_date,ml_username
+        from modoo_equipment_log
+        where ml_code = #{ml_code,jdbcType=VARCHAR}
+    </select>
+
+    <!-- 插入一条培训信息 -->
+    <insert id="insertModooEquipmentLog" parameterType="com.ygj.yuemum.domain.modoo.ModooEquipmentLog" >
+        insert into modoo_equipment_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="ml_type != null" >
+                ml_type,
+            </if>
+            <if test="cm_phone != null" >
+                cm_phone,
+            </if>
+            <if test="ml_code != null" >
+                ml_code,
+            </if>
+            <if test="ml_date != null" >
+                ml_date,
+            </if>
+            <if test="ml_username != null" >
+                ml_username
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="ml_type != null" >
+                #{ml_type,jdbcType=INTEGER},
+            </if>
+            <if test="cm_phone != null" >
+                #{cm_phone,jdbcType=VARCHAR},
+            </if>
+            <if test="ml_code != null" >
+                #{ml_code,jdbcType=VARCHAR},
+            </if>
+            <if test="ml_date != null" >
+                #{ml_date,jdbcType=DATE},
+            </if>
+            <if test="ml_username != null" >
+                #{ml_username,jdbcType=VARCHAR}
+            </if>
+        </trim>
+    </insert>
+
+</mapper>