diff --git a/interfaces/interfaces.iml b/interfaces/interfaces.iml new file mode 100644 index 0000000..4058726 --- /dev/null +++ b/interfaces/interfaces.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/interfaces/pom.xml b/interfaces/pom.xml new file mode 100644 index 0000000..cb22cb0 --- /dev/null +++ b/interfaces/pom.xml @@ -0,0 +1,91 @@ + + + + rtos-wh + org.example + 1.0-SNAPSHOT + + 4.0.0 + interfaces + + 1.8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + com.alibaba + fastjson + 1.2.7 + + + org.projectlombok + lombok + + + org.example + models + 1.0-SNAPSHOT + + + org.example + mapper + 1.0-SNAPSHOT + + + org.example + utils + 1.0-SNAPSHOT + + + com.bestvike + linq + 3.1.0 + compile + + + com.nuzar + rtops-openapi-client + 1.0-SNAPSHOT + compile + + + com.github.pagehelper + pagehelper + 5.3.2 + compile + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + com.nuzar + nuzar-security + 2.6.14.10-SNAPSHOT + compile + + + junit + junit + test + + + top.jfunc.json + Json-Gson + 1.0 + + + + + \ No newline at end of file diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/CusOrderApi.java b/interfaces/src/main/java/com/haitongauto/interfaces/CusOrderApi.java new file mode 100644 index 0000000..a02e7ac --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/CusOrderApi.java @@ -0,0 +1,114 @@ +package com.haitongauto.interfaces; + +import com.haitongauto.models.ido.BasicDataIdo; +import com.haitongauto.models.ido.CustomerRes; +import com.haitongauto.models.ido.ShipVoyIdo; +import com.haitongauto.models.valid.cus.ValidCusVin; +import com.haitongauto.models.valid.cus.ValidRequest; +import com.nuzar.common.security5.core.interceptor.OauthFeignInterceptor; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +//@FeignClient(name = "nuzar-customer-boss", url = "https://rtops4.haitongauto.com/tos/customer", configuration = {OauthFeignInterceptor.class}) +@FeignClient(name = "nuzar-customer-boss", configuration = {OauthFeignInterceptor.class}) +public interface CusOrderApi { + /** + * 内贸出口 船名 + * @return 返回 出口 船名/航次 + * 内贸出口 船名获取的是 所有船名 + * 邓军读取哪吒根接口 basic-service/shipManage/queryAllShipManage + * 2024-4-2夜 王琛 提出添加分页需求 + * 2024-4-3王文文和王琛讨论，鉴于数据量不大，确认接口不修改，继续沿用该接口 + */ + @PostMapping("/dd/ship/all") + CustomerRes> getNEOutPlanShipList(@RequestParam("q") String q); + + /** + * 外贸出口 船名 + * 外贸出口 船名取自出口计划审核通过内的船名 + * @return 返回 出口 船名/航次 + */ + @PostMapping("/ee/plan/ship") + CustomerRes> getWEOutPlanShipList(@RequestParam("q") String q, + @RequestParam("portAreaId")String portAreaId, + @RequestParam("current") int current, + @RequestParam("size") int size); + + /** + * 内贸出口港口 + * + * @return 返回出口港口 + */ + @PostMapping("/dd/port") + CustomerRes> getNEOutPlanPortsList(@RequestParam("q") String q); + + /** + * 外贸出口港口 + * @return 返回出口港口 + */ + @PostMapping("/ee/plan/port") + CustomerRes> getWEOutPlanPortsList(@RequestParam("q") String q, + @RequestParam("shipId") String shipId, + @RequestParam("current") int current, + @RequestParam("size") int size); + + /** + * 内贸出口品牌 + * + * @return 返回出口品牌 / + */ + @PostMapping("/dd/brand") + CustomerRes> getNEOutPlanBrandsList(@RequestParam("q") String q); + + /** + * 外贸出口品牌 + * + * @return 返回出口品牌 /customer/dd/brand + */ + @PostMapping("/ee/voyage/brand") + CustomerRes> getWEOutPlanBrandsList(@RequestParam("q") String q, + @RequestParam("shipName") String shipName, + @RequestParam("current") int current, + @RequestParam("size") int size); + + + /** + * 进口 船名/航次 + * + * @return 返回 进口 船名/航次 + */ + @PostMapping("/it/shipVoyage") + CustomerRes> getInPlanShipVoyList(@RequestParam("q") String q); + + /** + * + * @return 返回进口港口 + */ + @PostMapping("/it/shipVoyage") + CustomerRes> getInPlanPortsList(@RequestParam("q") String q); + + /** + * 进口品牌 + * + * @return 返回进口品牌 + */ + @PostMapping("/it/shipVoyage") + CustomerRes> getInPlanBrandsList(@RequestParam("q") String q, + @RequestParam("shipName") String shipName, + @RequestParam("voyage") String voyage); + + + /** + * 验证vins是否被激活 + * + * @return 返回未激活的vins + */ + @PostMapping("/spz/valid-vins") + com.haitongauto.models.res.Response> getCheckVinISValid(@RequestBody ValidRequest validRequest); + + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/CustomerServiceInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/CustomerServiceInterface.java new file mode 100644 index 0000000..6c0ca5f --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/CustomerServiceInterface.java @@ -0,0 +1,23 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.ido.BasicDataIdo; +import com.haitongauto.models.ido.ShipVoyIdo; +import java.util.List; + +public interface CustomerServiceInterface { + /** + * 获取 船名/航次/品牌/港口/国家数据列表 + * @param requestType 请求类型 + * @return 返回数据 + */ + List getBasicMapData(String param, Integer requestType); + + List getShipVoyIdoList(String param, Integer requestType); + + /** + * 获取提单号列表 + * + * @return 返回提单号列表 + */ + List getBillNumMapData(String q ); + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/DepartureVehicleInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/DepartureVehicleInterface.java new file mode 100644 index 0000000..c8cf4ba --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/DepartureVehicleInterface.java @@ -0,0 +1,34 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.ido.departure.DepartureDetailIdo_DTO; +import com.haitongauto.models.ido.departure.DepartureVehicleIdo_DTO; + +/** + * 提车凭证接口 + */ +public interface DepartureVehicleInterface { + /** + * 获取提车凭证的分页数据 + * + * @param current 当前页码 + * @param size 数据条数(非必填 + * @return 返回提车凭证的分页数据 + */ + DepartureVehicleIdo_DTO getDepartureVehicleList(String printTicketTime, String query, Integer current, Integer size); + + /** + * 获取一条提车明细 + * + * @param id：提车id + * @return 返回一条提车明细 + */ + DepartureDetailIdo_DTO getDepartureDetailForId(String id); + + /** + * 完成提车核验 + * + * @param id：提车id + * @return 返回完成提车核验结果 + */ + boolean checkDepartureVehicle(String id); + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/DicInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/DicInterface.java new file mode 100644 index 0000000..56bacc6 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/DicInterface.java @@ -0,0 +1,29 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.dto.DicDto; +import java.util.List; + +/** + * 通用数据字典表（数据源自RTOS） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 APP_CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备 件 MACHINE_TYPE + */ +public interface DicInterface { + /** + * 获取通用字典接口数据 + * + * @param dic_sort ：数据类型字符串（该参数直接拼接到接口URL） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 APP_CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备件 MACHINE_TYPE + * @return 返回通用字典接口数据 + */ + List getDicList(String dic_sort); + + String picUpload(String pic); + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/EnterPortTypeInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/EnterPortTypeInterface.java new file mode 100644 index 0000000..d91f1f1 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/EnterPortTypeInterface.java @@ -0,0 +1,9 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.dto.EnterPortTypeDtol; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +public interface EnterPortTypeInterface { + List getEnterPortTypeList(); +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/OrderApi.java b/interfaces/src/main/java/com/haitongauto/interfaces/OrderApi.java new file mode 100644 index 0000000..35b1625 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/OrderApi.java @@ -0,0 +1,167 @@ +package com.haitongauto.interfaces; + +import com.haitongauto.models.dto.EnterPortTypeDto; +import com.haitongauto.models.ido.CheckRes; +import com.haitongauto.models.ido.CommonRes; +import com.haitongauto.models.ido.DictionaryIdo; +import com.haitongauto.models.ido.PortAreasIdo; +import com.haitongauto.models.ido.departure.DepartureDetailIdo; +import com.haitongauto.models.ido.departure.DepartureVehicleIdoPar; +import com.haitongauto.models.ido.departure.pc.DepartureVehicleIdoPar_pc; +import com.haitongauto.models.ido.login.*; +import com.haitongauto.models.ido.receiving.ReceivingDetailIdo; +import com.haitongauto.models.ido.receiving.ReceivingVehicleIdoPar; +import com.haitongauto.models.ido.receiving.pc.ReceivingVehicleIdoPar_pc; +import com.haitongauto.models.valid.naz.CargoInfoNaz; +import com.haitongauto.models.valid.naz.res.NarRes; +import com.nuzar.common.security5.core.interceptor.OauthFeignInterceptor; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +/** + * 通用数据字典表（数据源自RTOS） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备 件 MACHINE_TYPE + */ +//@FeignClient(name = "rtos-openapi", url = "https://rtops4.haitongauto.com/tos/api", configuration = {OauthFeignInterceptor.class}) +@FeignClient(name = "rtos-openapi", configuration = {OauthFeignInterceptor.class}) +public interface OrderApi { + /** + * 登录 + * + * @param loginRequest loginRequest + * @return 登录结果 + */ + @GetMapping("/miniapp/login") + @ResponseBody + CommonRes login(@RequestBody UserLoginOrRegisterRequest loginRequest); + + /** + * 获得用户id和用户openid + * + * @return 登录结果 + */ + @PutMapping("/miniapp/user/update") + @ResponseBody + CommonRes updateUser(@RequestBody UsersIdo usersIdo); + + //String updateUser(@RequestBody UsersIdo usersIdo); + + /** + * 字典数据 + * + * @return 返回字典数据 + */ + @GetMapping("/miniapp/typeRef/domain/{domain}") + CommonRes> dicData(@RequestParam("domain") String domain); + + /** + * 港区列表数据 + * + * @return 返回港区列表 + */ + @GetMapping("/miniapp/portAreaManage/getPortArea") + CommonRes> getPortAreasIdoList(@RequestParam("pamName") String pamName); + + /** + * 收车分页数据 + * + * @return 返回收车分页数据 + */ + @GetMapping("/miniapp/vehicleClose/collectCar/page") + CommonRes getReceivingVehicleList(@RequestParam("printTicketTime") String printTicketTime, + @RequestParam("query") String query, + @RequestParam("current") Integer current, + @RequestParam("size") Integer size); + + /** + * 收车详情 + * @return 返回收车详情 + */ + @GetMapping("/miniapp/vehicleClose/collectCar/detail/{id}") + CommonRes getReceivingDetailForId(@RequestParam("id") String id); + + /** + * 收车核验 + * + * @return 返回收车核验 + */ + @PostMapping("/miniapp/vehicleClose/collectCar/confirm") + CommonRes checkReceivingVehicle(@RequestBody String id); + + /** + * 提(发)车分页数据 + * + * @return 返回提车分页数据 + */ + @GetMapping("/miniapp/delivery/pickUpCar/page") + CommonRes getDepartureVehicleList(@RequestParam("printTicketTime") String printTicketTime, @RequestParam("query") String query, @RequestParam("current") Integer current, @RequestParam("size") Integer size); + + /** + * 提(发)车详情 + * @return 返回提车详情 + */ + @GetMapping("/miniapp/delivery/pickUpCar/detail/{id}") + CommonRes getDepartureDetailForId(@RequestParam("id") String id); + + /** + * 提(发)车核验 + * + * @return 返回提(发)车核验 + */ + @PostMapping("/miniapp/delivery/pickUpCar/confirm") + CommonRes checkDepartureVehicle(@RequestBody String id); + + /** + * 获取进港类型和业务类型 + * + * @return 返回 + */ + @GetMapping("/miniapp/enterptType/dict") + CommonRes> getEnterPortType(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + /** + * 根据条件查询所有的收车凭证列表（海通后台使用） + * + * @param spmId 船名 + * @param bvmId 货物类型 + * @param query 关键字(手机号、板车号、编号) + * @return 返回 收车凭证列表 + */ + @GetMapping("/miniapp/vehicleClose/collect/cars/page") + CommonRes getReceiveListByCondition(@RequestParam("spmId") String spmId, @RequestParam("bvmId") String bvmId, @RequestParam("query") String query, @RequestParam("current") Integer current, @RequestParam("size") Integer size); + + /** + * 根据条件查询所有的发车凭证列表（海通后台使用） + * + * @param spmId 船名 + * @param bvmId 货物类型 + * @param query 关键字(手机号、板车号、编号) + * @return 返回 收车凭证列表 + */ + @GetMapping("/miniapp/delivery/pickUp/cars/page") + CommonRes getDepartureListByCondition(@RequestParam("spmId") String spmId, @RequestParam("bvmId") String bvmId, @RequestParam("query") String query, @RequestParam("current") Integer current, @RequestParam("size") Integer size); + + + /** + * 特保区车辆预约接口(智云接口) + */ + @PostMapping("/special/vehicleReserve") + NarRes vehicleReserve(@RequestBody CargoInfoNaz cargoInfoNaz); + + /** + * 特保区车辆预约接口(智云取消接口) + * + * @param orderno + * @return + */ + @PostMapping("/special/vehicleCancelReserve") + NarRes vehicleCancelReserve(@RequestParam("orderno") String orderno); + + +} \ No newline at end of file diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/PortAreaInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/PortAreaInterface.java new file mode 100644 index 0000000..201b5a9 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/PortAreaInterface.java @@ -0,0 +1,15 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.pojo.PortArea; +import java.util.List; + +/** + * 港区接口服务 + */ +public interface PortAreaInterface { + /** + * 获取RTOS港区列表数据 + * @return 返回港区列表数据 + */ + List getPortArea(); + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/ReceivingVehicleInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/ReceivingVehicleInterface.java new file mode 100644 index 0000000..5a262ee --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/ReceivingVehicleInterface.java @@ -0,0 +1,39 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.ido.receiving.ReceivingDetailIdo_DTO; +import com.haitongauto.models.ido.receiving.ReceivingVehicleIdo_DTO; +/** + * 收车凭证接口服务 + */ +public interface ReceivingVehicleInterface { + /** + * 获取收车凭证的分页数据 + * + * @param current 当前页码 + * @param size 数据条数(非必填) + * @return 返回收车凭证的分页数据 + */ + ReceivingVehicleIdo_DTO getReceivingVehicleList(String printTime, String query, Integer current, Integer size); + + /** + * 获取一条收车明细 + * + * @param id：收车id + * @return 返回一条收车明细 + */ + ReceivingDetailIdo_DTO getReceivingDetailForId(String id); + + /** + * 完成收车核验 + * + * @param id：收车id + * @return 返回完成收车核验结果 + */ + boolean checkReceivingVehicle(String id); + + + + + + + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/UserInterface.java b/interfaces/src/main/java/com/haitongauto/interfaces/UserInterface.java new file mode 100644 index 0000000..58ebbfa --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/UserInterface.java @@ -0,0 +1,17 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.ido.login.UserLoginOrRegisterRequest; +import com.haitongauto.models.ido.login.UserLoginOrRegisterResponse; +/** + * 用户登录/注册 + * 调用哪吒接口 + */ +public interface UserInterface { + /** + * 用户登录/注册 + * + * @param request 请求入参 + * @return 返回出参实体 + */ + UserLoginOrRegisterResponse userLoginOrRegister(UserLoginOrRegisterRequest request); + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/UsersApi.java b/interfaces/src/main/java/com/haitongauto/interfaces/UsersApi.java new file mode 100644 index 0000000..2b9ad2b --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/UsersApi.java @@ -0,0 +1,19 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.ido.CommonRes; +import com.haitongauto.models.ido.login.UserInfoRes; +import com.nuzar.common.security5.core.interceptor.OauthFeignInterceptor; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +//@FeignClient(name = "auth-server", url = "https://rtops4.haitongauto.com/auth", configuration = {OauthFeignInterceptor.class}) +@FeignClient(name = "auth-server",url = "${auth-server}",configuration = {OauthFeignInterceptor.class}) +public interface UsersApi { + /** + * 获得用户id和用户openid + * @return 登录结果 + */ + @PostMapping("/saas/authorization/user/info") + @ResponseBody + CommonRes getUserInfo(); +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/YardOrderApi.java b/interfaces/src/main/java/com/haitongauto/interfaces/YardOrderApi.java new file mode 100644 index 0000000..82e2cbc --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/YardOrderApi.java @@ -0,0 +1,21 @@ +package com.haitongauto.interfaces; +import com.haitongauto.models.dto.open.YardGoodsStateRespDTO; +import com.haitongauto.models.ido.CommonRes; +import com.nuzar.common.security5.core.interceptor.OauthFeignInterceptor; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +//@FeignClient(name = "yard-service", url = "https://rtops4.haitongauto.com/tos/yard", configuration = {OauthFeignInterceptor.class}) +@FeignClient(name = "yard-service", configuration = {OauthFeignInterceptor.class}) +public interface YardOrderApi { + /** + * 验证车辆是否在场 + * @param vins 车架号 + * @return 返回结果 + */ + @PostMapping("/yardGoods/checkInYardFLag") + CommonRes> checkInYardFLag(@RequestBody List vins); +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/CustomerServiceInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/CustomerServiceInterfaceImpl.java new file mode 100644 index 0000000..a266709 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/CustomerServiceInterfaceImpl.java @@ -0,0 +1,250 @@ +package com.haitongauto.interfaces.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.haitongauto.interfaces.CustomerServiceInterface; +import com.haitongauto.mapper.base.RequesterMapper; +import com.haitongauto.models.ido.BasicDataIdo; +import com.haitongauto.models.ido.ShipVoyIdo; +import com.haitongauto.models.pojo.Requester; +import com.haitongauto.utils.HttpRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +@Slf4j +@Service +public class CustomerServiceInterfaceImpl implements CustomerServiceInterface { + @Autowired + RequesterMapper requesterMapper; + + /** + * 获取 船名/航次/品牌/港口/国家数据列表 + * + * @param param 入参 + * @param requestType 请求类型 船名 = 1006 / 航次 = 1007 / 品牌 = 1008 / 港口 = 1009 / 国家 = 1010 + * @return 返回数据 + */ + @Override + public List getBasicMapData(String param, Integer requestType) { + List myList = new ArrayList<>(); + if (true) { + //获取港区外部接口及参数(航次接口类型参数requestType=1007) + Requester requester = requesterMapper.getRequesterForType(requestType); + if (requester == null || requester.getUrl() == null || requester.getUrl().equals("")) { + System.out.println("请在小程序数据库外部请求接口表添加【船名/航次/品牌/港口/国家等的接口数据】"); + log.error("请在数据库配置【船名/航次/品牌/港口/国家等的接口】的url及入参!"); + return null; + } + //请求参数 + String url = requester.getUrl(); + String myParam = param; + + //获取接口数据 + String res = HttpRequest.sendPost(url, myParam); + if (res == null || res.isEmpty()) { + log.error("RTOS接口请求【船名/航次/品牌/港口/国家】数据失败!"); + return null; + } + //接口数据转Map + Map map = JSONObject.parseObject(res, Map.class); + + Map ship_map = new HashMap<>(); + //List myList = new ArrayList<>(); + //判断接口数据获取是否成功 + if (map.get("code").equals("200") || map.get("msg").equals("success")) { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据 + //船名航次 + if (requestType.equals(1006)) { + List shipVoyIdoList = JSONArray.parseArray(map.get("data").toString(), ShipVoyIdo.class); + + } else { + myList = JSONArray.parseArray(map.get("data").toString(), BasicDataIdo.class); + } + } + } + + //伪代码，测试使用 + if (false) { + //请求类型，船名 = 1006 / 航次 = 1007 / 品牌 = 1008 / 港口 = 1009 / 国家 = 1010 + switch (requestType) { + case 1006: { + BasicDataIdo basicDataIdo1 = new BasicDataIdo(); + basicDataIdo1.setId("1"); + basicDataIdo1.setText("长江1号"); + BasicDataIdo basicDataIdo2 = new BasicDataIdo(); + basicDataIdo2.setId("2"); + basicDataIdo2.setText("长江2号"); + BasicDataIdo basicDataIdo3 = new BasicDataIdo(); + basicDataIdo3.setId("3"); + basicDataIdo3.setText("长江3号"); + myList.add(basicDataIdo1); + myList.add(basicDataIdo2); + myList.add(basicDataIdo3); + break; + } + case 1007: { + BasicDataIdo basicDataIdo4 = new BasicDataIdo(); + basicDataIdo4.setId("4"); + basicDataIdo4.setText("hangCi1"); + BasicDataIdo basicDataIdo5 = new BasicDataIdo(); + basicDataIdo5.setId("5"); + basicDataIdo5.setText("hangCi2"); + BasicDataIdo basicDataIdo6 = new BasicDataIdo(); + basicDataIdo6.setId("6"); + basicDataIdo6.setText("hangCi3"); + myList.add(basicDataIdo4); + myList.add(basicDataIdo5); + myList.add(basicDataIdo6); + break; + } + + case 1008: { + BasicDataIdo basicDataIdo7 = new BasicDataIdo(); + basicDataIdo7.setId("7"); + basicDataIdo7.setText("测试品牌1"); + BasicDataIdo basicDataIdo8 = new BasicDataIdo(); + basicDataIdo8.setId("8"); + basicDataIdo8.setText("测试品牌2"); + BasicDataIdo basicDataIdo9 = new BasicDataIdo(); + basicDataIdo9.setId("9"); + basicDataIdo9.setText("测试品牌3"); + myList.add(basicDataIdo7); + myList.add(basicDataIdo8); + myList.add(basicDataIdo9); + break; + } + + case 1009: { + BasicDataIdo basicDataIdo10 = new BasicDataIdo(); + basicDataIdo10.setId("10"); + basicDataIdo10.setText("武汉港"); + BasicDataIdo basicDataIdo11 = new BasicDataIdo(); + basicDataIdo11.setId("11"); + basicDataIdo11.setText("上海港"); + BasicDataIdo basicDataIdo12 = new BasicDataIdo(); + basicDataIdo12.setId("12"); + basicDataIdo12.setText("大连港"); + BasicDataIdo basicDataIdo13 = new BasicDataIdo(); + basicDataIdo13.setId("13"); + basicDataIdo13.setText("迪拜港"); + myList.add(basicDataIdo10); + myList.add(basicDataIdo11); + myList.add(basicDataIdo12); + myList.add(basicDataIdo13); + break; + } + + case 1010: { + BasicDataIdo basicDataIdo14 = new BasicDataIdo(); + basicDataIdo14.setId("14"); + basicDataIdo14.setText("中国"); + BasicDataIdo basicDataIdo15 = new BasicDataIdo(); + basicDataIdo15.setId("15"); + basicDataIdo15.setText("韩国"); + BasicDataIdo basicDataIdo16 = new BasicDataIdo(); + basicDataIdo16.setId("16"); + basicDataIdo16.setText("新加坡"); + myList.add(basicDataIdo14); + myList.add(basicDataIdo15); + myList.add(basicDataIdo16); + break; + } + + } + + } + + + return myList; + } + + /** + * 获取 船名/航次/品牌/港口/国家数据列表 + * + * @param param 入参 + * @param requestType 请求类型 船名 = 1006 / 航次 = 1007 / 品牌 = 1008 / 港口 = 1009 / 国家 = 1010 + * @return 返回数据 + */ + @Override + public List getShipVoyIdoList(String param, Integer requestType) { + List myList = new ArrayList<>(); + //获取港区外部接口及参数(航次接口类型参数requestType=1007) + Requester requester = requesterMapper.getRequesterForType(requestType); + if (requester == null || requester.getUrl() == null || requester.getUrl().equals("")) { + System.out.println("请在小程序数据库外部请求接口表添加【船名/航次/品牌/港口/国家等的接口数据】"); + log.error("请在数据库配置【船名/航次/品牌/港口/国家等的接口】的url及入参!"); + return null; + } + //请求参数 + String url = requester.getUrl(); + String myParam = param; + //获取接口数据 + String res = HttpRequest.sendPost(url, myParam); + if (res == null || res.isEmpty()) { + log.error("RTOS接口请求【船名/航次/品牌/港口/国家】数据失败!"); + return null; + } + //接口数据转Map + Map map = JSONObject.parseObject(res, Map.class); + Map ship_map = new HashMap<>(); + //List myList = new ArrayList<>(); + //判断接口数据获取是否成功 + if (map.get("code").equals("200") || map.get("msg").equals("success")) { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据 + //船名航次 + myList = JSONArray.parseArray(map.get("data").toString(), ShipVoyIdo.class); + } + return myList; + } + + /** + * 获取提单号列表 + * + * @return 返回提单号列表 + */ + @Override + public List getBillNumMapData(String q) { + List myList = new ArrayList<>(); + if (true) { + //获取港区外部接口及参数(提单接口类型参数requestType=1011) + Requester requester = requesterMapper.getRequesterForType(1011); + if (requester == null || requester.getUrl() == null || requester.getUrl().equals("")) { + System.out.println("请在小程序数据库外部请求接口表添加【提单接口】"); + log.error("请在数据库配置【提单接口】的url及入参!"); + return null; + } + //请求参数 + String url = requester.getUrl(); + String param = requester.getParam_map(); + //获取接口数据 + String res = HttpRequest.sendPost(url, param); + if (res == null) { + log.error("RTOS接口请求【提单】数据失败!"); + return null; + } + //接口数据转Map + Map map = JSONObject.parseObject(res, Map.class); + // List myList = new ArrayList<>(); + //判断接口数据获取是否成功 + if (map.get("code") == "200") { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据 + myList = JSONArray.parseArray(map.get("data").toString(), String.class); + } + } + + //伪代码，测试使用 + if (false) { + myList.add("ceshitidanhao121"); + myList.add("ceshitidanhao122"); + myList.add("ceshitidanhao123"); + myList.add("ceshitidanhao124"); + myList.add("ceshitidanhao125"); + } + + return myList; + } + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/DepartureVehicleInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/DepartureVehicleInterfaceImpl.java new file mode 100644 index 0000000..fc9ad3f --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/DepartureVehicleInterfaceImpl.java @@ -0,0 +1,114 @@ +package com.haitongauto.interfaces.impl; +import com.haitongauto.interfaces.DepartureVehicleInterface; +import com.haitongauto.interfaces.OrderApi; +import com.haitongauto.mapper.base.RequesterMapper; +import com.haitongauto.mapper.client.OtherExtendMapper; +import com.haitongauto.models.ido.CheckRes; +import com.haitongauto.models.ido.CommonRes; +import com.haitongauto.models.ido.departure.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@Service +public class DepartureVehicleInterfaceImpl implements DepartureVehicleInterface { + @Autowired + RequesterMapper requesterMapper; + @Autowired + OtherExtendMapper otherExtendMapper; + @Resource + private OrderApi orderApi; + + /** + * 获取提车凭证的分页数据 + * + * @param current 当前页码 + * @param size 数据条数(非必填 + * @return 返回提车凭证的分页数据 + */ + @Override + public DepartureVehicleIdo_DTO getDepartureVehicleList(String printTicketTime, String query, Integer current, Integer size) { + //创建一个提车凭证分页数据的实例（分页列表数据） + List mylist = null; + //接口数据转Map + CommonRes map = orderApi.getDepartureVehicleList(printTicketTime, query, current, size); + //判断接口数据获取是否成功 + String status = map.getStatus(); + DepartureVehicleIdo_DTO departureVehicleIdo_dto = new DepartureVehicleIdo_DTO(); + switch (status) { + case "200": + //接口数据获取成功，将接口的Map的data数据转为接口对象的List + departureVehicleIdo_dto.setStatus(status); + DepartureVehicleIdoPar departureVehicleIdoPar = map.getData(); + if (departureVehicleIdoPar != null) { + mylist = departureVehicleIdoPar.getRecords(); + departureVehicleIdo_dto.setDepartureVehicleIdoList(mylist); + } + break; + case "401": + //用户权限过期 + default: + departureVehicleIdo_dto.setStatus(status); + break; + } + return departureVehicleIdo_dto; + } + + /** + * 获取一条提车明细 + * + * @param id：提车id + * @return 返回一条提车明细 + */ + @Override + public DepartureDetailIdo_DTO getDepartureDetailForId(String id) { + //创建一个收车详情数据的实例（基本数据+明细列表） + DepartureDetailIdo_DTO departureDetailIdo_dto = new DepartureDetailIdo_DTO(); + DepartureDetailIdo departureDetailIdo = null; + //接口数据转Map + CommonRes map = orderApi.getDepartureDetailForId(id); + String status = map.getStatus(); + //判断接口数据获取是否成功 + if ("200".equals(status)) { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据 + departureDetailIdo_dto.setStatus("200"); + departureDetailIdo = map.getData(); + if (departureDetailIdo != null) { + departureDetailIdo_dto.setDepartureDetailIdo(departureDetailIdo); + } + } + if ("401".equals(status)) { + departureDetailIdo_dto.setStatus("401"); + } + return departureDetailIdo_dto; + } + + /** + * 完成提车核验 + * + * @param id：提车id + * @return 返回完成提车核验结果 + */ + @Override + public boolean checkDepartureVehicle(String id) { + if (id == null || id.isEmpty()) { + return false; + } + CommonRes res = orderApi.checkDepartureVehicle(id); + //接口数据转Map + boolean result = false; + //判断接口数据获取是否成功 + if ("200".equals(res.getStatus())) { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据，最后返回核验是否成功 true/false + result = res.getData().isResult(); + /*{ + "errorMsg": "", //操作失败原因，成功则为 null + "result": true //操作结果 + }**/ + } + return result; + } +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/DicInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/DicInterfaceImpl.java new file mode 100644 index 0000000..e9ade22 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/DicInterfaceImpl.java @@ -0,0 +1,190 @@ +package com.haitongauto.interfaces.impl; +import com.bestvike.linq.Linq; +import com.haitongauto.interfaces.DicInterface; +import com.haitongauto.interfaces.OrderApi; +import com.haitongauto.mapper.base.DicMapper; +import com.haitongauto.mapper.base.RequesterMapper; +import com.haitongauto.models.dto.DicDto; +import com.haitongauto.models.ido.CommonRes; +import com.haitongauto.models.ido.DictionaryIdo; +import com.haitongauto.models.pojo.Dic; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * 通用数据字典表（数据源自RTOS） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备 件 MACHINE_TYPE + */ +@Slf4j +@Service +public class DicInterfaceImpl implements DicInterface { + @Autowired + DicMapper dicMapper; + @Autowired + RequesterMapper requesterMapper; + @Resource + private OrderApi orderApi; + + /** + * 获取通用字典接口数据 + * + * @param dic_sort ：数据类型字符串（该参数直接拼接到接口URL） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 APP_CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备件 MACHINE_TYPE + * @return 返回通用字典接口数据 + */ + @Override + public List getDicList(String dic_sort) { + List dicDtoList = new ArrayList<>(); + //伪代码，测试使用 +// if (false) { +// try { +// List mylist = dicMapper.getDicListByDicSort(dic_sort); +// //接口字典数据Dic转ViewModel类数据DicDto +// dicDtoList = this.DicConvertToDicDto(mylist); +// } catch (Exception ignored) { +// } +// } + + if (true) { + //检查查询类型参数，定义类型描述 + String description = ""; + CommonRes> map = null; + if (dic_sort != null && !Objects.equals(dic_sort, "")) { + switch (dic_sort) { + case "TRANSPORT_TYPE": + description = "运输方式"; + //map = orderApi.getTransportTypeList(); + map=orderApi.dicData("TRANSPORT_TYPE"); + break; + case "ENTER_PORT_TYPE": + map = orderApi.dicData("ENTER_PORT_TYPE"); + description = "进港类型"; + break; + case "APP_CARGO_TYPE": + description = "货物类型"; + map = orderApi.dicData("APP_CARGO_TYPE"); + break; + case "OPERATING_MODE": + description = "操作模式"; + map=orderApi.dicData("OPERATING_MODE"); + break; + case "MACHINE_TYPE": + description = "备件"; + map=orderApi.dicData("MACHINE_TYPE"); + + break; + } + } else { + return null; + } + //获取本地库对应类别的字典数据列表 + List mylist = dicMapper.getDicListByDicSort(dic_sort); + //通用字典的接口类型参数requestType=1002 + + //获取字典接口数据 + + if (map == null) { + //接口字典数据Dic转ViewModel类数据DicDto + dicDtoList = this.DicConvertToDicDto(mylist); + return dicDtoList; + } + + + //定义通用字典列表实例 + List dicList = new ArrayList<>(); + //判断接口数据获取是否成功 + if (map.getStatus().equals("200")) { + //接口数据获取成功，将接口的Map的data数据转为接口对象的List + List dataList = map.getData(); + if (dataList != null && dataList.size() > 0) { + //遍历data数据 + for (DictionaryIdo item : dataList) { + String dic_id = item.getPtrCode(); + //String dic_sort = item.getPamEfficient(); + if (dic_id != null && !Objects.equals(dic_id, "")) { + //定义一个字典的实例 + Dic dic = new Dic(); + //用接口数据给字典实例赋值 + dic.setDic_sort(dic_sort); //分类字符串 + dic.setId(dic_id); //字典id + dic.setContent(item.getPtrDesc()); //字典内容 + dic.setDescription(description); //字典描述 + dic.setIs_del(0); + //获取dic_id在本地数据库中对应实例的字典id + Dic myDic = Linq.of(mylist).firstOrDefault(a -> a.getId().equals(dic_id)); +// try { +// //更新到数据库 +// if (myDic != null && myDic.getId() != null) { +// //如果存在，则更新本地数据 +// int x = dicMapper.update(dic); +// if (x > 0) { +// System.out.println(description + "的接口数据已更新到本地数据库。"); +// } +// } else { +// //如果不存在，则新增本地数据 +// String id = dicMapper.insert(dic); +// if (id != null && id.length() > 0) { +// System.out.println(description + "的接口数据已添加到本地数据库。"); +// } +// } +// } catch (Exception ignored) { +// } + + //填充到dicList列表 + dicList.add(dic); + } + } + } + + } else { + //接口数据获取失败，则直接使用本地数据表 + dicList = mylist; + } + + //接口字典数据Dic转ViewModel类数据DicDto + dicDtoList = this.DicConvertToDicDto(dicList); + + } + return dicDtoList; + } + + /** + * 接口字典数据Dic转ViewModel类数据DicDto + * + * @param dicList 接口字典数据Dic列表 + * @return 返回ViewModel类数据DicDto列表 + */ + private List + DicConvertToDicDto(List dicList) { + List dicDtoList = new ArrayList<>(); + if (dicList != null && dicList.size() > 0) { + for (Dic item : dicList) { + DicDto dicDto = new DicDto(); + dicDto.setId(item.getId()); + dicDto.setText(item.getContent()); + dicDtoList.add(dicDto); + } + } + return dicDtoList; + } + + @Override + public String picUpload(String pic) { + + return ""; + } + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/EnterPortTypeInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/EnterPortTypeInterfaceImpl.java new file mode 100644 index 0000000..31c002e --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/EnterPortTypeInterfaceImpl.java @@ -0,0 +1,41 @@ +package com.haitongauto.interfaces.impl; +import com.haitongauto.interfaces.EnterPortTypeInterface; +import com.haitongauto.interfaces.OrderApi; +import com.haitongauto.models.dto.EnterPortTypeDto; +import com.haitongauto.models.dto.EnterPortTypeDtol; +import com.haitongauto.models.ido.CommonRes; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 进港类型接口 + */ +@Service +public class EnterPortTypeInterfaceImpl implements EnterPortTypeInterface { + @Resource + private OrderApi orderApi; + + @Override + public List getEnterPortTypeList() { + CommonRes> data = orderApi.getEnterPortType(); + List enterPortTypeDtoList = null; + if (data != null) { + enterPortTypeDtoList = data.getData(); + } + List enterPortTypeDtolList = new ArrayList<>(); + if (enterPortTypeDtoList != null && enterPortTypeDtoList.size() > 0) { + for (EnterPortTypeDto item : enterPortTypeDtoList) { + EnterPortTypeDtol enterPortTypeDtol = new EnterPortTypeDtol(); + enterPortTypeDtol.setId(item.getEteCode()); + enterPortTypeDtol.setText(item.getEteType()); + enterPortTypeDtol.setEteBusinesstp(item.getEteBusinesstp()); + enterPortTypeDtol.setEteBusinesstpDesc(item.getEteBusinesstpDesc()); + enterPortTypeDtolList.add(enterPortTypeDtol); + } + } + return enterPortTypeDtolList; + } + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/PortAreaInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/PortAreaInterfaceImpl.java new file mode 100644 index 0000000..62840e0 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/PortAreaInterfaceImpl.java @@ -0,0 +1,109 @@ +package com.haitongauto.interfaces.impl; + +import com.bestvike.linq.Linq; +import com.haitongauto.interfaces.OrderApi; +import com.haitongauto.interfaces.PortAreaInterface; +import com.haitongauto.mapper.base.PortAreasMapper; +import com.haitongauto.mapper.base.RequesterMapper; +import com.haitongauto.models.ido.CommonRes; +import com.haitongauto.models.ido.PortAreasIdo; +import com.haitongauto.models.pojo.PortArea; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +@Slf4j +@Service +public class PortAreaInterfaceImpl implements PortAreaInterface { + @Autowired + RequesterMapper requesterMapper; + @Autowired + PortAreasMapper portAreasMapper; + + @Resource + private OrderApi orderApi; + + /** + * 获取RTOS港区列表数据 + * + * @return 返回港区列表数据 + */ + @Override + public List getPortArea() { + //定义港区列表实例 + List portAreaList = new ArrayList<>(); + + //伪代码，测试使用 + if (false) { + try { + portAreaList = portAreasMapper.getList(); + } catch (Exception ignored) { + } + + } + + if (true) { + //获取本地库港区列表 + List mylist = portAreasMapper.getList(); + CommonRes> map = orderApi.getPortAreasIdoList(""); + //定义港区列表实例 + // List portAreaList = new ArrayList<>(); + //判断接口数据获取是否成功 + if ("200".equals(map.getStatus())) { + //接口数据获取成功，将接口的Map的data数据转为接口对象的List + List dataList = map.getData(); + //遍历data数据 + for (PortAreasIdo item : dataList) { + String pam_id = item.getPamId(); + String is_enable = item.getPamEfficient(); + if (pam_id != null && !Objects.equals(pam_id, "") && "启用".equals(is_enable)) { + //定义一个港区实例 + PortArea portArea = new PortArea(); + //用接口数据给实例赋值 + portArea.setId(item.getPamId()); + portArea.setPort_area_address(item.getPamAddress()); + portArea.setPort_area_code(item.getPamNo()); + portArea.setPort_area_name(item.getPamName()); + portArea.setIs_enable(("启用".equals(item.getPamEfficient())) ? 1 : 0); + portArea.setIs_del(0); + //还有一些字段值欠缺，如：港区坐标位置（poi）、打卡范围.... + //获取pam_id在本地数据库中对应实例的港区id + //PortArea myPortAreax = portAreasMapper.getByPamId(pam_id); + PortArea myPortArea = Linq.of(mylist).firstOrDefault(a -> a.getId().equals(pam_id)); + //更新到数据库 + if (myPortArea != null && myPortArea.getId() != null) { + myPortArea.setPort_area_code(item.getPamNo()); + myPortArea.setPort_area_name(item.getPamName()); + myPortArea.setIs_enable(("启用".equals(item.getPamEfficient())) ? 1 : 0); + myPortArea.setIs_del(0); + String port_area_address = myPortArea.getPort_area_address(); + if (port_area_address == null || port_area_address.isEmpty()) { + myPortArea.setPort_area_address(item.getPamAddress()); + } + + //如果存在，则更新本地数据 + int x = portAreasMapper.update(myPortArea); + } else { + //如果不存在，则新增本地数据,返回新值的id + String id = portAreasMapper.insert(portArea); + } + //填充到列表 + portAreaList.add(portArea); + } + } + } else { + //接口数据获取失败，则直接使用本地数据表 + portAreaList = mylist; + } + } + + return portAreaList; + + } + +} \ No newline at end of file diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/ReceivingVehicleInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/ReceivingVehicleInterfaceImpl.java new file mode 100644 index 0000000..730c2f4 --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/ReceivingVehicleInterfaceImpl.java @@ -0,0 +1,105 @@ +package com.haitongauto.interfaces.impl; +import com.haitongauto.interfaces.OrderApi; +import com.haitongauto.interfaces.ReceivingVehicleInterface; +import com.haitongauto.mapper.base.RequesterMapper; +import com.haitongauto.models.ido.CheckRes; +import com.haitongauto.models.ido.CommonRes; +import com.haitongauto.models.ido.receiving.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +@Slf4j +@Service +public class ReceivingVehicleInterfaceImpl implements ReceivingVehicleInterface { + @Autowired + RequesterMapper requesterMapper; + @Resource + private OrderApi orderApi; + + /** + * 获取收车凭证的分页数据(本用户数据) + * + * @param current 当前页码 + * @param size 数据条数(非必填 + * @return 返回收车凭证的分页数据 + */ + @Override + public ReceivingVehicleIdo_DTO getReceivingVehicleList(String printTicketTime, String query, Integer current, Integer size) { + //创建一个收车分页数据的实例（分页列表数据） + List mylist = null; + //接口数据转Map + CommonRes map = orderApi.getReceivingVehicleList(printTicketTime, query, current, size); + //判断接口数据获取是否成功 + String status = map.getStatus(); + ReceivingVehicleIdo_DTO receivingVehicleIdo_dto = new ReceivingVehicleIdo_DTO(); + switch (status) { + case "200": + //接口数据获取成功，将接口的Map的data数据转为接口对象的List + receivingVehicleIdo_dto.setStatus(status); + ReceivingVehicleIdoPar receivingVehicleIdoPar = map.getData(); + if (receivingVehicleIdoPar != null) { + mylist = receivingVehicleIdoPar.getRecords(); + receivingVehicleIdo_dto.setReceivingVehicleIdoList(mylist); + } + break; + case "401": + //用户权限过期 + default: + receivingVehicleIdo_dto.setStatus(status); + break; + } + return receivingVehicleIdo_dto; + } + + /** + * 获取一条收车明细 + * @param id：收车id + * @return 返回一条收车明细 + */ + @Override + public ReceivingDetailIdo_DTO getReceivingDetailForId(String id) { + //创建一个收车详情数据的实例（基本数据+明细列表） + ReceivingDetailIdo receivingDetailIdo = new ReceivingDetailIdo(); + ReceivingDetailIdo_DTO receivingDetailIdo_dto = new ReceivingDetailIdo_DTO(); + //接口数据转Map + CommonRes map = orderApi.getReceivingDetailForId(id); + String status = map.getStatus(); + //判断接口数据获取是否成功 + if ("200".equals(status)) { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据 + receivingDetailIdo_dto.setStatus("200"); + receivingDetailIdo = map.getData(); + if (receivingDetailIdo != null) { + receivingDetailIdo_dto.setReceivingDetailIdo(receivingDetailIdo); + } + } + if ("401".equals(status)) { + receivingDetailIdo_dto.setStatus("401"); + } + return receivingDetailIdo_dto; + } + + /** + * 完成收车核验 + * @param id：收车id + * @return 返回完成收车核验结果 + */ + @Override + public boolean checkReceivingVehicle(String id) { + if (id == null || id.isEmpty()) { + return false; + } + CommonRes res = orderApi.checkReceivingVehicle(id); + //接口数据转Map + boolean result = false; + //判断接口数据获取是否成功 + if ("200".equals(res.getStatus())) { + //接口数据获取成功，将接口的Map的data数据转为接口对象数据，最后返回核验是否成功 true/false + result = res.getData().isResult(); + } + return result; + } + +} diff --git a/interfaces/src/main/java/com/haitongauto/interfaces/impl/UserInterfaceImpl.java b/interfaces/src/main/java/com/haitongauto/interfaces/impl/UserInterfaceImpl.java new file mode 100644 index 0000000..b53d26a --- /dev/null +++ b/interfaces/src/main/java/com/haitongauto/interfaces/impl/UserInterfaceImpl.java @@ -0,0 +1,60 @@ +package com.haitongauto.interfaces.impl; +import com.alibaba.fastjson.JSONObject; +import com.haitongauto.interfaces.UserInterface; +import com.haitongauto.mapper.base.RequesterMapper; +import com.haitongauto.models.ido.login.UserLoginOrRegisterRequest; +import com.haitongauto.models.ido.login.UserLoginOrRegisterResponse; +import com.haitongauto.models.pojo.Requester; +import com.haitongauto.utils.HttpRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.Map; + +/** + * 用户登录/注册 + * 调用哪吒接口 + */ +@Slf4j +@Service +public class UserInterfaceImpl implements UserInterface { + @Autowired + RequesterMapper requesterMapper; + + /** + * 用户登录/注册 + * + * @param request 请求入参 + * @return 返回出参实体 + */ + @Override + public UserLoginOrRegisterResponse userLoginOrRegister(UserLoginOrRegisterRequest request) { + String myParam = "appId=" + request.getAppId() + + "&mobile=" + request.getMobile() + + "&openId=" + request.getOpenId() + + "&unionId=" + request.getUnionId() ; + // +"&mediaType=" + request.getMediaType(); + //获取 用户提交 外部接口及参数(用户提交接口类型参数requestType=1017) + Requester requester = requesterMapper.getRequesterForType(1017); + if (requester == null || requester.getUrl() == null || requester.getUrl().isEmpty()) { + System.out.println("请在小程序数据库外部请求接口表添加 用户登录或注册 接口定义数据。"); + log.error("请在数据库配置 用户登录或注册 的url及入参!"); + return null; + } + String url = requester.getUrl(); + //获取接口数据 + String res = HttpRequest.sendGet(url, myParam); + if (res.isEmpty()) { + System.out.println("请求哪吒 用户登录或注册 接口失败"); + log.error("请求哪吒 用户登录或注册 接口失败"); + return null; + } + Map map = JSONObject.parseObject(res, Map.class); + UserLoginOrRegisterResponse response = null; + if (map != null) { + response = JSONObject.parseObject(map.get("data").toString(), UserLoginOrRegisterResponse.class); + } + return response; + } + +} diff --git a/interfaces/target/classes/com/haitongauto/interfaces/CusOrderApi.class b/interfaces/target/classes/com/haitongauto/interfaces/CusOrderApi.class new file mode 100644 index 0000000..79066c5 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/CusOrderApi.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/CustomerServiceInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/CustomerServiceInterface.class new file mode 100644 index 0000000..b8fcca6 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/CustomerServiceInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/DepartureVehicleInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/DepartureVehicleInterface.class new file mode 100644 index 0000000..65fb259 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/DepartureVehicleInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/DicInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/DicInterface.class new file mode 100644 index 0000000..be788d5 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/DicInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/EnterPortTypeInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/EnterPortTypeInterface.class new file mode 100644 index 0000000..741bc3f Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/EnterPortTypeInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/OrderApi.class b/interfaces/target/classes/com/haitongauto/interfaces/OrderApi.class new file mode 100644 index 0000000..07d8d65 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/OrderApi.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/PortAreaInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/PortAreaInterface.class new file mode 100644 index 0000000..69ad5af Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/PortAreaInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/ReceivingVehicleInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/ReceivingVehicleInterface.class new file mode 100644 index 0000000..4f46dc5 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/ReceivingVehicleInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/UserInterface.class b/interfaces/target/classes/com/haitongauto/interfaces/UserInterface.class new file mode 100644 index 0000000..b72b63a Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/UserInterface.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/UsersApi.class b/interfaces/target/classes/com/haitongauto/interfaces/UsersApi.class new file mode 100644 index 0000000..6ca17de Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/UsersApi.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/YardOrderApi.class b/interfaces/target/classes/com/haitongauto/interfaces/YardOrderApi.class new file mode 100644 index 0000000..a65186f Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/YardOrderApi.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/CustomerServiceInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/CustomerServiceInterfaceImpl.class new file mode 100644 index 0000000..c7a4458 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/CustomerServiceInterfaceImpl.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/DepartureVehicleInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/DepartureVehicleInterfaceImpl.class new file mode 100644 index 0000000..ba92961 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/DepartureVehicleInterfaceImpl.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/DicInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/DicInterfaceImpl.class new file mode 100644 index 0000000..e936c5e Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/DicInterfaceImpl.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/EnterPortTypeInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/EnterPortTypeInterfaceImpl.class new file mode 100644 index 0000000..24bf96f Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/EnterPortTypeInterfaceImpl.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/PortAreaInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/PortAreaInterfaceImpl.class new file mode 100644 index 0000000..19ab18f Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/PortAreaInterfaceImpl.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/ReceivingVehicleInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/ReceivingVehicleInterfaceImpl.class new file mode 100644 index 0000000..6f261e5 Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/ReceivingVehicleInterfaceImpl.class differ diff --git a/interfaces/target/classes/com/haitongauto/interfaces/impl/UserInterfaceImpl.class b/interfaces/target/classes/com/haitongauto/interfaces/impl/UserInterfaceImpl.class new file mode 100644 index 0000000..9648cda Binary files /dev/null and b/interfaces/target/classes/com/haitongauto/interfaces/impl/UserInterfaceImpl.class differ diff --git a/interfaces/target/interfaces-1.0-SNAPSHOT.jar b/interfaces/target/interfaces-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..6dfe718 Binary files /dev/null and b/interfaces/target/interfaces-1.0-SNAPSHOT.jar differ diff --git a/interfaces/target/maven-archiver/pom.properties b/interfaces/target/maven-archiver/pom.properties new file mode 100644 index 0000000..1592971 --- /dev/null +++ b/interfaces/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jul 24 13:26:05 CST 2024 +version=1.0-SNAPSHOT +groupId=org.example +artifactId=interfaces diff --git a/interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..8e49df7 --- /dev/null +++ b/interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,18 @@ +com\haitongauto\interfaces\UsersApi.class +com\haitongauto\interfaces\impl\UserInterfaceImpl.class +com\haitongauto\interfaces\impl\CustomerServiceInterfaceImpl.class +com\haitongauto\interfaces\PortAreaInterface.class +com\haitongauto\interfaces\EnterPortTypeInterface.class +com\haitongauto\interfaces\impl\DepartureVehicleInterfaceImpl.class +com\haitongauto\interfaces\ReceivingVehicleInterface.class +com\haitongauto\interfaces\impl\ReceivingVehicleInterfaceImpl.class +com\haitongauto\interfaces\impl\DicInterfaceImpl.class +com\haitongauto\interfaces\CusOrderApi.class +com\haitongauto\interfaces\impl\EnterPortTypeInterfaceImpl.class +com\haitongauto\interfaces\OrderApi.class +com\haitongauto\interfaces\UserInterface.class +com\haitongauto\interfaces\DicInterface.class +com\haitongauto\interfaces\DepartureVehicleInterface.class +com\haitongauto\interfaces\YardOrderApi.class +com\haitongauto\interfaces\impl\PortAreaInterfaceImpl.class +com\haitongauto\interfaces\CustomerServiceInterface.class diff --git a/interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..e8fca8c --- /dev/null +++ b/interfaces/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,18 @@ +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\DepartureVehicleInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\DepartureVehicleInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\DicInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\UsersApi.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\UserInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\DicInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\CustomerServiceInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\UserInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\EnterPortTypeInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\ReceivingVehicleInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\CusOrderApi.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\CustomerServiceInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\OrderApi.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\PortAreaInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\impl\EnterPortTypeInterfaceImpl.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\ReceivingVehicleInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\PortAreaInterface.java +F:\Codes\rtos\v4\mini-service-v4\interfaces\src\main\java\com\haitongauto\interfaces\YardOrderApi.java diff --git a/mapper/mapper.iml b/mapper/mapper.iml new file mode 100644 index 0000000..770cefe --- /dev/null +++ b/mapper/mapper.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/mapper/pom.xml b/mapper/pom.xml new file mode 100644 index 0000000..b049e4f --- /dev/null +++ b/mapper/pom.xml @@ -0,0 +1,44 @@ + + + + rtos-wh + org.example + 1.0-SNAPSHOT + + 4.0.0 + + mapper + + + 1.8 + 1.8 + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + 2.2.2 + + + org.postgresql + postgresql + 42.5.4 + + + org.example + models + 1.0-SNAPSHOT + + + top.jfunc.json + Json-Gson + 1.0 + + + + + \ No newline at end of file diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java new file mode 100644 index 0000000..32698d6 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java @@ -0,0 +1,32 @@ +package com.haitongauto.mapper.admin; + +import com.haitongauto.models.pojo.Announcement; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.util.Date; +import java.util.List; + +@Mapper +public interface AnnouncementAdminMapper { + /** + * 发布人员（作者）去重列表 + * @return 返回发布人员（作者） + */ + List getAuthorList(); + + /** + * 根据特定条件查询历史公告 + * @param tilKeywords：标题关键字 + * @param dateStart：日期范围之起始发布日期 + * @param dateEnd：日期范围之截止发布日期 + * @param sort：类别（1-小程序，2-客服平台） + * @param authors：作者/发布人/操作员 + * @return 返回特定条件查询历史公告 + */ + List AnnouncementListForCondition(@Param("tilKeywords") String tilKeywords, @Param("dateStart") String dateStart, @Param("dateEnd") String dateEnd, @Param("sort") Integer sort, @Param("list") List authors); + + List AnnouncementListForWeek(); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/AppointmentAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/AppointmentAdminMapper.java new file mode 100644 index 0000000..d37de90 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/AppointmentAdminMapper.java @@ -0,0 +1,37 @@ +package com.haitongauto.mapper.admin; + +import com.haitongauto.models.pojo.Appointment; +import com.haitongauto.models.pojo.AppointmentDetail; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface AppointmentAdminMapper { + /** + * 车辆预约：通过港区、司机关键字、预约时间范围、进港类型、状态（1-已预约，0-已取消）、运输方式（0-自开/1-板车运输）单独或组合查询 + * @param port_area_id:港区id + * @param keywords：关键字（姓名、手机号、板车号） + * @param start_date：时间范围开始 + * @param end_date：时间范围结束 + * @param enter_type：进港类型（1-外贸出口,2-外贸进口,2-整车物流,3-特保区出口,4-特保区进口,5-内贸出口,6-内贸进口） + * @param appointment_state：预约状态（0-已取消，1-已预约） + * @param transport_type：运输方式（0-自开/1-板车运） + * @return 返回车辆预约 + */ + //List AppointmentListForCondition(@Param("port_area_id") Integer port_area_id, @Param("keywords") String keywords, @Param("start_date") String start_date, @Param("end_date") String end_date, @Param("enter_type") Integer enter_type, @Param("appointment_state") Integer appointment_state, @Param("transport_type") Integer transport_type); + List AppointmentListForCondition(@Param("users_id") String users_id, @Param("port_area_id") String port_area_id, @Param("keywords") String keywords, @Param("start_date") String start_date, @Param("end_date") String end_date, @Param("enter_type") String enter_type, @Param("appointment_state") Integer appointment_state, @Param("transport_type") String transport_type); + + ListAppointmentListExportyByIds(@Param("list") List ids); + + + /** + * 获取指定预约的货物明细 + * + * @param appointment_id 预约id + * @return 返回指定预约的货物明细 + */ + List appointmentGoodsDetail(@Param("appointment_id") String appointment_id); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/FeedbackAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/FeedbackAdminMapper.java new file mode 100644 index 0000000..3863a4f --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/FeedbackAdminMapper.java @@ -0,0 +1,19 @@ +package com.haitongauto.mapper.admin; + +import com.haitongauto.models.pojo.Feedback; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface FeedbackAdminMapper { + /** + * 根据联系方式、用户名称查询意见反馈 + * + * @param linkTel 联系方式 + * @param nikeName 用户名称 + * @return 返回意见反馈 + */ + List feedbackListForCondition(@Param("users_id") String users_id, @Param("linkTel") String linkTel, @Param("nikeName") String nikeName); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/NoviceIntroductionAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/NoviceIntroductionAdminMapper.java new file mode 100644 index 0000000..e6fa20f --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/NoviceIntroductionAdminMapper.java @@ -0,0 +1,16 @@ +package com.haitongauto.mapper.admin; + +import com.haitongauto.models.pojo.NoviceIntroduction; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface NoviceIntroductionAdminMapper { + /** + * 根据分类sort获取操作说明 + * @param sort:（1-小程序，2-客服平台，3-App） + * @return 返回操作说明 + */ + NoviceIntroduction getNoviceIntroductionBySort(@Param("sort") Integer sort); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/PunchClockAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/PunchClockAdminMapper.java new file mode 100644 index 0000000..4520821 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/PunchClockAdminMapper.java @@ -0,0 +1,37 @@ +package com.haitongauto.mapper.admin; + +import com.haitongauto.models.pojo.PunchClock; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface PunchClockAdminMapper { + + /** + * 通过港区、业务类型、关键词、签到日期、签到状态（缺卡/正常）、打卡完成状态（缺卡/正常）单独或组合查询 + * + * @param port_area_id:港区id + * @param biz_type：业务类型 + * @param keywords：关键字（姓名、手机号、板车号） + * @param sign_in_state：签到状态（0-缺卡，1-正常） + * @param punch_state：完工打卡状态（0-缺卡，1-完工） + * @return 返回打卡记录列表 + */ + List PunchClockListForCondition(@Param("users_id") String users_id, + @Param("port_area_id") String port_area_id, + @Param("biz_type") String biz_type, + @Param("keywords") String keywords, + @Param("approach_date_start") String approach_date_start, + @Param("approach_date_end") String approach_date_end, + @Param("sign_in_state") Integer sign_in_state, + @Param("punch_state") Integer punch_state); + + /** + * 导出指定ids的打卡记录 + * @param ids 打卡记录ids + * @return 返回打卡记录 + */ + List getPunchClockListExportByIds(@Param("list") List ids); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/StatisticsAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/StatisticsAdminMapper.java new file mode 100644 index 0000000..1074a55 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/StatisticsAdminMapper.java @@ -0,0 +1,165 @@ +package com.haitongauto.mapper.admin; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface StatisticsAdminMapper { + + /** + * 已预约车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回已预约车辆数 + */ + Integer getAppointmentedCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + + /** + * 取消预约车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回取消预约车辆数 + */ + Integer getAppointmentCancelCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 预约已签到车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回预约已签到车辆数 + */ + Integer getAppointmentSignInCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 完成打卡车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回完成打卡车辆数 + */ + Integer getPunchClockOverCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 指令已发送车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 指令已发送车辆数 + */ + Integer getInstructHavaSendCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 外贸出口卡车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回外贸出口卡车辆数 + */ + Integer getForeignTradeExportsCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 外贸进口卡车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回外贸进口卡车辆数 + */ + Integer getForeignTradeImportsCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 内贸出口卡车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回内贸出口卡车辆数 + */ + Integer getDomesticTradeExportCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 内贸进口卡车辆数 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 返回内贸进口卡车辆数 + */ + Integer getDomesticImportsExportCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 某进道口的辆数 + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @param gate_canal_in 道口号(进) + * @return 某进道口的辆数 + */ + Integer getInGateCanalCodeCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id, @Param("gate_canal_in") String gate_canal_in); + + /** + * 某出道口的辆数 + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @param gate_canal_out 道口号(进) + * @return 某出道口的辆数 + */ + Integer getOutGateCanalCodeCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id, @Param("gate_canal_out") String gate_canal_out); + + /** + * 自动进闸口板车数 + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 自动进闸口板车数 + */ + Integer getConventionalityInGateCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 人工抬杆进闸口板车数 + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 人工抬杆进闸口板车数 + */ + Integer getUnConventionalityInGateCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 待进港通行板车数 (已签到未进港的) + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 待进港通行板车数 (已签到未进港的) + */ + Integer getWellInGateCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 已进港板车数 (已进港但未完成-离港的) + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 已进港板车数 (已进港但未完成-离港的) + */ + Integer getHaveInGateCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + + /** + * 已离港板车数 (已进港但未完成-离港的) + * @param start_time 开始时间 + * @param end_time 结束时间 + * @param port_area_id 港区id + * @return 已离港板车数 (已进港但未完成-离港的) + */ + Integer getHavaOutGateCount(@Param("start_time") String start_time, @Param("end_time") String end_time, @Param("port_area_id") String port_area_id); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/UsersAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/UsersAdminMapper.java new file mode 100644 index 0000000..cf95dc7 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/UsersAdminMapper.java @@ -0,0 +1,22 @@ +package com.haitongauto.mapper.admin; +import com.haitongauto.models.pojo.Users; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UsersAdminMapper { + /** + * 根据用户ID、手机号、昵称、注册时间和用户状态查询小程序注册用户信息 + * @param keywords : 查询关键字（用户ID、手机号、昵称） + * @param registerDateStart ：注册日期 + * @param registerDateEnd ：注册日期 + * @param usersState：用户状态 + * @return 返回注册用户信息 + */ + List usersListForCondition(@Param("keywords") String keywords, + @Param("registerDateStart") String registerDateStart, + @Param("registerDateEnd") String registerDateEnd, + @Param("usersState") Integer usersState); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/AnnouncementMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/AnnouncementMapper.java new file mode 100644 index 0000000..2156790 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/AnnouncementMapper.java @@ -0,0 +1,20 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Announcement; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 公告 + * + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface AnnouncementMapper extends DataBaseMapper { + + //---BaseMapper继承自DataBaseMapper + List getListBySort(@Param("sort") Integer sort,@Param("keyWords") String keyWords); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentDetailMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentDetailMapper.java new file mode 100644 index 0000000..ba2b7a5 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentDetailMapper.java @@ -0,0 +1,41 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.dto.Pages; +import com.haitongauto.models.pojo.AppointmentDetail; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 预约详细(详情) + * + * @author : kchh + * @date 2023-7-9 + */ +@Mapper +public interface AppointmentDetailMapper extends DataBaseMapper { + /** + * 根据预约id查询预约详情 + * + * @param appointment_id 预约id + * @return 返回预约详情 + */ + List getAppointmentDetailListByAppointmentId(@Param("appointment_id") String appointment_id); + + AppointmentDetail getAppointmentDetailByGoodVin(@Param("vin") String vin); + + List getAppointmentDetailByAppointmentIdList(@Param("list") List list); + + int deleteAppointmentDetailByAppointmentId(@Param("appointment_id") String appointment_id); + + List getAppointmentDetailListByGoodVinList(@Param("list") List list); + + /* 检查指定的VIN是否存在预约中 */ + //Integer getVinAtAppointmentDetail(@Param("vin") String vin); + + List getAppointmentDetailListByVinList(@Param("list") List list); + + List getAppointmentDetailsByConditionf(@Param("appointment_id") String appointment_id, @Param("ship_id") String ship_id, @Param("brand_id") String brand_id); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java new file mode 100644 index 0000000..724fc88 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java @@ -0,0 +1,106 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Appointment; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +/** + * 预约信息 + * + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface AppointmentMapper extends DataBaseMapper { + /** + * 根据车牌号查询预约信息列表 + * + * @param truck_number 车牌号 + * @return 返回预约信息列表 + */ + List getListByTruckName(@Param("truck_number") String truck_number); + + /** + * 根据车牌号获取该用户的当前预约(出闸口专用) + * + * @param truck_number 车牌号 + * @return 返回当前预约 + */ + Appointment getAppointmentByTruckNoForOutGate(@Param("truck_number") String truck_number); + + + /** + * 根据truck_vin查询预约信息列表 + * + * @param truck_vin truck_vin + * @return 返回预约信息列表 + */ + List getAppointmentByVin(@Param("truck_vin") String truck_vin); + + /** + * 查询用户当天在外高桥港区未离港的预约 + * + * @param users_id 用户id + * @param port_area_id 港区id + * @param approach_date 进港日期 + * @return 返回预约信息 + */ + Appointment getAppointmentByUserIdAndPortAreaIdAndApproachDate(@Param("users_id") String users_id, @Param("port_area_id") String port_area_id, @Param("approach_date") String approach_date); + + List getAppointmentListByCondition(@Param("truck_number") String truck_number, @Param("ship_id") String ship_id, @Param("instruct_state") Integer instruct_state, @Param("brand_name") String brand_name); + + List getAppointmentByIds(@Param("list") List list); + + /** + * 批量修改指令 + * + * @param list list + * @return aaa + */ + int batchUpdateAppointmentInstructState(@Param("list") List list); + + + /** + * 结合预约明细信息，条件查询预约信息 + * @param startDate 开始时间(必填项) + * @param endDate 结束时间(必填项) + * @param portAreaId 港区id(必填项) + * @param truckNumber 板车号(非必填项) + * @param shipId 船舶id(非必填项) + * @param instructState 指令状态(非必填项) + * @param brandId 品牌id(非必填项) + * @return + */ + List getAppointmentListByConditionf(@Param("startDate") LocalDateTime startDate, + @Param("endDate") LocalDateTime endDate, + @Param("portAreaId") String portAreaId, + @Param("truckNumber") String truckNumber, + @Param("shipId") String shipId, + @Param("instructState") Integer instructState, + @Param("brandId") String brandId); + + + Integer updateAppointmentPlateScanTime(@Param("appointment_id") String appointment_id); + + /** + * 获得某一港区有效预约id集合 + * @param port_area_id + * @return + */ + List getIdListNoInEn(@Param("port_area_id") String port_area_id); + + /** + * 获得所有有效预约id集合 + * @return + */ + List getIdListNoInEnNew(); + + + Appointment getAppointmentByTruckName(@Param("truck_number") String truck_number); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/DataBaseMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/DataBaseMapper.java new file mode 100644 index 0000000..7125a06 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/DataBaseMapper.java @@ -0,0 +1,52 @@ +package com.haitongauto.mapper.base; + +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface DataBaseMapper { + + /** + * 插入 + * + * @param t 表数据实体 + * @return 返回受影响记录条数 + */ + String insert(T t); + + /** + * 逻辑删除 + * + * @param id 记录id + * @return 返回受影响记录条数 + */ + Integer logicDel(@Param("id") String id); + + + /** + * 删除 + * @param id 记录id + * @return 返回受影响记录条数 + */ + Integer delete(@Param("id") String id); + + /** + * 修改 + * @param t 表数据实体 + * @return 返回受影响记录条数 + */ + Integer update(T t); + + /** + * 根据记录id查询一条数据记录 + * @param id 记录id + * @return 返回表数据实体 + */ + T getById(@Param("id") String id); + + /** + * 查询所有数据记录 + * @return 返回所有数据列表 + */ + List getList(); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/DepartureDetailMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/DepartureDetailMapper.java new file mode 100644 index 0000000..621f7b3 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/DepartureDetailMapper.java @@ -0,0 +1,12 @@ +package com.haitongauto.mapper.base; +import com.haitongauto.models.pojo.DepartureDetail; +import org.apache.ibatis.annotations.Mapper; + +/** + * 提车明细 + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface DepartureDetailMapper extends DataBaseMapper { +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/DepartureVehicleMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/DepartureVehicleMapper.java new file mode 100644 index 0000000..61e09e5 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/DepartureVehicleMapper.java @@ -0,0 +1,12 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.DepartureVehicle; +import org.apache.ibatis.annotations.Mapper; +/** + * 提车信息 + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface DepartureVehicleMapper extends DataBaseMapper { +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/DicMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/DicMapper.java new file mode 100644 index 0000000..dd7d77f --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/DicMapper.java @@ -0,0 +1,27 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Dic; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 通用数据字典表（数据源自RTOS） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 APP_CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备 件 MACHINE_TYPE + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface DicMapper extends DataBaseMapper{ + /** + * 根据字典分类参数获取字典数据列表 + * @param dic_sort：字典分类参数，如运输方式的 dic_sort=TRANSPORT_TYPE + * @return 返回字典数据列表 + */ + List getDicListByDicSort(@Param("dic_sort") String dic_sort); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/EntryInstructMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/EntryInstructMapper.java new file mode 100644 index 0000000..12b2a59 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/EntryInstructMapper.java @@ -0,0 +1,13 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.EntryInstruct; +import org.apache.ibatis.annotations.Mapper; + +/** + * 进港指令 + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface EntryInstructMapper extends DataBaseMapper{ +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/FeedbackMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/FeedbackMapper.java new file mode 100644 index 0000000..2bfc1a0 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/FeedbackMapper.java @@ -0,0 +1,14 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Feedback; +import org.apache.ibatis.annotations.Mapper; + +/** + * 意见反馈 + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface FeedbackMapper extends DataBaseMapper { + //---BaseMapper继承自DataBaseMapper +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/LoginLogMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/LoginLogMapper.java new file mode 100644 index 0000000..6389669 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/LoginLogMapper.java @@ -0,0 +1,11 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.LoginLog; +/** + * 用户登录日志 + * @author : kchh + * @date : 2023-7-9 + */ +public interface LoginLogMapper extends DataBaseMapper{ + //---LoginLogMapper继承自DataBaseMapper +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/MessageMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/MessageMapper.java new file mode 100644 index 0000000..dc85911 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/MessageMapper.java @@ -0,0 +1,29 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Message; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface MessageMapper extends DataBaseMapper { + + Integer sumUnread(@Param("list") List truckNumberList); + + List getMessageListByTruckNumber(@Param("list") List truckNumberList); + + /** + * @return 返回结果 + */ + List getUnReadMessageListByTruckNumber(@Param("list") List truckNumberList); + + /** + * 获得车辆最新消息 + * + * @param type 收车/发车 + * @param biz_id biz_id + * @return 返回消息 + */ + Message getLastMessageByTypeAndBizId(@Param("type") Integer type, @Param("biz_id") String biz_id); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/NoviceIntroductionMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/NoviceIntroductionMapper.java new file mode 100644 index 0000000..f310347 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/NoviceIntroductionMapper.java @@ -0,0 +1,13 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.NoviceIntroduction; +import org.apache.ibatis.annotations.Mapper; +/** + * 新手攻略（小程序/客服平台/生产APP操作指南） + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface NoviceIntroductionMapper extends DataBaseMapper { + //---BaseMapper继承自DataBaseMapper +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/PortAreasMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/PortAreasMapper.java new file mode 100644 index 0000000..ff0400c --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/PortAreasMapper.java @@ -0,0 +1,14 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.PortArea; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +/** + * 港区表（数据源自RTOS，请求时返回200，则使用数据，并更新表；否则，直接使用本表） + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface PortAreasMapper extends DataBaseMapper { + //---BaseMapper继承自DataReqMapper +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/PunchClockMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/PunchClockMapper.java new file mode 100644 index 0000000..bbd7114 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/PunchClockMapper.java @@ -0,0 +1,32 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.PunchClock; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * （签到/完成）打卡信息 + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface PunchClockMapper extends DataBaseMapper { + /** + * 根据预约id查询打卡记录 + * @param appointment_id 预约id + * @return 返回打卡记录 + */ + PunchClock getPunchClockByAppointmentId(@Param("appointment_id") String appointment_id ); + + /** + * 查询多个预约id 的打卡记录 + * @param appointmentIdList 预约id的集合 + * @return 返回打卡记录列表 + */ + List getPunchClockByAppointmentIdList(@Param("list") List appointmentIdList); + + + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/ReceivingDetailMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/ReceivingDetailMapper.java new file mode 100644 index 0000000..eab99f9 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/ReceivingDetailMapper.java @@ -0,0 +1,13 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.ReceivingDetail; +import org.apache.ibatis.annotations.Mapper; + +/** + * 收车明细（数据源自RTOS） + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface ReceivingDetailMapper extends DataBaseMapper{ +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/ReceivingVehicleMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/ReceivingVehicleMapper.java new file mode 100644 index 0000000..e6aa7eb --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/ReceivingVehicleMapper.java @@ -0,0 +1,20 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.ReceivingVehicle; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 收车信息（数据源自RTOS） + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface ReceivingVehicleMapper extends DataBaseMapper{ + /** + * 根据凭证编号获取凭证id + * @param voucher_number 凭证编号 + * @return 返回凭证id + */ + ReceivingVehicle getIdByVoucherNo(@Param("voucher_number") String voucher_number); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/RequesterMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/RequesterMapper.java new file mode 100644 index 0000000..f862661 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/RequesterMapper.java @@ -0,0 +1,16 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Requester; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 请求第三方接口 + * @author : kchh + * @date 2023-7-9 + */ +@Mapper +public interface RequesterMapper extends DataBaseMapper { + //---BaseMapper继承自DataBaseMapper + Requester getRequesterForType(@Param("request_type") Integer request_type); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/ServiceConfigMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/ServiceConfigMapper.java new file mode 100644 index 0000000..7947f9b --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/ServiceConfigMapper.java @@ -0,0 +1,14 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.ServiceConfig; + +import org.apache.ibatis.annotations.Mapper; + +/** + * 服务配置 + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface ServiceConfigMapper extends DataBaseMapper { +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/TableHeadMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/TableHeadMapper.java new file mode 100644 index 0000000..efeca83 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/TableHeadMapper.java @@ -0,0 +1,20 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.TableHead; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 自定义表头（后台管理客户端可自定义勾选表头显示字段） + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface TableHeadMapper extends DataBaseMapper{ + /** + * 根据表编号 + * @param table_code 表编号 + * @return 返回动态表头 + */ + TableHead queryByCode( @Param("table_code") String table_code); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/TruckManagementMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/TruckManagementMapper.java new file mode 100644 index 0000000..5ebdef7 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/TruckManagementMapper.java @@ -0,0 +1,12 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.TruckManagement; +import org.apache.ibatis.annotations.Mapper; +/** + * 板车管理 + * @author :kchh + * @date : 2023-7-9 + */ +@Mapper +public interface TruckManagementMapper extends DataBaseMapper { +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/TruckMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/TruckMapper.java new file mode 100644 index 0000000..c5df786 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/TruckMapper.java @@ -0,0 +1,34 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Truck; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 板车信息（用户扫描行驶证获取） + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface TruckMapper extends DataBaseMapper{ + Integer updateEX(Truck truck); + + /** + * 根据用户id查询板车信息 + * @param users_id：用户id + * @return 返回板车信息 + */ + Truck getTruckByUsersId(@Param("users_id")String users_id); + + /** + * 根据用户id查询板车信息 + * @param wx_openid：用户id + * @return 返回板车信息 + */ + Truck getTruckByOpenId(@Param("wx_openid")String wx_openid); + + Truck getPalletTruckByTruckNo(@Param("truck_number")String truck_number); + + Integer deleteTruckByUsersId(@Param("users_id")String users_id); + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/UsersMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/UsersMapper.java new file mode 100644 index 0000000..7d81f34 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/base/UsersMapper.java @@ -0,0 +1,21 @@ +package com.haitongauto.mapper.base; + +import com.haitongauto.models.pojo.Users; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 用户（司机）信息 + * + * @author : kchh + * @date : 2023-7-9 + */ +@Mapper +public interface UsersMapper extends DataBaseMapper { + Users getByWxOpenid(@Param("wx_openid") String wx_openid); + + Users getByIdCode(@Param("id_code") String id_code); + + + +} \ No newline at end of file diff --git a/mapper/src/main/java/com/haitongauto/mapper/client/AppointmentExtendMapper.java b/mapper/src/main/java/com/haitongauto/mapper/client/AppointmentExtendMapper.java new file mode 100644 index 0000000..5062c3d --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/client/AppointmentExtendMapper.java @@ -0,0 +1,107 @@ +package com.haitongauto.mapper.client; + +import com.haitongauto.models.pojo.Appointment; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.util.List; + +/** + * 预约类扩展Mapper + */ +@Mapper +public interface AppointmentExtendMapper { + /** + * 获取用户指定状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已出港，4-已取消，9-异常）数据 + * + * @param users_id 用户id + * @param appointment_state 预约状态 + * @return 返回用户指定状态的预约信息列表 + */ + List getAppointmentListForAny(@Param("users_id") String users_id, @Param("appointment_state") Integer appointment_state); + + /** + * 我的预约信息列表 + * + * @param users_id 用户id + * @return 返回我的预约信息列表 + */ + List getMyAppointmentList(@Param("users_id") String users_id); + + /** + * 根据预约日期查询我的预约信息 + * + * @param users_id 用户id + * @param approach_date 进港日期 + * @return 返回预约信息 + */ + List getMyAppointmentListForDate(@Param("users_id") String users_id, @Param("approach_date") LocalDate approach_date); + + /** + * 根据id_list获取我的预约列表 + * + * @param users_id 用户id + * @param id_list 预约id列表 + * @return 返回获取我的预约列表 + */ + List getMyAppointmentListForIdList(@Param("users_id") String users_id, @Param("id_list") List id_list); + + /** + * 获取指定用户预约未完成的数据(备注：appointment_state: 1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已出港，4-已取消，9-异常)数据 + * + * @param users_id 用户id + * @return 返回指定用户预约未完成的数据 + */ + Appointment getActiveAppointment(@Param("users_id") String users_id); + + Appointment getActiveAppointmentNew(@Param("truck_number") String truck_number); + + Appointment getActiveAppointmentByTruckNumber(@Param("truck_number") String truck_number); + + /** + * 取消预约 + * + * @param cancel_time 取消时间 + * @param appointment_id 预约id + * @return 返回执行结果 + */ + Integer cancelAppointment(@Param("cancel_time") String cancel_time, @Param("appointment_id") String appointment_id); + + + Integer cancelAppointmentDetails(@Param("appointment_id") String appointment_id); + + /** + * 获取我的当前预约 + * + * @param users_id 用户id + * @return 返回我的当前预约 + */ + Appointment getMyAppointment(@Param("users_id") String users_id); + + /** + * 模糊查询（船名、航次）,返回符合条件的预约记录明细Id列表 + * + * @param keywords 查询关键字（船名、航次） + * @return 返回预约id列表 + */ + List getAppointmentDetailListForKeyWords(@Param("keywords") String keywords); + + /** + * 查询指定用户和指定车辆是否存在已预约但未完成预约信息 + * + * @param users_id 用户id + * @param truck_number 车牌号 + * @return 返回指定用户和指定车辆是否存在已预约但未完成预约信息 + */ + Appointment getActiveAppointmentByUserAndTruck(@Param("users_id") String users_id, @Param("truck_number") String truck_number); + + /** + * @param keywords 查询关键字（船名、航次） + * @param approach_date 进场日期 + * @return 返回预约列表 + */ + List getAppointmentListForCondition(@Param("users_id") String users_id, @Param("keywords") String keywords, @Param("approach_date") String approach_date); + + +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/client/OtherExtendMapper.java b/mapper/src/main/java/com/haitongauto/mapper/client/OtherExtendMapper.java new file mode 100644 index 0000000..b13ca4f --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/client/OtherExtendMapper.java @@ -0,0 +1,54 @@ +package com.haitongauto.mapper.client; + +import com.haitongauto.models.pojo.Requester; +import com.haitongauto.models.pojo.Announcement; +import com.haitongauto.models.pojo.EntryInstruct; +import com.haitongauto.models.pojo.Users; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OtherExtendMapper { + /** + * 读取最近10条公告数据 + * @return 返回最近10条公告数据 + */ + List getLastAnnouncementsList(); + + /** + * 获取发送给指定用户的(最近10条)指令信息 + * @param users_id 用户id + * @return 返回指定发送给指定用户的(最近10条)指令信息 + */ + List getEntryInstructionsForUsers(@Param("users_id") String users_id); + + /*** + * 根据请求类型获取一条请求配置数据 + * @param request_type 请求类型 + * @return 返回配置数据 + */ + Requester getRequesterForType(@Param("request_type") Integer request_type); + + /** + * 根据配置编号code代码获取配置结果数据 + * @param config_code 配置编码 + * @return 返回配置结果数据 + */ + String getServiceConfigForCode(@Param("config_code") String config_code); + + /** + * 根据用户的小程序 openid 获取用户在数据库里的数据 + * @param wx_openid wx_openid + * @return 返回用户在数据库里的数据 + */ + Users getUsersForOpenId(@Param("wx_openid") String wx_openid); + + /** + * 根据板车号查用户信息 + * @param truck_number 车牌号 + * @return 返回查用户信息 + */ + Users getUsersByTruckNo(@Param("truck_number") String truck_number); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/client/PunchClockExtendMapper.java b/mapper/src/main/java/com/haitongauto/mapper/client/PunchClockExtendMapper.java new file mode 100644 index 0000000..61f7457 --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/client/PunchClockExtendMapper.java @@ -0,0 +1,67 @@ +package com.haitongauto.mapper.client; + +import com.haitongauto.models.pojo.PunchClock; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.util.Date; +import java.util.List; + +/** + * 打卡类扩展Mapper + */ +@Mapper +public interface PunchClockExtendMapper { + /** + * 根据预约Id获取获取打卡记录 + * + * @param appointment_id 预约id + * @return 返回打卡记录 + */ + PunchClock getPunchClockForAppintementId(@Param("appointment_id") String appointment_id); + + /** + * 获取指定日期的最后一个签到打卡编号 + * + * @param date 指定日期 + * @return 返回最后一个签到打卡编号 + */ + String getLastQueueNumber(@Param("date") Date date, @Param("port_area_id") String port_area_id); + + /** + * 查询指定司机某一天（指定日期）的打卡记录 + * + * @param date 指定日期 + * @param users_id 用户id + * @return 返回打卡记录 + */ + List getPunchClockForDate(@Param("date") String date, @Param("users_id") String users_id); + + /** + * 查询指定司机某年某月的打卡记录 + * + * @param users_id 用户id + * @return 返回打卡记录 + */ + List getPunchClockForYM(@Param("users_id") String users_id, @Param("year") Integer year, @Param("month") Integer month); + + + /** + * 获取指定预约的签到打卡排队序号 + * + * @param appointment_id 预约id + * @return 返回指定预约的签到打卡排队序号 + */ + String getQueueNumberForIdDate(@Param("appointment_id") String appointment_id); + + /** + * 获取当前排队前面还剩多少车辆未进港 + * + * @param approach_date 进场日期 + * @param port_area_id 港区id + * @param queue_number 排队号 + * @return 返回前排队前面还剩多少车辆未进港的数量 + */ + Integer getNumberBeforeMe(@Param("approach_date") String approach_date, @Param("port_area_id") String port_area_id, @Param("queue_number") String queue_number); +} diff --git a/mapper/src/main/java/com/haitongauto/mapper/client/TruckExtendMapper.java b/mapper/src/main/java/com/haitongauto/mapper/client/TruckExtendMapper.java new file mode 100644 index 0000000..012ccbe --- /dev/null +++ b/mapper/src/main/java/com/haitongauto/mapper/client/TruckExtendMapper.java @@ -0,0 +1,56 @@ +package com.haitongauto.mapper.client; + +import com.haitongauto.models.pojo.Truck; +import com.haitongauto.models.pojo.Users; +import com.haitongauto.models.pojo.TruckManagement; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.poi.ss.formula.functions.T; + +import java.util.List; + +@Mapper +public interface TruckExtendMapper{ + /** + * 根据用户Id查车牌号 + * @param users_id 用户id + * @return 返回车牌号 + */ + Truck getTruckNumberForUid(@Param("users_id") String users_id); + + /** + * 获取指定用户的板车信息 + * @param users_id 用户id + * @return 返回指定用户的板车信息 + */ + List getPalletTruckForUsers(@Param("users_id") String users_id); + + /** + * 根据车牌号查车辆信息 + * @param truck_number 车牌号 + * @return 返回车辆信息 + */ + Truck getPalletTruckForNumber(@Param("truck_number") String truck_number); + + /** + * 将指定用户的板车状态全部置为0，除非被列入黑名单的车辆 + * @param users_id 用户id + * @return 返回执行结果 + */ + Integer setTruckSateToGeneral(@Param("users_id") String users_id); + + /** + * 我的车辆黑名单信息 truck_management + * @param users_id 用户id + * @return 返回我的车辆黑名单信息 + */ + List getMyTruckManagement(@Param("users_id") String users_id); + + /** + * 根据车牌号查用户信息 + * @param truck_number 车牌号 + * @return 返回用户信息 + */ + // + Users getUidByTruckNo(String truck_number); +} diff --git a/mapper/src/main/resources/mappers/admin/AnnouncementAdminMapper.xml b/mapper/src/main/resources/mappers/admin/AnnouncementAdminMapper.xml new file mode 100644 index 0000000..3ad83e8 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/AnnouncementAdminMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/admin/AppointmentAdminMapper.xml b/mapper/src/main/resources/mappers/admin/AppointmentAdminMapper.xml new file mode 100644 index 0000000..86aba43 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/AppointmentAdminMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/admin/FeedbackAdminMapper.xml b/mapper/src/main/resources/mappers/admin/FeedbackAdminMapper.xml new file mode 100644 index 0000000..64c1dc4 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/FeedbackAdminMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/admin/NoviceIntroductionAdminMapper.xml b/mapper/src/main/resources/mappers/admin/NoviceIntroductionAdminMapper.xml new file mode 100644 index 0000000..51af3e7 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/NoviceIntroductionAdminMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/admin/PunchClockAdminMapper.xml b/mapper/src/main/resources/mappers/admin/PunchClockAdminMapper.xml new file mode 100644 index 0000000..1299b51 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/PunchClockAdminMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/admin/StatisticsAdminMapper.xml b/mapper/src/main/resources/mappers/admin/StatisticsAdminMapper.xml new file mode 100644 index 0000000..381f800 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/StatisticsAdminMapper.xml @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/admin/UsersAdminMapper.xml b/mapper/src/main/resources/mappers/admin/UsersAdminMapper.xml new file mode 100644 index 0000000..a262895 --- /dev/null +++ b/mapper/src/main/resources/mappers/admin/UsersAdminMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/AnnouncementMapper.xml b/mapper/src/main/resources/mappers/base/AnnouncementMapper.xml new file mode 100644 index 0000000..ae80dc4 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/AnnouncementMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + update applet_announcement set is_del=1 where id=#{id} + + + + delete from applet_announcement where id=#{id} + + + + update applet_announcement + + + id = #{id}, + + + sort = #{sort}, + + + title = #{title}, + + + abstracts = #{abstracts}, + + + announcement = #{announcement}, + + + announcement_text = #{announcement_text}, + + + author = #{author}, + + + reading_volume = #{reading_volume}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/AppointmentDetailMapper.xml b/mapper/src/main/resources/mappers/base/AppointmentDetailMapper.xml new file mode 100644 index 0000000..3298762 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/AppointmentDetailMapper.xml @@ -0,0 +1,174 @@ + + + + + + + + + update applet_appointment_detail set is_del=1 where id=#{id} + + + + delete from applet_appointment_detail + where id=#{id} + + + + update applet_appointment_detail + + + id = #{id}, + + + appointment_id = #{appointment_id}, + + + ship_id = #{ship_id}, + + + ship_name = #{ship_name}, + + + voy_number = #{voy_number}, + + + destination_port = #{destination_port}, + + + destination_port_id = #{destination_port_id}, + + + brand_id = #{brand_id}, + + + brand_name = #{brand_name}, + + + vin = #{vin}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + + + + + + + delete from applet_appointment_detail + where appointment_id=#{appointment_id} + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/AppointmentMapper.xml b/mapper/src/main/resources/mappers/base/AppointmentMapper.xml new file mode 100644 index 0000000..dc54f9b --- /dev/null +++ b/mapper/src/main/resources/mappers/base/AppointmentMapper.xml @@ -0,0 +1,370 @@ + + + + + + + + + update applet_appointment set is_del=1 where id=#{id} + + + + delete from applet_appointment where id=#{id} + + + + update applet_appointment + + + id = #{id}, + + + users_id = #{users_id}, + + + transport_type = #{transport_type}, + + + truck_number = #{truck_number}, + + + tel_number = #{tel_number}, + + + id_code = #{id_code}, + + + truck_vin = #{truck_vin}, + + + vehicle_weight = #{vehicle_weight}, + + + vehicle_frame_weight = #{vehicle_frame_weight}, + + + driving_license = #{driving_license}, + + + approach_date = #{approach_date}::date, + + + port_area_id = #{port_area_id}, + + + biz_type = #{biz_type}, + + + enter_type = #{enter_type}, + + + goods_type = #{goods_type}, + + + goods_quantity = #{goods_quantity}, + + + appointment_state = #{appointment_state}, + + + cancel_time = #{cancel_time}::timestamp, + + + appointment_type = #{appointment_type}, + + + is_del = #{is_del}, + + + yard = #{yard}, + + + yard_name = #{yard_name}, + + + gate_canal_in = #{gate_canal_in}, + + + gate_canal_out = #{gate_canal_out}, + + + gate_canal_in_time= #{gate_canal_in_time}::timestamp, + + + gate_canal_out_time=#{gate_canal_out_time}::timestamp, + + + instruct_state = #{instruct_state}, + + + send_time =# {send_time}::timestamp, + + + sender = #{sender}, + + + check_in_time = #{check_in_time}::timestamp, + + + check_over_time = #{check_over_time}::timestamp, + + + plate_scan_time = #{plate_scan_time}::timestamp, + + + is_conventionality_in = #{is_conventionality_in}, + + + push_ids = #{push_ids}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + update applet_appointment + + + id = #{item.id}, + + + yard = #{item.yard}, + + + sender = #{item.sender}, + + + yard_name = #{item.yard_name}, + + + gate_canal_in = #{item.gate_canal_in}, + + + instruct_state = #{item.instruct_state}, + + send_time =current_timestamp, + update_time = current_timestamp + + where id = #{item.id} + + + + + + update applet_appointment + + plate_scan_time = current_timestamp + + where id = #{appointment_id} + + + + + + + + + + + + + + diff --git a/mapper/src/main/resources/mappers/base/DepartureDetailMapper.xml b/mapper/src/main/resources/mappers/base/DepartureDetailMapper.xml new file mode 100644 index 0000000..3f9e3ea --- /dev/null +++ b/mapper/src/main/resources/mappers/base/DepartureDetailMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + update applet_departure_detail set is_del=1 where id=#{id} + + + + delete from applet_departure_detail where id=#{id} + + + + update applet_departure_detail + + + id = #{id}, + + + applet_departure_vehicle_id = #{applet_departure_vehicle_id}, + + + receiving_unit = #{receiving_unit}, + + + ship_name = #{ship_name}, + + + voy_number = #{voy_number}, + + + customs_clearance_nature = #{customs_clearance_nature}, + + + lading_no = #{lading_no}, + + + customs_declaration_no = #{customs_declaration_no}, + + + cargo_name = #{cargo_name}, + + + cargo_quantity = #{cargo_quantity}, + + + remarks = #{remarks}, + + + vin_list = #{vin_list}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/DepartureVehicleMapper.xml b/mapper/src/main/resources/mappers/base/DepartureVehicleMapper.xml new file mode 100644 index 0000000..03f45f2 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/DepartureVehicleMapper.xml @@ -0,0 +1,175 @@ + + + + + + + + + update applet_departure_vehicle set is_del=1 where id=#{id} + + + + delete from applet_departure_vehicle where id=#{id} + + + + update applet_departure_vehicle + + + id = #{id}, + + + voucher_number = #{voucher_number}, + + + users_id = #{users_id}, + + + users_name = #{users_name}, + + + tel_number = #{tel_number}, + + + operators = #{operators}, + + + phone_number = #{phone_number}, + + + truck_number = #{truck_number}, + + + trade_type = #{trade_type}, + + + cargo_type = #{cargo_type}, + + + cargo_quantity = #{cargo_quantity}, + + + delivery_time = #{delivery_time}::timestamp, + + + checker = #{checker}, + + + check_status = #{check_status}, + + + check_time = #{check_time}::timestamp, + + + remarks = #{remarks}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/DicMapper.xml b/mapper/src/main/resources/mappers/base/DicMapper.xml new file mode 100644 index 0000000..d4df840 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/DicMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + update applet_dic set is_del=1 where id=#{id} + + + + delete from applet_dic where id=#{id} + + + + update applet_dic + + + id = #{id}, + + + dic_sort = #{dic_sort}, + + + description = #{description}, + + + content = #{content}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/EntryInstructMapper.xml b/mapper/src/main/resources/mappers/base/EntryInstructMapper.xml new file mode 100644 index 0000000..f078833 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/EntryInstructMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + update applet_entry_instruct set is_del=1 where id=#{id} + + + + delete from applet_entry_instruct where id=#{id} + + + + update applet_entry_instruct + + + id = #{id}, + + + appointment_id = #{appointment_id}, + + + users_id = #{users_id}, + + + users_name = #{users_name}, + + + truck_number = #{truck_number}, + + + yard_name = #{yard_name}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/FeedbackMapper.xml b/mapper/src/main/resources/mappers/base/FeedbackMapper.xml new file mode 100644 index 0000000..612c4eb --- /dev/null +++ b/mapper/src/main/resources/mappers/base/FeedbackMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + update applet_feedback set is_del=1 where id=#{id} + + + + delete from applet_feedback where id=#{id} + + + + update applet_feedback + + + id = #{id}, + + + users_id = #{users_id}, + + + nike_name = #{nike_name}, + + + feedback_info = #{feedback_info}, + + + pictures = #{pictures}, + + + tel_number = #{tel_number}, + + + contact_info = #{contact_info}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/LoginLogMapper.xml b/mapper/src/main/resources/mappers/base/LoginLogMapper.xml new file mode 100644 index 0000000..ae18ad4 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/LoginLogMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/MessageMapper.xml b/mapper/src/main/resources/mappers/base/MessageMapper.xml new file mode 100644 index 0000000..3a5bf81 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/MessageMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + update applet_message set is_del=1 where id=#{id} + + + + delete from applet_message where id=#{id} + + + + update applet_message + + + id = #{id}, + + + type = #{type}, + + + type_content = #{type_content}, + + + + biz_id = #{biz_id}, + + + prc_id = #{prc_id}, + + + truck_number = #{truck_number}, + + + is_read = #{is_read}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp, + + where id=#{id} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/NoviceIntroductionMapper.xml b/mapper/src/main/resources/mappers/base/NoviceIntroductionMapper.xml new file mode 100644 index 0000000..f24c70b --- /dev/null +++ b/mapper/src/main/resources/mappers/base/NoviceIntroductionMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + update applet_novice_introduction set is_del=1 where id=#{id} + + + + delete from applet_novice_introduction where id=#{id} + + + + update applet_novice_introduction + + + id = #{id}, + + + sort = #{sort}, + + + title = #{title}, + + + content = #{content}, + + + sequence_number = #{sequence_number}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/PortAreasMapper.xml b/mapper/src/main/resources/mappers/base/PortAreasMapper.xml new file mode 100644 index 0000000..f1cf423 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/PortAreasMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + update applet_port_areas set is_del=1 where id=#{id} + + + + delete from applet_port_areas where id=#{id} + + + + update applet_port_areas + + + id = #{id}, + + + port_area_name = #{port_area_name}, + + + port_area_name_en = #{port_area_name_en}, + + + port_area_code = #{port_area_code}, + + + port_area_address = #{port_area_address}, + + + area_center_poi = #{area_center_poi}, + + + punch_range = #{punch_range}, + + + is_enable = #{is_enable}, + + + order_items = #{order_items}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/PunchClockMapper.xml b/mapper/src/main/resources/mappers/base/PunchClockMapper.xml new file mode 100644 index 0000000..fee906e --- /dev/null +++ b/mapper/src/main/resources/mappers/base/PunchClockMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + update applet_punch_clock set is_del=1 where id=#{id} + + + + delete from applet_punch_clock where id=#{id} + + + + update applet_punch_clock + + + id = #{id}, + + + users_id = #{users_id}, + + + appointment_id = #{appointment_id}, + + + biz_type = #{biz_type}, + + + queue_number = #{queue_number}, + + + start_time = #{start_time}::timestamp, + + + over_time = #{over_time}::timestamp, + + + port_area_id = #{port_area_id}, + + + punch_address = #{punch_address}, + + + over_address = #{over_address}, + + + punch_clock_type = #{punch_clock_type}, + + + punch_clock_poi = #{punch_clock_poi}, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/ReceivingDetailMapper.xml b/mapper/src/main/resources/mappers/base/ReceivingDetailMapper.xml new file mode 100644 index 0000000..2a96603 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/ReceivingDetailMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + update applet_receiving_detail set is_del=1 where id=#{id} + + + + delete from applet_receiving_detail where id=#{id} + + + + update applet_receiving_detail + + + id = #{id}, + + + applet_receiving_vehicle_id = #{applet_receiving_vehicle_id}, + + + ship_name = #{ship_name}, + + + brand = #{brand}, + + + port_name = #{port_name}, + + + vin_list = #{vin_list}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/ReceivingVehicleMapper.xml b/mapper/src/main/resources/mappers/base/ReceivingVehicleMapper.xml new file mode 100644 index 0000000..dd1e8e5 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/ReceivingVehicleMapper.xml @@ -0,0 +1,153 @@ + + + + + + + + + update applet_receiving_vehicle set is_del=1 where id=#{id} + + + + delete from applet_receiving_vehicle where id=#{id} + + + + update applet_receiving_vehicle + + + id = #{id}, + + + voucher_number = #{voucher_number}, + + + users_id = #{users_id}, + + + users_name = #{users_name}, + + + tel_number = #{tel_number}, + + + operators = #{operators}, + + + phone_number = #{phone_number}, + + + numbers = #{numbers}, + + + number_type = #{number_type}, + + + trade_type = #{trade_type}, + + + cargo_type = #{cargo_type}, + + + cargo_quantity = #{cargo_quantity}, + + + collect_time = #{collect_time}::timestamp, + + + checker = #{checker}, + + + check_status = #{check_status}, + + + check_time = #{check_time}::timestamp, + + + remarks = #{remarks}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/RequesterMapper.xml b/mapper/src/main/resources/mappers/base/RequesterMapper.xml new file mode 100644 index 0000000..0f7e2e5 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/RequesterMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + update applet_requester set is_del=1 where id=#{id} + + + + delete from applet_requester where id=#{id} + + + + update applet_requester + + + id = #{id}, + + + url = #{url}, + + + param_map = #{param_map}, + + + request_type = #{request_type}, + + + type_description = #{type_description}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp, + + where id = #{id} + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/ServiceConfigMapper.xml b/mapper/src/main/resources/mappers/base/ServiceConfigMapper.xml new file mode 100644 index 0000000..85ca82a --- /dev/null +++ b/mapper/src/main/resources/mappers/base/ServiceConfigMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + update applet_service_config set is_del=1 where id=#{id} + + + + delete from applet_service_config where id=#{id} + + + + update applet_service_config + + + id = #{id}, + + + config_name = #{config_name}, + + + config_code = #{config_code}, + + + config_content = #{config_content}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/TableHeadMapper.xml b/mapper/src/main/resources/mappers/base/TableHeadMapper.xml new file mode 100644 index 0000000..3119ea4 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/TableHeadMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + update applet_table_head + set is_del=1 + where id=#{id} + + + + delete from applet_table_head where id=#{id} + + + + update applet_table_head + + + id = #{id}, + + + table_name = #{table_name}, + + + table_code = #{table_code}, + + + head_jason = #{head_jason}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/TruckManagementMapper.xml b/mapper/src/main/resources/mappers/base/TruckManagementMapper.xml new file mode 100644 index 0000000..e55ee46 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/TruckManagementMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + update applet_truck_management set is_del=1 where id=#{id} + + + + delete from applet_truck_management where id=#{id} + + + + update applet_truck_management + + + id = #{id}, + + + users_id = #{users_id}, + + + truck_number = #{truck_number}, + + + cause = #{cause}, + + + drivers_name = #{drivers_name}, + + + drivers_phone = #{drivers_phone}, + + + administrators_name = #{administrators_name}, + + + administrators_phone = #{administrators_phone}, + + + enter_time = #{enter_time}::timestamp, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/TruckMapper.xml b/mapper/src/main/resources/mappers/base/TruckMapper.xml new file mode 100644 index 0000000..db6a874 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/TruckMapper.xml @@ -0,0 +1,235 @@ + + + + + + + + + + update applet_truck set is_del=1 where id=#{id} + + + + delete from applet_truck where id=#{id} + + + delete from applet_truck where users_id=#{users_id} + + + + update applet_truck + + + id = #{id}, + + + wx_openid = #{wx_openid}, + + + users_id = #{users_id}, + + + truck_number = #{truck_number}, + + + driving_license_id = #{driving_license_id}, + + + tel_number = #{tel_number}, + + + head_frame_number = #{head_frame_number}, + + + vehicle_weight = #{vehicle_weight}, + + + vehicle_frame_weight = #{vehicle_frame_weight}, + + + driving_license = #{driving_license}, + + + truck_state = #{truck_state}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + update applet_truck + + + wx_openid = #{wx_openid}, + + + users_id = #{users_id}, + + + truck_number = #{truck_number}, + + + + driving_license_id = #{driving_license_id}, + + + driving_license_id ='', + + + + tel_number = #{tel_number}, + + + head_frame_number = #{head_frame_number}, + + + + vehicle_weight = #{vehicle_weight}, + + + vehicle_weight = null, + + + + + vehicle_frame_weight = #{vehicle_frame_weight}, + + + vehicle_frame_weight =null, + + + + + driving_license = #{driving_license}, + + + driving_license =null, + + + + truck_state = #{truck_state}, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/base/UsersMapper.xml b/mapper/src/main/resources/mappers/base/UsersMapper.xml new file mode 100644 index 0000000..bbbb655 --- /dev/null +++ b/mapper/src/main/resources/mappers/base/UsersMapper.xml @@ -0,0 +1,178 @@ + + + + + + + + + update applet_users set is_del=1 where id=#{id} + + + + delete from applet_users where id=#{id} + + + + update applet_users + + + id = #{id}, + + + access_token = #{access_token}, + + + access_token_rtos = #{access_token_rtos}, + + + users_name = #{users_name}, + + + wx_openid = #{wx_openid}, + + + wx_unionid = #{wx_unionid}, + + + wx_nick = #{wx_nick}, + + + wx_sex = #{wx_sex}, + + + wx_head_sculpture = #{wx_head_sculpture}, + + + tel_number = #{tel_number}, + + + id_code = #{id_code}, + + + users_state = #{users_state}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/client/AppointmentExtendMapper.xml b/mapper/src/main/resources/mappers/client/AppointmentExtendMapper.xml new file mode 100644 index 0000000..dd9f30b --- /dev/null +++ b/mapper/src/main/resources/mappers/client/AppointmentExtendMapper.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + update applet_appointment + set + cancel_time = #{cancel_time}::timestamp, + appointment_state=4 + where id=#{appointment_id} + + + + update applet_appointment_detail + set is_del=1 + where id=#{appointment_id} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/client/OtherExtendMapper.xml b/mapper/src/main/resources/mappers/client/OtherExtendMapper.xml new file mode 100644 index 0000000..def25c4 --- /dev/null +++ b/mapper/src/main/resources/mappers/client/OtherExtendMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/client/PunchClockExtendMapper.xml b/mapper/src/main/resources/mappers/client/PunchClockExtendMapper.xml new file mode 100644 index 0000000..873a5a4 --- /dev/null +++ b/mapper/src/main/resources/mappers/client/PunchClockExtendMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/mappers/client/TruckExtendMapper.xml b/mapper/src/main/resources/mappers/client/TruckExtendMapper.xml new file mode 100644 index 0000000..7ce818b --- /dev/null +++ b/mapper/src/main/resources/mappers/client/TruckExtendMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + update applet_truck + set + truck_state=0 + where users_id=#{users_id} and truck_state<>4 + + + + + + + + + \ No newline at end of file diff --git a/mapper/src/main/resources/static/rtos-wx-applet.sql b/mapper/src/main/resources/static/rtos-wx-applet.sql new file mode 100644 index 0000000..ee0b691 --- /dev/null +++ b/mapper/src/main/resources/static/rtos-wx-applet.sql @@ -0,0 +1,671 @@ +--RTOS小程序数据库 sql文档 + +-- Database: rtos-wx-applet +-- DROP DATABASE IF EXISTS rtos-wx-applet; + +CREATE DATABASE rtos_wx_applet + WITH + OWNER = postgres + ENCODING = 'UTF8' + LC_COLLATE = 'Chinese (Simplified)_China.936' + LC_CTYPE = 'Chinese (Simplified)_China.936' + TABLESPACE = pg_default + CONNECTION LIMIT = -1 + IS_TEMPLATE = False; +COMMENT ON DATABASE rtos_wx_applet IS 'RTOS小程序数据库'; + + +--1-用户（司机）信息 +CREATE TABLE IF NOT EXISTS public.applet_users( + id serial, + users_name varchar(32) DEFAULT NULL, + wx_openid varchar(32) DEFAULT NULL, + wx_unionid varchar(32) DEFAULT NULL, + wx_nick varchar(32) DEFAULT NULL, + wx_sex varchar(8) DEFAULT NULL, + wx_head_sculpture varchar(256) DEFAULT NULL, + tel_number varchar(32) NOT NULL, + id_code varchar(32) DEFAULT NULL, + users_state integer DEFAULT 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_users_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_users.id IS '用户id'; +COMMENT ON COLUMN applet_users.users_name IS '用户姓名,默认为微信昵称'; +COMMENT ON COLUMN applet_users.wx_openid IS '微信获取openid-用户小程序唯一标识'; +COMMENT ON COLUMN applet_users.wx_unionid IS '微信获取unionid-用户微信应用唯一标识'; +COMMENT ON COLUMN applet_users.wx_nick IS '微信获取昵称'; +COMMENT ON COLUMN applet_users.wx_sex IS '微信获取性别'; +COMMENT ON COLUMN applet_users.wx_head_sculpture IS '微信获取头像'; +COMMENT ON COLUMN applet_users.tel_number IS '手机号码'; +COMMENT ON COLUMN applet_users.id_code IS '用户身分证号码'; +COMMENT ON COLUMN applet_users.users_state IS '用户状态（0-正常，1-停用）'; +COMMENT ON COLUMN applet_users.create_time IS '创建时间'; +COMMENT ON COLUMN applet_users.update_time IS '更新时间'; +COMMENT ON COLUMN applet_users.is_del IS '是否软删除'; + + +--2-板车信息（用户扫描行驶证获取） +CREATE TABLE IF NOT EXISTS public.applet_truck( + id serial, + users_id integer, + truck_number varchar(16) DEFAULT NULL, + driving_license_id varchar(32) DEFAULT NULL, + tel_number varchar(16) DEFAULT NULL, + head_frame_number varchar(32) DEFAULT NULL, + vehicle_weight integer DEFAULT NULL, + vehicle_frame_weight integer DEFAULT NULL, + customs_declaration_no varchar(32) DEFAULT NULL, + driving_license varchar(256) DEFAULT NULL, + truck_state integer default 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_truck_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_truck.id IS '板车id'; +COMMENT ON COLUMN applet_truck.users_id IS '用户id'; +COMMENT ON COLUMN applet_truck.truck_number IS '车牌号（数据唯一性约束）'; +COMMENT ON COLUMN applet_truck.driving_license_id IS '行驶证ID'; +COMMENT ON COLUMN applet_truck.tel_number IS '司机电话'; +COMMENT ON COLUMN applet_truck.head_frame_number IS '车头车架号'; +COMMENT ON COLUMN applet_truck.vehicle_weight IS '车辆自重'; +COMMENT ON COLUMN applet_truck.vehicle_frame_weight IS '车架重'; +COMMENT ON COLUMN applet_truck.driving_license IS '行驶证（扫描件）'; +COMMENT ON COLUMN applet_truck.truck_state IS '板车状态（1-默认，0-其他，4-拉黑）'; +COMMENT ON COLUMN applet_truck.create_time IS '创建时间'; +COMMENT ON COLUMN applet_truck.update_time IS '更新时间'; +COMMENT ON COLUMN applet_truck.is_del IS '是否软删除'; + + +--3-公告信息（小程序/客服后台推送） +CREATE TABLE IF NOT EXISTS public.applet_announcements( + id serial, + title varchar(64) DEFAULT NULL, + abstracts varchar(256) DEFAULT NULL, + announcement text COLLATE pg_catalog."default" DEFAULT 'NULL::text', + author varchar(32) DEFAULT NULL, + reading_volume integer DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_announcements_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_announcements.id IS '公告id'; +COMMENT ON COLUMN applet_announcements.title IS '标题'; +COMMENT ON COLUMN applet_announcements.abstracts IS '摘要'; +COMMENT ON COLUMN applet_announcements.announcement IS '公告内容'; +COMMENT ON COLUMN applet_announcements.author IS '作者'; +COMMENT ON COLUMN applet_announcements.reading_volume IS '阅读量'; +COMMENT ON COLUMN applet_announcements.create_time IS '创建时间'; +COMMENT ON COLUMN applet_announcements.update_time IS '更新时间'; +COMMENT ON COLUMN applet_announcements.is_del IS '是否软删除'; + + +--4-预约信息 +CREATE TABLE IF NOT EXISTS public.applet_appointment( + id serial, + users_id integer DEFAULT NULL, + transport_type integer DEFAULT NULL, + truck_number varchar(16) DEFAULT NULL, + tel_number varchar(16) DEFAULT NULL, + + //head_frame_number varchar(32) DEFAULT NULL, + vehicle_weight integer, + vehicle_frame_weight integer, + driving_license varchar(32) DEFAULT NULL, + approach_date date DEFAULT NULL, + port_area_id integer DEFAULT NULL, + biz_type integer DEFAULT NULL, + enter_type integer DEFAULT NULL, + goods_type integer DEFAULT NULL, + goods_Quantity integer, + appointment_state integer default 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_appointment_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_appointment.id IS '预约信息id'; +COMMENT ON COLUMN applet_appointment.users_id IS '用户id'; +COMMENT ON COLUMN applet_appointment.transport_type IS '运输方式（1/2/3）';// +COMMENT ON COLUMN applet_appointment.truck_number IS '板车号';// +COMMENT ON COLUMN applet_appointment.tel_number IS '手机号';// +COMMENT ON COLUMN applet_appointment.head_frame_number IS '车头车架号';// +COMMENT ON COLUMN applet_appointment.vehicle_weight IS '板车自重（吨）';// +COMMENT ON COLUMN applet_appointment.vehicle_frame_weight IS '车架重（吨）';// +COMMENT ON COLUMN applet_appointment.driving_license IS '行驶证编号';// +COMMENT ON COLUMN applet_appointment.approach_date IS '预约进场日期';// +COMMENT ON COLUMN applet_punch_clock.biz_type IS '业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）'; +COMMENT ON COLUMN applet_appointment.port_area_id IS '进港港区Id';// +COMMENT ON COLUMN applet_appointment.enter_type IS '进港类型（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口）';// +COMMENT ON COLUMN applet_appointment.goods_type IS '货物类型（1-商品车,2-设备,3-其他）';// +COMMENT ON COLUMN applet_appointment.goods_Quantity IS '货物数量（件数）';// +COMMENT ON COLUMN applet_appointment.appointment_state IS '预约打卡状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常：预期未完成操作的）';// +COMMENT ON COLUMN applet_appointment.create_time IS '创建时间'; +COMMENT ON COLUMN applet_appointment.update_time IS '更新时间'; +COMMENT ON COLUMN applet_appointment.is_del IS '是否软删除'; + 需要 司机生份证 + + +-- 5-预约明细 +CREATE TABLE IF NOT EXISTS public.applet_appointment_detail( + id serial, + appointment_id integer DEFAULT NULL, + ship_name varchar(16) DEFAULT NULL, + voy_number varchar(16) DEFAULT NULL, + destination_port varchar(32) DEFAULT NULL, + brand_name varchar(32) DEFAULT NULL, + vin varchar(32) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_appointment_detail_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_appointment_detail.id IS '预约详细id'; +COMMENT ON COLUMN applet_appointment_detail.appointment_id IS '预约id'; +COMMENT ON COLUMN applet_appointment_detail.ship_name IS '船名';// +COMMENT ON COLUMN applet_appointment_detail.voy_number IS '航次号'; +COMMENT ON COLUMN applet_appointment_detail.destination_port IS '目的港';// +COMMENT ON COLUMN applet_appointment_detail.brand_name IS '品牌/名称';// +COMMENT ON COLUMN applet_appointment_detail.vin IS '车架号';// +COMMENT ON COLUMN applet_appointment_detail.create_time IS '创建时间'; +COMMENT ON COLUMN applet_appointment_detail.update_time IS '更新时间'; +COMMENT ON COLUMN applet_appointment_detail.is_del IS '是否软删除'; + + +--6-（签到/完成）打卡信息 +CREATE TABLE IF NOT EXISTS public.applet_punch_clock( + id serial, + users_id integer DEFAULT NULL, + appointment_id integer DEFAULT NULL, + biz_type integer DEFAULT NULL, + queue_number varchar(16), + --approach_date date DEFAULT NULL, + punch_start_time time DEFAULT NULL, + punch_over_time time DEFAULT NULL, + port_area_id integer DEFAULT NULL, + punch_address varchar(256) DEFAULT NULL, + over_address varchar(256) DEFAULT NULL, + punch_clock_type integer, + punch_clock_poi varchar(64) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_punch_clock_pkey PRIMARY KEY (id) +); + +COMMENT ON COLUMN applet_punch_clock.id IS '打卡信息id'; +COMMENT ON COLUMN applet_punch_clock.users_id IS '用户id'; +COMMENT ON COLUMN applet_punch_clock.appointment_id IS '预约Id'; +COMMENT ON COLUMN applet_punch_clock.biz_type IS '业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）'; +COMMENT ON COLUMN applet_punch_clock.queue_number IS '排队编号'; +--COMMENT ON COLUMN applet_punch_clock.approach_date IS '打卡日期'; +COMMENT ON COLUMN applet_punch_clock.start_time IS '签到日期时间'; +COMMENT ON COLUMN applet_punch_clock.punch_over_time IS '完成日期时间'; +COMMENT ON COLUMN applet_punch_clock.port_area_id IS '打卡港区(ID)'; +COMMENT ON COLUMN applet_punch_clock.punch_address IS '签到打卡地点'; +COMMENT ON COLUMN applet_punch_clock.over_address IS '完成打卡地点'; +COMMENT ON COLUMN applet_punch_clock.punch_clock_type IS '打卡类别（1-签到，2-已进港，3-操作中，4-已完成，5-已离港）'; +COMMENT ON COLUMN applet_punch_clock.punch_clock_poi IS '打卡（位置坐标）{"1":poi2,"2",poi2}'; +COMMENT ON COLUMN applet_punch_clock.create_time IS '创建时间'; +COMMENT ON COLUMN applet_punch_clock.update_time IS '更新时间'; +COMMENT ON COLUMN applet_punch_clock.is_del IS '是否软删除'; + + +--7-收车信息 +CREATE TABLE IF NOT EXISTS public.applet_receiving_vehicle( + id serial, + users_id integer DEFAULT NULL, + ship_name varchar(64) DEFAULT NULL, + voy_number varchar(64) DEFAULT NULL, + complete_project_time timestamp(0) DEFAULT NULL, + task_number varchar(32) DEFAULT NULL, + transport_type varchar(64) DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + enter_port_area varchar(32) DEFAULT NULL, + enter_port_time timestamp(0) DEFAULT NULL, + operation_team varchar(16) DEFAULT NULL, + goods_info text DEFAULT NULL, + vehicle_frame_data varchar(2048) DEFAULT NULL, + receiving_state integer DEFAULT 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_receiving_vehicle_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_receiving_vehicle.id IS '收车信息id'; +COMMENT ON COLUMN applet_receiving_vehicle.users_id IS '用户id'; +COMMENT ON COLUMN applet_receiving_vehicle.ship_name IS '船名'; +COMMENT ON COLUMN applet_receiving_vehicle.voy_number IS '航次'; +COMMENT ON COLUMN applet_receiving_vehicle.complete_project_time IS '完工日期时间'; +COMMENT ON COLUMN applet_receiving_vehicle.task_number IS '作业编号'; +COMMENT ON COLUMN applet_receiving_vehicle.transport_type IS '运输方式'; +COMMENT ON COLUMN applet_receiving_vehicle.truck_number IS '车牌号（板车号）'; +COMMENT ON COLUMN applet_receiving_vehicle.enter_port_area IS '进港港区'; +COMMENT ON COLUMN applet_receiving_vehicle.enter_port_time IS '进港日期时间'; +COMMENT ON COLUMN applet_receiving_vehicle.operation_team IS '作业工班'; +COMMENT ON COLUMN applet_receiving_vehicle.goods_info IS '货物信息（type:vehicle/others, +vehicle{品牌/型号/车型/数量/港口或国家/车辆类型/卸货方式：港区作业或客户自提，Json数据}, +others{货名/长/宽/高/重量/数量/港口、国家/卸货方式（港区作业/客户自卸）的Json数据}）'; +COMMENT ON COLUMN applet_receiving_vehicle.vehicle_frame_data IS '车架号数据（[品牌,车架号]的Json数据）'; +COMMENT ON COLUMN applet_receiving_vehicle.receiving_state IS '收车状态（0-默认，未收车，1-已收车，2-已核对)'; +COMMENT ON COLUMN applet_receiving_vehicle.create_time IS '创建时间'; +COMMENT ON COLUMN applet_receiving_vehicle.update_time IS '更新时间'; +COMMENT ON COLUMN applet_receiving_vehicle.is_del IS '是否软删除'; + + +--8-发车信息 +CREATE TABLE IF NOT EXISTS public.applet_departure_vehicle( + id serial, + users_id integer DEFAULT NULL, + ship_name varchar(64) DEFAULT NULL, + voy_number varchar(64) DEFAULT NULL, + complete_project_time timestamp(0) DEFAULT NULL, + task_number varchar(32) DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + receiving_unit varchar(64) DEFAULT NULL, + lading_no varchar(64) DEFAULT NULL, + customs_clearance_nature varchar(32) DEFAULT NULL, + customs_declaration_no varchar(32) DEFAULT NULL, + vehicle_frame_data varchar(1024) DEFAULT NULL, + goods_name varchar(32) DEFAULT NULL, + goods_Quantity integer, + certificate_Preparation_date timestamp(0) DEFAULT NULL, + liberator varchar(32) DEFAULT NULL, + signee varchar(32) DEFAULT NULL, + remarks varchar(256) DEFAULT NULL, + departure_state integer default 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_departure_vehicle_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_departure_vehicle.id IS '发车信息Id'; +COMMENT ON COLUMN applet_departure_vehicle.users_id IS '用户id'; +COMMENT ON COLUMN applet_departure_vehicle.ship_name IS '船名'; +COMMENT ON COLUMN applet_departure_vehicle.voy_number IS '航次'; +COMMENT ON COLUMN applet_departure_vehicle.complete_project_time IS '完工日期时间'; +COMMENT ON COLUMN applet_departure_vehicle.task_number IS '作业编号'; +COMMENT ON COLUMN applet_departure_vehicle.truck_number IS '车牌号（板车号）'; +COMMENT ON COLUMN applet_departure_vehicle.receiving_unit IS '收货单位'; +COMMENT ON COLUMN applet_departure_vehicle.lading_no IS '提单号'; +COMMENT ON COLUMN applet_departure_vehicle.customs_clearance_nature IS '通关性质'; +COMMENT ON COLUMN applet_departure_vehicle.customs_declaration_no IS '报关单号'; +COMMENT ON COLUMN applet_departure_vehicle.vehicle_frame_data IS '车架号'; +COMMENT ON COLUMN applet_departure_vehicle.goods_name IS '货名'; +COMMENT ON COLUMN applet_departure_vehicle.goods_Quantity IS '件数'; +COMMENT ON COLUMN applet_departure_vehicle.certificate_Preparation_date IS '制证日期'; +COMMENT ON COLUMN applet_departure_vehicle.liberator IS '放行者'; +COMMENT ON COLUMN applet_departure_vehicle.signee IS '签收者'; +COMMENT ON COLUMN applet_departure_vehicle.remarks IS '备注'; +COMMENT ON COLUMN applet_departure_vehicle.departure_state IS '发车状态（0-默认，未发车，1-已收车，2-已核对）'; +COMMENT ON COLUMN applet_departure_vehicle.create_time IS '创建时间'; +COMMENT ON COLUMN applet_departure_vehicle.update_time IS '更新时间'; +COMMENT ON COLUMN applet_departure_vehicle.is_del IS '是否软删除'; + + +--9-意见反馈 +CREATE TABLE IF NOT EXISTS public.applet_feedback( + id serial, + users_id integer DEFAULT NULL, + nike_name varchar(32) DEFAULT NULL, + feedback_info varchar(1024) DEFAULT NULL, + pictures varchar(256) DEFAULT NULL, + tel_number varchar(64) DEFAULT NULL, + contact_info varchar(64) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT feedback_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_feedback.id IS '意见反馈id'; +COMMENT ON COLUMN applet_feedback.users_id IS '用户id'; +COMMENT ON COLUMN applet_feedback.nike_name IS '昵称'; +COMMENT ON COLUMN applet_feedback.feedback_info IS '意见（限500字）'; +COMMENT ON COLUMN applet_feedback.pictures IS '图片文件名集合，逗号分隔'; +COMMENT ON COLUMN applet_feedback.tel_number IS '联系电话'; +COMMENT ON COLUMN applet_feedback.contact_info IS '联系方式（微信号/qq/邮箱）'; +COMMENT ON COLUMN applet_feedback.create_time IS '创建时间'; +COMMENT ON COLUMN applet_feedback.update_time IS '更新时间'; +COMMENT ON COLUMN applet_feedback.is_del IS '是否软删除'; + + +--10-新手攻略（小程序/客服平台/生产APP操作指南） +CREATE TABLE IF NOT EXISTS public.applet_novice_introduction( + id serial, + sort integer DEFAULT NULL, + title varchar(64) DEFAULT NULL, + content text DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT novice_introduction_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_novice_introduction.id IS '攻略_id'; +COMMENT ON COLUMN applet_novice_introduction.sort IS '类别（1-小程序，2-客服平台，3-生产APP）'; +COMMENT ON COLUMN applet_novice_introduction.title IS '小标题'; +COMMENT ON COLUMN applet_novice_introduction.content IS '内容（html文本，允许包含图片标签）'; +COMMENT ON COLUMN applet_novice_introduction.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_novice_introduction.create_time IS '创建时间'; +COMMENT ON COLUMN applet_novice_introduction.update_time IS '更新时间'; +COMMENT ON COLUMN applet_novice_introduction.is_del IS '是否软删除'; + + +--11-运输方式 +CREATE TABLE IF NOT EXISTS public.applet_transport_types( + id serial, + transport_type_name varchar(64) DEFAULT NULL, + transport_type varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT transport_types_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_transport_types.id IS '运输方式id'; +COMMENT ON COLUMN applet_transport_types.transport_type_name IS '运输方式名称（板车运输/自开）'; +COMMENT ON COLUMN applet_transport_types.transport_type IS '运输方式'; +COMMENT ON COLUMN applet_transport_types.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_transport_types.create_time IS '创建时间'; +COMMENT ON COLUMN applet_transport_types.update_time IS '更新时间'; +COMMENT ON COLUMN applet_transport_types.is_del IS '是否软删除'; + + +--12-港区 +CREATE TABLE IF NOT EXISTS public.applet_port_areas( + id serial, + port_area varchar(64) DEFAULT NULL, + area_center_poi varchar(32) DEFAULT NULL, + punch_range integer DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT port_areas_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_port_areas.id IS '港区id'; +COMMENT ON COLUMN applet_port_areas.port_area IS '港区名'; +COMMENT ON COLUMN applet_port_areas.area_center_poi IS '港区坐标'; +COMMENT ON COLUMN applet_port_areas.punch_range IS '打卡范围（距离港区中心坐标的半径，米）'; +COMMENT ON COLUMN applet_port_areas.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_port_areas.create_time IS '创建时间'; +COMMENT ON COLUMN applet_port_areas.update_time IS '更新时间'; +COMMENT ON COLUMN applet_port_areas.is_del IS '是否软删除'; + + +--13-作业工班 +CREATE TABLE IF NOT EXISTS public.applet_operation_teams( + id serial, + operation_team varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT operation_teams_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_operation_teams.id IS '作业工班id'; +COMMENT ON COLUMN applet_operation_teams.operation_team IS '作业工班'; +COMMENT ON COLUMN applet_operation_teams.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_operation_teams.create_time IS '创建时间'; +COMMENT ON COLUMN applet_operation_teams.update_time IS '更新时间'; +COMMENT ON COLUMN applet_operation_teams.is_del IS '是否软删除'; + + +--14-车辆管理 +CREATE TABLE IF NOT EXISTS public.applet_truck_management( + id serial, + users_id integer DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + cause varchar(256) DEFAULT NULL, + drivers_name varchar(32) DEFAULT NULL, + drivers_phone varchar(32) DEFAULT NULL, + administrators_name varchar(32) DEFAULT NULL, + administrators_phone varchar(32) DEFAULT NULL, + enter_time timestamp(0) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_truck_management_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_truck_management.id IS '车辆管理id'; +COMMENT ON COLUMN applet_truck_management.users_id IS '用户id'; +COMMENT ON COLUMN applet_truck_management.truck_number IS '（加入黑名单的）车牌号'; +COMMENT ON COLUMN applet_truck_management.cause IS '原因'; +COMMENT ON COLUMN applet_truck_management.drivers_name IS '司机姓名'; +COMMENT ON COLUMN applet_truck_management.drivers_phone IS '司机电话'; +COMMENT ON COLUMN applet_truck_management.administrators_name IS '管理员姓名'; +COMMENT ON COLUMN applet_truck_management.administrators_phone IS '管理员电话'; +COMMENT ON COLUMN applet_truck_management.enter_time IS '加入黑名单时间'; +COMMENT ON COLUMN applet_truck_management.create_time IS '创建时间'; +COMMENT ON COLUMN applet_truck_management.update_time IS '更新时间'; +COMMENT ON COLUMN applet_truck_management.is_del IS '是否软删除'; + + +--15-货物类型 +CREATE TABLE IF NOT EXISTS public.applet_goods_types( + id serial, + goods_type_name varchar(64) DEFAULT NULL, + goods_type integer DEFAULT NULL, + sequence_number integer, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT goods_types_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_goods_types.id IS '货物类型id'; +COMMENT ON COLUMN applet_goods_types.goods_type_name IS '货物类型（1-商品车/2-设备/3-其他...）'; +COMMENT ON COLUMN applet_goods_types.goods_type IS '货物类型（1-商品车/2-设备/3-其他...）'; +COMMENT ON COLUMN applet_goods_types.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_goods_types.create_time IS '创建时间'; +COMMENT ON COLUMN applet_goods_types.update_time IS '更新时间'; +COMMENT ON COLUMN applet_goods_types.is_del IS '是否软删除'; + + +--16-进港类型 +CREATE TABLE IF NOT EXISTS public.applet_enter_type( + id serial, + enter_port_type_name varchar(32) DEFAULT NULL, + enter_port_type integer DEFAULT NULL, + sequence_number integer, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_enter_types_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_enter_type.id IS '进港类型id'; +COMMENT ON COLUMN applet_enter_type.enter_port_type_name IS '进港类型名称（1-外贸出口/2-内贸出口/3-外贸进口/4-内贸进口/5-特保区出口/6-特保区进口...）'; +COMMENT ON COLUMN applet_enter_type.enter_port_type IS '进港类型（1/2/3/4/5/6/...）'; +COMMENT ON COLUMN applet_enter_type.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_enter_type.create_time IS '创建时间'; +COMMENT ON COLUMN applet_enter_type.update_time IS '更新时间'; +COMMENT ON COLUMN applet_enter_type.is_del IS '是否软删除'; + + +--17-船名航次 +CREATE TABLE IF NOT EXISTS public.applet_ship_voy( + id serial, + ship_name varchar(32) DEFAULT NULL, + voy_number varchar(32) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_ship_voy_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_ship_voy.id IS '船名航次id'; +COMMENT ON COLUMN applet_ship_voy.ship_name IS '船名'; +COMMENT ON COLUMN applet_ship_voy.voy_number IS '航次编号'; +COMMENT ON COLUMN applet_ship_voy.create_time IS '创建时间'; +COMMENT ON COLUMN applet_ship_voy.update_time IS '更新时间'; +COMMENT ON COLUMN applet_ship_voy.is_del IS '是否软删除'; + + +--18-（运抵）港口 +CREATE TABLE IF NOT EXISTS public.applet_port( + id serial, + ship_voy_id integer DEFAULT NULL, + port_name varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT ports_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_port.id IS '港口id'; +COMMENT ON COLUMN applet_port.ship_voy_id IS '船名航次id'; +COMMENT ON COLUMN applet_port.port_name IS '港口名称'; +COMMENT ON COLUMN applet_port.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_port.create_time IS '创建时间'; +COMMENT ON COLUMN applet_port.update_time IS '更新时间'; +COMMENT ON COLUMN applet_port.is_del IS '是否软删除'; + + +--19-商品车品牌 +CREATE TABLE IF NOT EXISTS public.applet_brand( + id serial, + ship_voy_id integer DEFAULT NULL, + brand varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_brand_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_brand.id IS '品牌id'; +COMMENT ON COLUMN applet_brand.ship_voy_id IS '船名航次id'; +COMMENT ON COLUMN applet_brand.brand IS '品牌名称'; +COMMENT ON COLUMN applet_brand.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_brand.create_time IS '创建时间'; +COMMENT ON COLUMN applet_brand.update_time IS '更新时间'; +COMMENT ON COLUMN applet_brand.is_del IS '是否软删除'; + + +--20-进港指令 +CREATE TABLE IF NOT EXISTS public.applet_entry_instruct( + id serial, + appointment_id integer DEFAULT NULL, + users_id integer DEFAULT NULL, + users_name varchar(32) DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + yard_name varchar(32) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_entry_instruct_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_entry_instruct.id IS '进港指令id'; +COMMENT ON COLUMN applet_entry_instruct.appointment_id IS '预约id'; +COMMENT ON COLUMN applet_entry_instruct.users_id IS '司机id'; +COMMENT ON COLUMN applet_entry_instruct.users_name IS '司机姓名'; +COMMENT ON COLUMN applet_entry_instruct.truck_number IS '车牌号'; +COMMENT ON COLUMN applet_entry_instruct.yard_name IS '堆场'; +COMMENT ON COLUMN applet_entry_instruct.create_time IS '创建时间'; +COMMENT ON COLUMN applet_entry_instruct.update_time IS '更新时间'; +COMMENT ON COLUMN applet_entry_instruct.is_del IS '是否软删除'; + + +--21-服务配置 +CREATE TABLE IF NOT EXISTS public.applet_service_config( + id serial, + config_name varchar(32) default null, + config_code varchar(32) default null, + config_content varchar(256) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_service_config_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_service_config.id IS '自增id'; +COMMENT ON COLUMN applet_service_config.config_name IS '配置名称（系统服务地址,图片文件存储路径,图片访问路径,小程序appid,小程序密钥secret)'; +COMMENT ON COLUMN applet_service_config.config_code IS '配置代码（100-系统服务地址,200-图片文件存储路径,300-图片访问路径,400-小程序appid,500-小程序密钥secret)'; +COMMENT ON COLUMN applet_service_config.config_content IS '配置信息(文本)'; +COMMENT ON COLUMN applet_service_config.create_time IS '创建时间'; +COMMENT ON COLUMN applet_service_config.update_time IS '更新时间'; +COMMENT ON COLUMN applet_service_config.is_del IS '是否软删除'; + +--22-请求第三方接口 +CREATE TABLE IF NOT EXISTS public.applet_requester( + id serial, + url varchar(256) default null, + param_map varchar(256) default null, + request_type integer default null, + type_description varchar(32) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_requester_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_requester.id IS '自增id'; +COMMENT ON COLUMN applet_requester.url IS 'url（请求服务地址)'; +COMMENT ON COLUMN applet_requester.param_map IS '请求参数（值为空时，需要依赖实参传值。如小程序登录参数：{"appid":"","code":"","secret":"","grant_type":"authorization_code"}）'; +COMMENT ON COLUMN applet_requester.request_type IS '请求类型(1001-1999)'; +COMMENT ON COLUMN applet_requester.type_description IS '类别说明'; +COMMENT ON COLUMN applet_requester.create_time IS '创建时间'; +COMMENT ON COLUMN applet_requester.update_time IS '更新时间'; +COMMENT ON COLUMN applet_requester.is_del IS '是否软删除'; + +--23-用户登录日志 +CREATE TABLE IF NOT EXISTS public.applet_login_log( + id serial, + wx_nike varchar(32), + wx_openid varchar(32) DEFAULT NULL, + login_time timestamp default null, + ip varchar(32) default null, + area varchar(32) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_login_log_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_login_log.id IS '自增id'; +COMMENT ON COLUMN applet_login_log.wx_nike IS '微信昵称'; +COMMENT ON COLUMN applet_login_log.wx_openid IS '微信openid'; +COMMENT ON COLUMN applet_login_log.login_time IS '登录时间'; +COMMENT ON COLUMN applet_login_log.ip IS 'ip地址'; +COMMENT ON COLUMN applet_login_log.area IS '地区（省市）'; +COMMENT ON COLUMN applet_login_log.create_time IS '创建时间'; +COMMENT ON COLUMN applet_login_log.update_time IS '更新时间'; +COMMENT ON COLUMN applet_login_log.is_del IS '是否软删除'; + +--24-自定义表头 +CREATE TABLE IF NOT EXISTS public.applet_tb_head( + id serial, + table_name varchar(32), + table_code varchar(32) default null, + head_jason varchar(512) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_tb_head PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_tb_head.id IS '自增id'; +COMMENT ON COLUMN applet_tb_head.table_name IS '表名'; +COMMENT ON COLUMN applet_tb_head.table_code IS '标识代码'; +COMMENT ON COLUMN applet_tb_head.head_jason IS '表头Json'; +COMMENT ON COLUMN applet_tb_head.create_time IS '创建时间'; +COMMENT ON COLUMN applet_tb_head.update_time IS '更新时间'; +COMMENT ON COLUMN applet_tb_head.is_del IS '是否软删除'; + + +--25--消息表 +CREATE TABLE IF NOT EXISTS public.applet_message( + id varchar(32), + type integer DEFAULT NULL, + type_content varchar(256)DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + is_read integer DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0 +); +COMMENT ON COLUMN applet_message.id IS 'id'; +COMMENT ON COLUMN applet_message.type IS '1-收车 2-提车'; +COMMENT ON COLUMN applet_message.type_content IS '1-收车 2-提车'; +COMMENT ON COLUMN applet_message.truck_number IS '板车号'; +COMMENT ON COLUMN applet_message.is_read IS '0-未读 1-已读'; +COMMENT ON COLUMN applet_message.create_time IS '创建时间'; +COMMENT ON COLUMN applet_message.update_time IS '更新时间'; +COMMENT ON COLUMN applet_message.is_del IS '是否软删除'; \ No newline at end of file diff --git a/mapper/src/main/resources/static/tableUpdate.txt b/mapper/src/main/resources/static/tableUpdate.txt new file mode 100644 index 0000000..448095d --- /dev/null +++ b/mapper/src/main/resources/static/tableUpdate.txt @@ -0,0 +1,3 @@ +-+1. 预约表applet_appointment head_frame_number 修改为 truck_vin +2. 预约表applet_punch_clock start_time 数据类型time 改为datetime + over_time 数据类型time 改为datetime diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/AnnouncementAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/AnnouncementAdminMapper.class new file mode 100644 index 0000000..422a06e Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/AnnouncementAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/AppointmentAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/AppointmentAdminMapper.class new file mode 100644 index 0000000..4b84be1 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/AppointmentAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/FeedbackAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/FeedbackAdminMapper.class new file mode 100644 index 0000000..cf2e34a Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/FeedbackAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/NoviceIntroductionAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/NoviceIntroductionAdminMapper.class new file mode 100644 index 0000000..7e87146 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/NoviceIntroductionAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/PunchClockAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/PunchClockAdminMapper.class new file mode 100644 index 0000000..59dfaf9 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/PunchClockAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/StatisticsAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/StatisticsAdminMapper.class new file mode 100644 index 0000000..4158732 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/StatisticsAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/admin/UsersAdminMapper.class b/mapper/target/classes/com/haitongauto/mapper/admin/UsersAdminMapper.class new file mode 100644 index 0000000..e8dd5dc Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/admin/UsersAdminMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/AnnouncementMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/AnnouncementMapper.class new file mode 100644 index 0000000..f5c4ffa Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/AnnouncementMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/AppointmentDetailMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/AppointmentDetailMapper.class new file mode 100644 index 0000000..587981d Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/AppointmentDetailMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/AppointmentMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/AppointmentMapper.class new file mode 100644 index 0000000..44ef7d0 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/AppointmentMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/DataBaseMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/DataBaseMapper.class new file mode 100644 index 0000000..6c1c9dd Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/DataBaseMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/DepartureDetailMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/DepartureDetailMapper.class new file mode 100644 index 0000000..0145165 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/DepartureDetailMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/DepartureVehicleMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/DepartureVehicleMapper.class new file mode 100644 index 0000000..f9939f9 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/DepartureVehicleMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/DicMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/DicMapper.class new file mode 100644 index 0000000..9b2b9b8 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/DicMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/EntryInstructMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/EntryInstructMapper.class new file mode 100644 index 0000000..0712944 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/EntryInstructMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/FeedbackMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/FeedbackMapper.class new file mode 100644 index 0000000..5c5d817 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/FeedbackMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/LoginLogMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/LoginLogMapper.class new file mode 100644 index 0000000..e0ca79f Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/LoginLogMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/MessageMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/MessageMapper.class new file mode 100644 index 0000000..3c4ea4f Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/MessageMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/NoviceIntroductionMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/NoviceIntroductionMapper.class new file mode 100644 index 0000000..b9a4e1e Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/NoviceIntroductionMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/PortAreasMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/PortAreasMapper.class new file mode 100644 index 0000000..e13b81d Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/PortAreasMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/PunchClockMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/PunchClockMapper.class new file mode 100644 index 0000000..066f648 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/PunchClockMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/ReceivingDetailMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/ReceivingDetailMapper.class new file mode 100644 index 0000000..ad8a306 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/ReceivingDetailMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/ReceivingVehicleMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/ReceivingVehicleMapper.class new file mode 100644 index 0000000..b737917 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/ReceivingVehicleMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/RequesterMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/RequesterMapper.class new file mode 100644 index 0000000..c289c1f Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/RequesterMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/ServiceConfigMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/ServiceConfigMapper.class new file mode 100644 index 0000000..2fb8c7e Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/ServiceConfigMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/TableHeadMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/TableHeadMapper.class new file mode 100644 index 0000000..3a28bed Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/TableHeadMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/TruckManagementMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/TruckManagementMapper.class new file mode 100644 index 0000000..0c0702e Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/TruckManagementMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/TruckMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/TruckMapper.class new file mode 100644 index 0000000..49898c5 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/TruckMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/base/UsersMapper.class b/mapper/target/classes/com/haitongauto/mapper/base/UsersMapper.class new file mode 100644 index 0000000..fd59cf6 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/base/UsersMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/client/AppointmentExtendMapper.class b/mapper/target/classes/com/haitongauto/mapper/client/AppointmentExtendMapper.class new file mode 100644 index 0000000..2a093e0 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/client/AppointmentExtendMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/client/OtherExtendMapper.class b/mapper/target/classes/com/haitongauto/mapper/client/OtherExtendMapper.class new file mode 100644 index 0000000..0d94df4 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/client/OtherExtendMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/client/PunchClockExtendMapper.class b/mapper/target/classes/com/haitongauto/mapper/client/PunchClockExtendMapper.class new file mode 100644 index 0000000..d7ffd23 Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/client/PunchClockExtendMapper.class differ diff --git a/mapper/target/classes/com/haitongauto/mapper/client/TruckExtendMapper.class b/mapper/target/classes/com/haitongauto/mapper/client/TruckExtendMapper.class new file mode 100644 index 0000000..4cf081d Binary files /dev/null and b/mapper/target/classes/com/haitongauto/mapper/client/TruckExtendMapper.class differ diff --git a/mapper/target/classes/mappers/admin/AnnouncementAdminMapper.xml b/mapper/target/classes/mappers/admin/AnnouncementAdminMapper.xml new file mode 100644 index 0000000..3ad83e8 --- /dev/null +++ b/mapper/target/classes/mappers/admin/AnnouncementAdminMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/admin/AppointmentAdminMapper.xml b/mapper/target/classes/mappers/admin/AppointmentAdminMapper.xml new file mode 100644 index 0000000..86aba43 --- /dev/null +++ b/mapper/target/classes/mappers/admin/AppointmentAdminMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/admin/FeedbackAdminMapper.xml b/mapper/target/classes/mappers/admin/FeedbackAdminMapper.xml new file mode 100644 index 0000000..64c1dc4 --- /dev/null +++ b/mapper/target/classes/mappers/admin/FeedbackAdminMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/admin/NoviceIntroductionAdminMapper.xml b/mapper/target/classes/mappers/admin/NoviceIntroductionAdminMapper.xml new file mode 100644 index 0000000..51af3e7 --- /dev/null +++ b/mapper/target/classes/mappers/admin/NoviceIntroductionAdminMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/admin/PunchClockAdminMapper.xml b/mapper/target/classes/mappers/admin/PunchClockAdminMapper.xml new file mode 100644 index 0000000..1299b51 --- /dev/null +++ b/mapper/target/classes/mappers/admin/PunchClockAdminMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/admin/StatisticsAdminMapper.xml b/mapper/target/classes/mappers/admin/StatisticsAdminMapper.xml new file mode 100644 index 0000000..381f800 --- /dev/null +++ b/mapper/target/classes/mappers/admin/StatisticsAdminMapper.xml @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/admin/UsersAdminMapper.xml b/mapper/target/classes/mappers/admin/UsersAdminMapper.xml new file mode 100644 index 0000000..a262895 --- /dev/null +++ b/mapper/target/classes/mappers/admin/UsersAdminMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/AnnouncementMapper.xml b/mapper/target/classes/mappers/base/AnnouncementMapper.xml new file mode 100644 index 0000000..ae80dc4 --- /dev/null +++ b/mapper/target/classes/mappers/base/AnnouncementMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + update applet_announcement set is_del=1 where id=#{id} + + + + delete from applet_announcement where id=#{id} + + + + update applet_announcement + + + id = #{id}, + + + sort = #{sort}, + + + title = #{title}, + + + abstracts = #{abstracts}, + + + announcement = #{announcement}, + + + announcement_text = #{announcement_text}, + + + author = #{author}, + + + reading_volume = #{reading_volume}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/AppointmentDetailMapper.xml b/mapper/target/classes/mappers/base/AppointmentDetailMapper.xml new file mode 100644 index 0000000..3298762 --- /dev/null +++ b/mapper/target/classes/mappers/base/AppointmentDetailMapper.xml @@ -0,0 +1,174 @@ + + + + + + + + + update applet_appointment_detail set is_del=1 where id=#{id} + + + + delete from applet_appointment_detail + where id=#{id} + + + + update applet_appointment_detail + + + id = #{id}, + + + appointment_id = #{appointment_id}, + + + ship_id = #{ship_id}, + + + ship_name = #{ship_name}, + + + voy_number = #{voy_number}, + + + destination_port = #{destination_port}, + + + destination_port_id = #{destination_port_id}, + + + brand_id = #{brand_id}, + + + brand_name = #{brand_name}, + + + vin = #{vin}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + + + + + + + delete from applet_appointment_detail + where appointment_id=#{appointment_id} + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/AppointmentMapper.xml b/mapper/target/classes/mappers/base/AppointmentMapper.xml new file mode 100644 index 0000000..dc54f9b --- /dev/null +++ b/mapper/target/classes/mappers/base/AppointmentMapper.xml @@ -0,0 +1,370 @@ + + + + + + + + + update applet_appointment set is_del=1 where id=#{id} + + + + delete from applet_appointment where id=#{id} + + + + update applet_appointment + + + id = #{id}, + + + users_id = #{users_id}, + + + transport_type = #{transport_type}, + + + truck_number = #{truck_number}, + + + tel_number = #{tel_number}, + + + id_code = #{id_code}, + + + truck_vin = #{truck_vin}, + + + vehicle_weight = #{vehicle_weight}, + + + vehicle_frame_weight = #{vehicle_frame_weight}, + + + driving_license = #{driving_license}, + + + approach_date = #{approach_date}::date, + + + port_area_id = #{port_area_id}, + + + biz_type = #{biz_type}, + + + enter_type = #{enter_type}, + + + goods_type = #{goods_type}, + + + goods_quantity = #{goods_quantity}, + + + appointment_state = #{appointment_state}, + + + cancel_time = #{cancel_time}::timestamp, + + + appointment_type = #{appointment_type}, + + + is_del = #{is_del}, + + + yard = #{yard}, + + + yard_name = #{yard_name}, + + + gate_canal_in = #{gate_canal_in}, + + + gate_canal_out = #{gate_canal_out}, + + + gate_canal_in_time= #{gate_canal_in_time}::timestamp, + + + gate_canal_out_time=#{gate_canal_out_time}::timestamp, + + + instruct_state = #{instruct_state}, + + + send_time =# {send_time}::timestamp, + + + sender = #{sender}, + + + check_in_time = #{check_in_time}::timestamp, + + + check_over_time = #{check_over_time}::timestamp, + + + plate_scan_time = #{plate_scan_time}::timestamp, + + + is_conventionality_in = #{is_conventionality_in}, + + + push_ids = #{push_ids}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + update applet_appointment + + + id = #{item.id}, + + + yard = #{item.yard}, + + + sender = #{item.sender}, + + + yard_name = #{item.yard_name}, + + + gate_canal_in = #{item.gate_canal_in}, + + + instruct_state = #{item.instruct_state}, + + send_time =current_timestamp, + update_time = current_timestamp + + where id = #{item.id} + + + + + + update applet_appointment + + plate_scan_time = current_timestamp + + where id = #{appointment_id} + + + + + + + + + + + + + + diff --git a/mapper/target/classes/mappers/base/DepartureDetailMapper.xml b/mapper/target/classes/mappers/base/DepartureDetailMapper.xml new file mode 100644 index 0000000..3f9e3ea --- /dev/null +++ b/mapper/target/classes/mappers/base/DepartureDetailMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + update applet_departure_detail set is_del=1 where id=#{id} + + + + delete from applet_departure_detail where id=#{id} + + + + update applet_departure_detail + + + id = #{id}, + + + applet_departure_vehicle_id = #{applet_departure_vehicle_id}, + + + receiving_unit = #{receiving_unit}, + + + ship_name = #{ship_name}, + + + voy_number = #{voy_number}, + + + customs_clearance_nature = #{customs_clearance_nature}, + + + lading_no = #{lading_no}, + + + customs_declaration_no = #{customs_declaration_no}, + + + cargo_name = #{cargo_name}, + + + cargo_quantity = #{cargo_quantity}, + + + remarks = #{remarks}, + + + vin_list = #{vin_list}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/DepartureVehicleMapper.xml b/mapper/target/classes/mappers/base/DepartureVehicleMapper.xml new file mode 100644 index 0000000..03f45f2 --- /dev/null +++ b/mapper/target/classes/mappers/base/DepartureVehicleMapper.xml @@ -0,0 +1,175 @@ + + + + + + + + + update applet_departure_vehicle set is_del=1 where id=#{id} + + + + delete from applet_departure_vehicle where id=#{id} + + + + update applet_departure_vehicle + + + id = #{id}, + + + voucher_number = #{voucher_number}, + + + users_id = #{users_id}, + + + users_name = #{users_name}, + + + tel_number = #{tel_number}, + + + operators = #{operators}, + + + phone_number = #{phone_number}, + + + truck_number = #{truck_number}, + + + trade_type = #{trade_type}, + + + cargo_type = #{cargo_type}, + + + cargo_quantity = #{cargo_quantity}, + + + delivery_time = #{delivery_time}::timestamp, + + + checker = #{checker}, + + + check_status = #{check_status}, + + + check_time = #{check_time}::timestamp, + + + remarks = #{remarks}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/DicMapper.xml b/mapper/target/classes/mappers/base/DicMapper.xml new file mode 100644 index 0000000..d4df840 --- /dev/null +++ b/mapper/target/classes/mappers/base/DicMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + update applet_dic set is_del=1 where id=#{id} + + + + delete from applet_dic where id=#{id} + + + + update applet_dic + + + id = #{id}, + + + dic_sort = #{dic_sort}, + + + description = #{description}, + + + content = #{content}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/EntryInstructMapper.xml b/mapper/target/classes/mappers/base/EntryInstructMapper.xml new file mode 100644 index 0000000..f078833 --- /dev/null +++ b/mapper/target/classes/mappers/base/EntryInstructMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + update applet_entry_instruct set is_del=1 where id=#{id} + + + + delete from applet_entry_instruct where id=#{id} + + + + update applet_entry_instruct + + + id = #{id}, + + + appointment_id = #{appointment_id}, + + + users_id = #{users_id}, + + + users_name = #{users_name}, + + + truck_number = #{truck_number}, + + + yard_name = #{yard_name}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/FeedbackMapper.xml b/mapper/target/classes/mappers/base/FeedbackMapper.xml new file mode 100644 index 0000000..612c4eb --- /dev/null +++ b/mapper/target/classes/mappers/base/FeedbackMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + update applet_feedback set is_del=1 where id=#{id} + + + + delete from applet_feedback where id=#{id} + + + + update applet_feedback + + + id = #{id}, + + + users_id = #{users_id}, + + + nike_name = #{nike_name}, + + + feedback_info = #{feedback_info}, + + + pictures = #{pictures}, + + + tel_number = #{tel_number}, + + + contact_info = #{contact_info}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/LoginLogMapper.xml b/mapper/target/classes/mappers/base/LoginLogMapper.xml new file mode 100644 index 0000000..ae18ad4 --- /dev/null +++ b/mapper/target/classes/mappers/base/LoginLogMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/MessageMapper.xml b/mapper/target/classes/mappers/base/MessageMapper.xml new file mode 100644 index 0000000..3a5bf81 --- /dev/null +++ b/mapper/target/classes/mappers/base/MessageMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + update applet_message set is_del=1 where id=#{id} + + + + delete from applet_message where id=#{id} + + + + update applet_message + + + id = #{id}, + + + type = #{type}, + + + type_content = #{type_content}, + + + + biz_id = #{biz_id}, + + + prc_id = #{prc_id}, + + + truck_number = #{truck_number}, + + + is_read = #{is_read}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp, + + where id=#{id} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/NoviceIntroductionMapper.xml b/mapper/target/classes/mappers/base/NoviceIntroductionMapper.xml new file mode 100644 index 0000000..f24c70b --- /dev/null +++ b/mapper/target/classes/mappers/base/NoviceIntroductionMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + update applet_novice_introduction set is_del=1 where id=#{id} + + + + delete from applet_novice_introduction where id=#{id} + + + + update applet_novice_introduction + + + id = #{id}, + + + sort = #{sort}, + + + title = #{title}, + + + content = #{content}, + + + sequence_number = #{sequence_number}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/PortAreasMapper.xml b/mapper/target/classes/mappers/base/PortAreasMapper.xml new file mode 100644 index 0000000..f1cf423 --- /dev/null +++ b/mapper/target/classes/mappers/base/PortAreasMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + update applet_port_areas set is_del=1 where id=#{id} + + + + delete from applet_port_areas where id=#{id} + + + + update applet_port_areas + + + id = #{id}, + + + port_area_name = #{port_area_name}, + + + port_area_name_en = #{port_area_name_en}, + + + port_area_code = #{port_area_code}, + + + port_area_address = #{port_area_address}, + + + area_center_poi = #{area_center_poi}, + + + punch_range = #{punch_range}, + + + is_enable = #{is_enable}, + + + order_items = #{order_items}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/PunchClockMapper.xml b/mapper/target/classes/mappers/base/PunchClockMapper.xml new file mode 100644 index 0000000..fee906e --- /dev/null +++ b/mapper/target/classes/mappers/base/PunchClockMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + update applet_punch_clock set is_del=1 where id=#{id} + + + + delete from applet_punch_clock where id=#{id} + + + + update applet_punch_clock + + + id = #{id}, + + + users_id = #{users_id}, + + + appointment_id = #{appointment_id}, + + + biz_type = #{biz_type}, + + + queue_number = #{queue_number}, + + + start_time = #{start_time}::timestamp, + + + over_time = #{over_time}::timestamp, + + + port_area_id = #{port_area_id}, + + + punch_address = #{punch_address}, + + + over_address = #{over_address}, + + + punch_clock_type = #{punch_clock_type}, + + + punch_clock_poi = #{punch_clock_poi}, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/ReceivingDetailMapper.xml b/mapper/target/classes/mappers/base/ReceivingDetailMapper.xml new file mode 100644 index 0000000..2a96603 --- /dev/null +++ b/mapper/target/classes/mappers/base/ReceivingDetailMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + update applet_receiving_detail set is_del=1 where id=#{id} + + + + delete from applet_receiving_detail where id=#{id} + + + + update applet_receiving_detail + + + id = #{id}, + + + applet_receiving_vehicle_id = #{applet_receiving_vehicle_id}, + + + ship_name = #{ship_name}, + + + brand = #{brand}, + + + port_name = #{port_name}, + + + vin_list = #{vin_list}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/ReceivingVehicleMapper.xml b/mapper/target/classes/mappers/base/ReceivingVehicleMapper.xml new file mode 100644 index 0000000..dd1e8e5 --- /dev/null +++ b/mapper/target/classes/mappers/base/ReceivingVehicleMapper.xml @@ -0,0 +1,153 @@ + + + + + + + + + update applet_receiving_vehicle set is_del=1 where id=#{id} + + + + delete from applet_receiving_vehicle where id=#{id} + + + + update applet_receiving_vehicle + + + id = #{id}, + + + voucher_number = #{voucher_number}, + + + users_id = #{users_id}, + + + users_name = #{users_name}, + + + tel_number = #{tel_number}, + + + operators = #{operators}, + + + phone_number = #{phone_number}, + + + numbers = #{numbers}, + + + number_type = #{number_type}, + + + trade_type = #{trade_type}, + + + cargo_type = #{cargo_type}, + + + cargo_quantity = #{cargo_quantity}, + + + collect_time = #{collect_time}::timestamp, + + + checker = #{checker}, + + + check_status = #{check_status}, + + + check_time = #{check_time}::timestamp, + + + remarks = #{remarks}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/RequesterMapper.xml b/mapper/target/classes/mappers/base/RequesterMapper.xml new file mode 100644 index 0000000..0f7e2e5 --- /dev/null +++ b/mapper/target/classes/mappers/base/RequesterMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + update applet_requester set is_del=1 where id=#{id} + + + + delete from applet_requester where id=#{id} + + + + update applet_requester + + + id = #{id}, + + + url = #{url}, + + + param_map = #{param_map}, + + + request_type = #{request_type}, + + + type_description = #{type_description}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp, + + where id = #{id} + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/ServiceConfigMapper.xml b/mapper/target/classes/mappers/base/ServiceConfigMapper.xml new file mode 100644 index 0000000..85ca82a --- /dev/null +++ b/mapper/target/classes/mappers/base/ServiceConfigMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + update applet_service_config set is_del=1 where id=#{id} + + + + delete from applet_service_config where id=#{id} + + + + update applet_service_config + + + id = #{id}, + + + config_name = #{config_name}, + + + config_code = #{config_code}, + + + config_content = #{config_content}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/TableHeadMapper.xml b/mapper/target/classes/mappers/base/TableHeadMapper.xml new file mode 100644 index 0000000..3119ea4 --- /dev/null +++ b/mapper/target/classes/mappers/base/TableHeadMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + update applet_table_head + set is_del=1 + where id=#{id} + + + + delete from applet_table_head where id=#{id} + + + + update applet_table_head + + + id = #{id}, + + + table_name = #{table_name}, + + + table_code = #{table_code}, + + + head_jason = #{head_jason}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/TruckManagementMapper.xml b/mapper/target/classes/mappers/base/TruckManagementMapper.xml new file mode 100644 index 0000000..e55ee46 --- /dev/null +++ b/mapper/target/classes/mappers/base/TruckManagementMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + update applet_truck_management set is_del=1 where id=#{id} + + + + delete from applet_truck_management where id=#{id} + + + + update applet_truck_management + + + id = #{id}, + + + users_id = #{users_id}, + + + truck_number = #{truck_number}, + + + cause = #{cause}, + + + drivers_name = #{drivers_name}, + + + drivers_phone = #{drivers_phone}, + + + administrators_name = #{administrators_name}, + + + administrators_phone = #{administrators_phone}, + + + enter_time = #{enter_time}::timestamp, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time =current_timestamp + + where id = #{id} + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/TruckMapper.xml b/mapper/target/classes/mappers/base/TruckMapper.xml new file mode 100644 index 0000000..db6a874 --- /dev/null +++ b/mapper/target/classes/mappers/base/TruckMapper.xml @@ -0,0 +1,235 @@ + + + + + + + + + + update applet_truck set is_del=1 where id=#{id} + + + + delete from applet_truck where id=#{id} + + + delete from applet_truck where users_id=#{users_id} + + + + update applet_truck + + + id = #{id}, + + + wx_openid = #{wx_openid}, + + + users_id = #{users_id}, + + + truck_number = #{truck_number}, + + + driving_license_id = #{driving_license_id}, + + + tel_number = #{tel_number}, + + + head_frame_number = #{head_frame_number}, + + + vehicle_weight = #{vehicle_weight}, + + + vehicle_frame_weight = #{vehicle_frame_weight}, + + + driving_license = #{driving_license}, + + + truck_state = #{truck_state}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + update applet_truck + + + wx_openid = #{wx_openid}, + + + users_id = #{users_id}, + + + truck_number = #{truck_number}, + + + + driving_license_id = #{driving_license_id}, + + + driving_license_id ='', + + + + tel_number = #{tel_number}, + + + head_frame_number = #{head_frame_number}, + + + + vehicle_weight = #{vehicle_weight}, + + + vehicle_weight = null, + + + + + vehicle_frame_weight = #{vehicle_frame_weight}, + + + vehicle_frame_weight =null, + + + + + driving_license = #{driving_license}, + + + driving_license =null, + + + + truck_state = #{truck_state}, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/base/UsersMapper.xml b/mapper/target/classes/mappers/base/UsersMapper.xml new file mode 100644 index 0000000..bbbb655 --- /dev/null +++ b/mapper/target/classes/mappers/base/UsersMapper.xml @@ -0,0 +1,178 @@ + + + + + + + + + update applet_users set is_del=1 where id=#{id} + + + + delete from applet_users where id=#{id} + + + + update applet_users + + + id = #{id}, + + + access_token = #{access_token}, + + + access_token_rtos = #{access_token_rtos}, + + + users_name = #{users_name}, + + + wx_openid = #{wx_openid}, + + + wx_unionid = #{wx_unionid}, + + + wx_nick = #{wx_nick}, + + + wx_sex = #{wx_sex}, + + + wx_head_sculpture = #{wx_head_sculpture}, + + + tel_number = #{tel_number}, + + + id_code = #{id_code}, + + + users_state = #{users_state}, + + + create_time = #{create_time}::timestamp, + + + is_del = #{is_del}, + + update_time = current_timestamp + + where id = #{id} + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/client/AppointmentExtendMapper.xml b/mapper/target/classes/mappers/client/AppointmentExtendMapper.xml new file mode 100644 index 0000000..dd9f30b --- /dev/null +++ b/mapper/target/classes/mappers/client/AppointmentExtendMapper.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + update applet_appointment + set + cancel_time = #{cancel_time}::timestamp, + appointment_state=4 + where id=#{appointment_id} + + + + update applet_appointment_detail + set is_del=1 + where id=#{appointment_id} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/client/OtherExtendMapper.xml b/mapper/target/classes/mappers/client/OtherExtendMapper.xml new file mode 100644 index 0000000..def25c4 --- /dev/null +++ b/mapper/target/classes/mappers/client/OtherExtendMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/client/PunchClockExtendMapper.xml b/mapper/target/classes/mappers/client/PunchClockExtendMapper.xml new file mode 100644 index 0000000..873a5a4 --- /dev/null +++ b/mapper/target/classes/mappers/client/PunchClockExtendMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/mappers/client/TruckExtendMapper.xml b/mapper/target/classes/mappers/client/TruckExtendMapper.xml new file mode 100644 index 0000000..7ce818b --- /dev/null +++ b/mapper/target/classes/mappers/client/TruckExtendMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + update applet_truck + set + truck_state=0 + where users_id=#{users_id} and truck_state<>4 + + + + + + + + + \ No newline at end of file diff --git a/mapper/target/classes/static/rtos-wx-applet.sql b/mapper/target/classes/static/rtos-wx-applet.sql new file mode 100644 index 0000000..ee0b691 --- /dev/null +++ b/mapper/target/classes/static/rtos-wx-applet.sql @@ -0,0 +1,671 @@ +--RTOS小程序数据库 sql文档 + +-- Database: rtos-wx-applet +-- DROP DATABASE IF EXISTS rtos-wx-applet; + +CREATE DATABASE rtos_wx_applet + WITH + OWNER = postgres + ENCODING = 'UTF8' + LC_COLLATE = 'Chinese (Simplified)_China.936' + LC_CTYPE = 'Chinese (Simplified)_China.936' + TABLESPACE = pg_default + CONNECTION LIMIT = -1 + IS_TEMPLATE = False; +COMMENT ON DATABASE rtos_wx_applet IS 'RTOS小程序数据库'; + + +--1-用户（司机）信息 +CREATE TABLE IF NOT EXISTS public.applet_users( + id serial, + users_name varchar(32) DEFAULT NULL, + wx_openid varchar(32) DEFAULT NULL, + wx_unionid varchar(32) DEFAULT NULL, + wx_nick varchar(32) DEFAULT NULL, + wx_sex varchar(8) DEFAULT NULL, + wx_head_sculpture varchar(256) DEFAULT NULL, + tel_number varchar(32) NOT NULL, + id_code varchar(32) DEFAULT NULL, + users_state integer DEFAULT 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_users_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_users.id IS '用户id'; +COMMENT ON COLUMN applet_users.users_name IS '用户姓名,默认为微信昵称'; +COMMENT ON COLUMN applet_users.wx_openid IS '微信获取openid-用户小程序唯一标识'; +COMMENT ON COLUMN applet_users.wx_unionid IS '微信获取unionid-用户微信应用唯一标识'; +COMMENT ON COLUMN applet_users.wx_nick IS '微信获取昵称'; +COMMENT ON COLUMN applet_users.wx_sex IS '微信获取性别'; +COMMENT ON COLUMN applet_users.wx_head_sculpture IS '微信获取头像'; +COMMENT ON COLUMN applet_users.tel_number IS '手机号码'; +COMMENT ON COLUMN applet_users.id_code IS '用户身分证号码'; +COMMENT ON COLUMN applet_users.users_state IS '用户状态（0-正常，1-停用）'; +COMMENT ON COLUMN applet_users.create_time IS '创建时间'; +COMMENT ON COLUMN applet_users.update_time IS '更新时间'; +COMMENT ON COLUMN applet_users.is_del IS '是否软删除'; + + +--2-板车信息（用户扫描行驶证获取） +CREATE TABLE IF NOT EXISTS public.applet_truck( + id serial, + users_id integer, + truck_number varchar(16) DEFAULT NULL, + driving_license_id varchar(32) DEFAULT NULL, + tel_number varchar(16) DEFAULT NULL, + head_frame_number varchar(32) DEFAULT NULL, + vehicle_weight integer DEFAULT NULL, + vehicle_frame_weight integer DEFAULT NULL, + customs_declaration_no varchar(32) DEFAULT NULL, + driving_license varchar(256) DEFAULT NULL, + truck_state integer default 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_truck_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_truck.id IS '板车id'; +COMMENT ON COLUMN applet_truck.users_id IS '用户id'; +COMMENT ON COLUMN applet_truck.truck_number IS '车牌号（数据唯一性约束）'; +COMMENT ON COLUMN applet_truck.driving_license_id IS '行驶证ID'; +COMMENT ON COLUMN applet_truck.tel_number IS '司机电话'; +COMMENT ON COLUMN applet_truck.head_frame_number IS '车头车架号'; +COMMENT ON COLUMN applet_truck.vehicle_weight IS '车辆自重'; +COMMENT ON COLUMN applet_truck.vehicle_frame_weight IS '车架重'; +COMMENT ON COLUMN applet_truck.driving_license IS '行驶证（扫描件）'; +COMMENT ON COLUMN applet_truck.truck_state IS '板车状态（1-默认，0-其他，4-拉黑）'; +COMMENT ON COLUMN applet_truck.create_time IS '创建时间'; +COMMENT ON COLUMN applet_truck.update_time IS '更新时间'; +COMMENT ON COLUMN applet_truck.is_del IS '是否软删除'; + + +--3-公告信息（小程序/客服后台推送） +CREATE TABLE IF NOT EXISTS public.applet_announcements( + id serial, + title varchar(64) DEFAULT NULL, + abstracts varchar(256) DEFAULT NULL, + announcement text COLLATE pg_catalog."default" DEFAULT 'NULL::text', + author varchar(32) DEFAULT NULL, + reading_volume integer DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_announcements_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_announcements.id IS '公告id'; +COMMENT ON COLUMN applet_announcements.title IS '标题'; +COMMENT ON COLUMN applet_announcements.abstracts IS '摘要'; +COMMENT ON COLUMN applet_announcements.announcement IS '公告内容'; +COMMENT ON COLUMN applet_announcements.author IS '作者'; +COMMENT ON COLUMN applet_announcements.reading_volume IS '阅读量'; +COMMENT ON COLUMN applet_announcements.create_time IS '创建时间'; +COMMENT ON COLUMN applet_announcements.update_time IS '更新时间'; +COMMENT ON COLUMN applet_announcements.is_del IS '是否软删除'; + + +--4-预约信息 +CREATE TABLE IF NOT EXISTS public.applet_appointment( + id serial, + users_id integer DEFAULT NULL, + transport_type integer DEFAULT NULL, + truck_number varchar(16) DEFAULT NULL, + tel_number varchar(16) DEFAULT NULL, + + //head_frame_number varchar(32) DEFAULT NULL, + vehicle_weight integer, + vehicle_frame_weight integer, + driving_license varchar(32) DEFAULT NULL, + approach_date date DEFAULT NULL, + port_area_id integer DEFAULT NULL, + biz_type integer DEFAULT NULL, + enter_type integer DEFAULT NULL, + goods_type integer DEFAULT NULL, + goods_Quantity integer, + appointment_state integer default 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_appointment_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_appointment.id IS '预约信息id'; +COMMENT ON COLUMN applet_appointment.users_id IS '用户id'; +COMMENT ON COLUMN applet_appointment.transport_type IS '运输方式（1/2/3）';// +COMMENT ON COLUMN applet_appointment.truck_number IS '板车号';// +COMMENT ON COLUMN applet_appointment.tel_number IS '手机号';// +COMMENT ON COLUMN applet_appointment.head_frame_number IS '车头车架号';// +COMMENT ON COLUMN applet_appointment.vehicle_weight IS '板车自重（吨）';// +COMMENT ON COLUMN applet_appointment.vehicle_frame_weight IS '车架重（吨）';// +COMMENT ON COLUMN applet_appointment.driving_license IS '行驶证编号';// +COMMENT ON COLUMN applet_appointment.approach_date IS '预约进场日期';// +COMMENT ON COLUMN applet_punch_clock.biz_type IS '业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）'; +COMMENT ON COLUMN applet_appointment.port_area_id IS '进港港区Id';// +COMMENT ON COLUMN applet_appointment.enter_type IS '进港类型（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口）';// +COMMENT ON COLUMN applet_appointment.goods_type IS '货物类型（1-商品车,2-设备,3-其他）';// +COMMENT ON COLUMN applet_appointment.goods_Quantity IS '货物数量（件数）';// +COMMENT ON COLUMN applet_appointment.appointment_state IS '预约打卡状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常：预期未完成操作的）';// +COMMENT ON COLUMN applet_appointment.create_time IS '创建时间'; +COMMENT ON COLUMN applet_appointment.update_time IS '更新时间'; +COMMENT ON COLUMN applet_appointment.is_del IS '是否软删除'; + 需要 司机生份证 + + +-- 5-预约明细 +CREATE TABLE IF NOT EXISTS public.applet_appointment_detail( + id serial, + appointment_id integer DEFAULT NULL, + ship_name varchar(16) DEFAULT NULL, + voy_number varchar(16) DEFAULT NULL, + destination_port varchar(32) DEFAULT NULL, + brand_name varchar(32) DEFAULT NULL, + vin varchar(32) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_appointment_detail_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_appointment_detail.id IS '预约详细id'; +COMMENT ON COLUMN applet_appointment_detail.appointment_id IS '预约id'; +COMMENT ON COLUMN applet_appointment_detail.ship_name IS '船名';// +COMMENT ON COLUMN applet_appointment_detail.voy_number IS '航次号'; +COMMENT ON COLUMN applet_appointment_detail.destination_port IS '目的港';// +COMMENT ON COLUMN applet_appointment_detail.brand_name IS '品牌/名称';// +COMMENT ON COLUMN applet_appointment_detail.vin IS '车架号';// +COMMENT ON COLUMN applet_appointment_detail.create_time IS '创建时间'; +COMMENT ON COLUMN applet_appointment_detail.update_time IS '更新时间'; +COMMENT ON COLUMN applet_appointment_detail.is_del IS '是否软删除'; + + +--6-（签到/完成）打卡信息 +CREATE TABLE IF NOT EXISTS public.applet_punch_clock( + id serial, + users_id integer DEFAULT NULL, + appointment_id integer DEFAULT NULL, + biz_type integer DEFAULT NULL, + queue_number varchar(16), + --approach_date date DEFAULT NULL, + punch_start_time time DEFAULT NULL, + punch_over_time time DEFAULT NULL, + port_area_id integer DEFAULT NULL, + punch_address varchar(256) DEFAULT NULL, + over_address varchar(256) DEFAULT NULL, + punch_clock_type integer, + punch_clock_poi varchar(64) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_punch_clock_pkey PRIMARY KEY (id) +); + +COMMENT ON COLUMN applet_punch_clock.id IS '打卡信息id'; +COMMENT ON COLUMN applet_punch_clock.users_id IS '用户id'; +COMMENT ON COLUMN applet_punch_clock.appointment_id IS '预约Id'; +COMMENT ON COLUMN applet_punch_clock.biz_type IS '业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）'; +COMMENT ON COLUMN applet_punch_clock.queue_number IS '排队编号'; +--COMMENT ON COLUMN applet_punch_clock.approach_date IS '打卡日期'; +COMMENT ON COLUMN applet_punch_clock.start_time IS '签到日期时间'; +COMMENT ON COLUMN applet_punch_clock.punch_over_time IS '完成日期时间'; +COMMENT ON COLUMN applet_punch_clock.port_area_id IS '打卡港区(ID)'; +COMMENT ON COLUMN applet_punch_clock.punch_address IS '签到打卡地点'; +COMMENT ON COLUMN applet_punch_clock.over_address IS '完成打卡地点'; +COMMENT ON COLUMN applet_punch_clock.punch_clock_type IS '打卡类别（1-签到，2-已进港，3-操作中，4-已完成，5-已离港）'; +COMMENT ON COLUMN applet_punch_clock.punch_clock_poi IS '打卡（位置坐标）{"1":poi2,"2",poi2}'; +COMMENT ON COLUMN applet_punch_clock.create_time IS '创建时间'; +COMMENT ON COLUMN applet_punch_clock.update_time IS '更新时间'; +COMMENT ON COLUMN applet_punch_clock.is_del IS '是否软删除'; + + +--7-收车信息 +CREATE TABLE IF NOT EXISTS public.applet_receiving_vehicle( + id serial, + users_id integer DEFAULT NULL, + ship_name varchar(64) DEFAULT NULL, + voy_number varchar(64) DEFAULT NULL, + complete_project_time timestamp(0) DEFAULT NULL, + task_number varchar(32) DEFAULT NULL, + transport_type varchar(64) DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + enter_port_area varchar(32) DEFAULT NULL, + enter_port_time timestamp(0) DEFAULT NULL, + operation_team varchar(16) DEFAULT NULL, + goods_info text DEFAULT NULL, + vehicle_frame_data varchar(2048) DEFAULT NULL, + receiving_state integer DEFAULT 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_receiving_vehicle_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_receiving_vehicle.id IS '收车信息id'; +COMMENT ON COLUMN applet_receiving_vehicle.users_id IS '用户id'; +COMMENT ON COLUMN applet_receiving_vehicle.ship_name IS '船名'; +COMMENT ON COLUMN applet_receiving_vehicle.voy_number IS '航次'; +COMMENT ON COLUMN applet_receiving_vehicle.complete_project_time IS '完工日期时间'; +COMMENT ON COLUMN applet_receiving_vehicle.task_number IS '作业编号'; +COMMENT ON COLUMN applet_receiving_vehicle.transport_type IS '运输方式'; +COMMENT ON COLUMN applet_receiving_vehicle.truck_number IS '车牌号（板车号）'; +COMMENT ON COLUMN applet_receiving_vehicle.enter_port_area IS '进港港区'; +COMMENT ON COLUMN applet_receiving_vehicle.enter_port_time IS '进港日期时间'; +COMMENT ON COLUMN applet_receiving_vehicle.operation_team IS '作业工班'; +COMMENT ON COLUMN applet_receiving_vehicle.goods_info IS '货物信息（type:vehicle/others, +vehicle{品牌/型号/车型/数量/港口或国家/车辆类型/卸货方式：港区作业或客户自提，Json数据}, +others{货名/长/宽/高/重量/数量/港口、国家/卸货方式（港区作业/客户自卸）的Json数据}）'; +COMMENT ON COLUMN applet_receiving_vehicle.vehicle_frame_data IS '车架号数据（[品牌,车架号]的Json数据）'; +COMMENT ON COLUMN applet_receiving_vehicle.receiving_state IS '收车状态（0-默认，未收车，1-已收车，2-已核对)'; +COMMENT ON COLUMN applet_receiving_vehicle.create_time IS '创建时间'; +COMMENT ON COLUMN applet_receiving_vehicle.update_time IS '更新时间'; +COMMENT ON COLUMN applet_receiving_vehicle.is_del IS '是否软删除'; + + +--8-发车信息 +CREATE TABLE IF NOT EXISTS public.applet_departure_vehicle( + id serial, + users_id integer DEFAULT NULL, + ship_name varchar(64) DEFAULT NULL, + voy_number varchar(64) DEFAULT NULL, + complete_project_time timestamp(0) DEFAULT NULL, + task_number varchar(32) DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + receiving_unit varchar(64) DEFAULT NULL, + lading_no varchar(64) DEFAULT NULL, + customs_clearance_nature varchar(32) DEFAULT NULL, + customs_declaration_no varchar(32) DEFAULT NULL, + vehicle_frame_data varchar(1024) DEFAULT NULL, + goods_name varchar(32) DEFAULT NULL, + goods_Quantity integer, + certificate_Preparation_date timestamp(0) DEFAULT NULL, + liberator varchar(32) DEFAULT NULL, + signee varchar(32) DEFAULT NULL, + remarks varchar(256) DEFAULT NULL, + departure_state integer default 0, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_departure_vehicle_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_departure_vehicle.id IS '发车信息Id'; +COMMENT ON COLUMN applet_departure_vehicle.users_id IS '用户id'; +COMMENT ON COLUMN applet_departure_vehicle.ship_name IS '船名'; +COMMENT ON COLUMN applet_departure_vehicle.voy_number IS '航次'; +COMMENT ON COLUMN applet_departure_vehicle.complete_project_time IS '完工日期时间'; +COMMENT ON COLUMN applet_departure_vehicle.task_number IS '作业编号'; +COMMENT ON COLUMN applet_departure_vehicle.truck_number IS '车牌号（板车号）'; +COMMENT ON COLUMN applet_departure_vehicle.receiving_unit IS '收货单位'; +COMMENT ON COLUMN applet_departure_vehicle.lading_no IS '提单号'; +COMMENT ON COLUMN applet_departure_vehicle.customs_clearance_nature IS '通关性质'; +COMMENT ON COLUMN applet_departure_vehicle.customs_declaration_no IS '报关单号'; +COMMENT ON COLUMN applet_departure_vehicle.vehicle_frame_data IS '车架号'; +COMMENT ON COLUMN applet_departure_vehicle.goods_name IS '货名'; +COMMENT ON COLUMN applet_departure_vehicle.goods_Quantity IS '件数'; +COMMENT ON COLUMN applet_departure_vehicle.certificate_Preparation_date IS '制证日期'; +COMMENT ON COLUMN applet_departure_vehicle.liberator IS '放行者'; +COMMENT ON COLUMN applet_departure_vehicle.signee IS '签收者'; +COMMENT ON COLUMN applet_departure_vehicle.remarks IS '备注'; +COMMENT ON COLUMN applet_departure_vehicle.departure_state IS '发车状态（0-默认，未发车，1-已收车，2-已核对）'; +COMMENT ON COLUMN applet_departure_vehicle.create_time IS '创建时间'; +COMMENT ON COLUMN applet_departure_vehicle.update_time IS '更新时间'; +COMMENT ON COLUMN applet_departure_vehicle.is_del IS '是否软删除'; + + +--9-意见反馈 +CREATE TABLE IF NOT EXISTS public.applet_feedback( + id serial, + users_id integer DEFAULT NULL, + nike_name varchar(32) DEFAULT NULL, + feedback_info varchar(1024) DEFAULT NULL, + pictures varchar(256) DEFAULT NULL, + tel_number varchar(64) DEFAULT NULL, + contact_info varchar(64) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT feedback_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_feedback.id IS '意见反馈id'; +COMMENT ON COLUMN applet_feedback.users_id IS '用户id'; +COMMENT ON COLUMN applet_feedback.nike_name IS '昵称'; +COMMENT ON COLUMN applet_feedback.feedback_info IS '意见（限500字）'; +COMMENT ON COLUMN applet_feedback.pictures IS '图片文件名集合，逗号分隔'; +COMMENT ON COLUMN applet_feedback.tel_number IS '联系电话'; +COMMENT ON COLUMN applet_feedback.contact_info IS '联系方式（微信号/qq/邮箱）'; +COMMENT ON COLUMN applet_feedback.create_time IS '创建时间'; +COMMENT ON COLUMN applet_feedback.update_time IS '更新时间'; +COMMENT ON COLUMN applet_feedback.is_del IS '是否软删除'; + + +--10-新手攻略（小程序/客服平台/生产APP操作指南） +CREATE TABLE IF NOT EXISTS public.applet_novice_introduction( + id serial, + sort integer DEFAULT NULL, + title varchar(64) DEFAULT NULL, + content text DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT novice_introduction_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_novice_introduction.id IS '攻略_id'; +COMMENT ON COLUMN applet_novice_introduction.sort IS '类别（1-小程序，2-客服平台，3-生产APP）'; +COMMENT ON COLUMN applet_novice_introduction.title IS '小标题'; +COMMENT ON COLUMN applet_novice_introduction.content IS '内容（html文本，允许包含图片标签）'; +COMMENT ON COLUMN applet_novice_introduction.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_novice_introduction.create_time IS '创建时间'; +COMMENT ON COLUMN applet_novice_introduction.update_time IS '更新时间'; +COMMENT ON COLUMN applet_novice_introduction.is_del IS '是否软删除'; + + +--11-运输方式 +CREATE TABLE IF NOT EXISTS public.applet_transport_types( + id serial, + transport_type_name varchar(64) DEFAULT NULL, + transport_type varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT transport_types_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_transport_types.id IS '运输方式id'; +COMMENT ON COLUMN applet_transport_types.transport_type_name IS '运输方式名称（板车运输/自开）'; +COMMENT ON COLUMN applet_transport_types.transport_type IS '运输方式'; +COMMENT ON COLUMN applet_transport_types.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_transport_types.create_time IS '创建时间'; +COMMENT ON COLUMN applet_transport_types.update_time IS '更新时间'; +COMMENT ON COLUMN applet_transport_types.is_del IS '是否软删除'; + + +--12-港区 +CREATE TABLE IF NOT EXISTS public.applet_port_areas( + id serial, + port_area varchar(64) DEFAULT NULL, + area_center_poi varchar(32) DEFAULT NULL, + punch_range integer DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT port_areas_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_port_areas.id IS '港区id'; +COMMENT ON COLUMN applet_port_areas.port_area IS '港区名'; +COMMENT ON COLUMN applet_port_areas.area_center_poi IS '港区坐标'; +COMMENT ON COLUMN applet_port_areas.punch_range IS '打卡范围（距离港区中心坐标的半径，米）'; +COMMENT ON COLUMN applet_port_areas.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_port_areas.create_time IS '创建时间'; +COMMENT ON COLUMN applet_port_areas.update_time IS '更新时间'; +COMMENT ON COLUMN applet_port_areas.is_del IS '是否软删除'; + + +--13-作业工班 +CREATE TABLE IF NOT EXISTS public.applet_operation_teams( + id serial, + operation_team varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT operation_teams_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_operation_teams.id IS '作业工班id'; +COMMENT ON COLUMN applet_operation_teams.operation_team IS '作业工班'; +COMMENT ON COLUMN applet_operation_teams.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_operation_teams.create_time IS '创建时间'; +COMMENT ON COLUMN applet_operation_teams.update_time IS '更新时间'; +COMMENT ON COLUMN applet_operation_teams.is_del IS '是否软删除'; + + +--14-车辆管理 +CREATE TABLE IF NOT EXISTS public.applet_truck_management( + id serial, + users_id integer DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + cause varchar(256) DEFAULT NULL, + drivers_name varchar(32) DEFAULT NULL, + drivers_phone varchar(32) DEFAULT NULL, + administrators_name varchar(32) DEFAULT NULL, + administrators_phone varchar(32) DEFAULT NULL, + enter_time timestamp(0) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_truck_management_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_truck_management.id IS '车辆管理id'; +COMMENT ON COLUMN applet_truck_management.users_id IS '用户id'; +COMMENT ON COLUMN applet_truck_management.truck_number IS '（加入黑名单的）车牌号'; +COMMENT ON COLUMN applet_truck_management.cause IS '原因'; +COMMENT ON COLUMN applet_truck_management.drivers_name IS '司机姓名'; +COMMENT ON COLUMN applet_truck_management.drivers_phone IS '司机电话'; +COMMENT ON COLUMN applet_truck_management.administrators_name IS '管理员姓名'; +COMMENT ON COLUMN applet_truck_management.administrators_phone IS '管理员电话'; +COMMENT ON COLUMN applet_truck_management.enter_time IS '加入黑名单时间'; +COMMENT ON COLUMN applet_truck_management.create_time IS '创建时间'; +COMMENT ON COLUMN applet_truck_management.update_time IS '更新时间'; +COMMENT ON COLUMN applet_truck_management.is_del IS '是否软删除'; + + +--15-货物类型 +CREATE TABLE IF NOT EXISTS public.applet_goods_types( + id serial, + goods_type_name varchar(64) DEFAULT NULL, + goods_type integer DEFAULT NULL, + sequence_number integer, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT goods_types_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_goods_types.id IS '货物类型id'; +COMMENT ON COLUMN applet_goods_types.goods_type_name IS '货物类型（1-商品车/2-设备/3-其他...）'; +COMMENT ON COLUMN applet_goods_types.goods_type IS '货物类型（1-商品车/2-设备/3-其他...）'; +COMMENT ON COLUMN applet_goods_types.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_goods_types.create_time IS '创建时间'; +COMMENT ON COLUMN applet_goods_types.update_time IS '更新时间'; +COMMENT ON COLUMN applet_goods_types.is_del IS '是否软删除'; + + +--16-进港类型 +CREATE TABLE IF NOT EXISTS public.applet_enter_type( + id serial, + enter_port_type_name varchar(32) DEFAULT NULL, + enter_port_type integer DEFAULT NULL, + sequence_number integer, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_enter_types_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_enter_type.id IS '进港类型id'; +COMMENT ON COLUMN applet_enter_type.enter_port_type_name IS '进港类型名称（1-外贸出口/2-内贸出口/3-外贸进口/4-内贸进口/5-特保区出口/6-特保区进口...）'; +COMMENT ON COLUMN applet_enter_type.enter_port_type IS '进港类型（1/2/3/4/5/6/...）'; +COMMENT ON COLUMN applet_enter_type.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_enter_type.create_time IS '创建时间'; +COMMENT ON COLUMN applet_enter_type.update_time IS '更新时间'; +COMMENT ON COLUMN applet_enter_type.is_del IS '是否软删除'; + + +--17-船名航次 +CREATE TABLE IF NOT EXISTS public.applet_ship_voy( + id serial, + ship_name varchar(32) DEFAULT NULL, + voy_number varchar(32) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_ship_voy_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_ship_voy.id IS '船名航次id'; +COMMENT ON COLUMN applet_ship_voy.ship_name IS '船名'; +COMMENT ON COLUMN applet_ship_voy.voy_number IS '航次编号'; +COMMENT ON COLUMN applet_ship_voy.create_time IS '创建时间'; +COMMENT ON COLUMN applet_ship_voy.update_time IS '更新时间'; +COMMENT ON COLUMN applet_ship_voy.is_del IS '是否软删除'; + + +--18-（运抵）港口 +CREATE TABLE IF NOT EXISTS public.applet_port( + id serial, + ship_voy_id integer DEFAULT NULL, + port_name varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT ports_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_port.id IS '港口id'; +COMMENT ON COLUMN applet_port.ship_voy_id IS '船名航次id'; +COMMENT ON COLUMN applet_port.port_name IS '港口名称'; +COMMENT ON COLUMN applet_port.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_port.create_time IS '创建时间'; +COMMENT ON COLUMN applet_port.update_time IS '更新时间'; +COMMENT ON COLUMN applet_port.is_del IS '是否软删除'; + + +--19-商品车品牌 +CREATE TABLE IF NOT EXISTS public.applet_brand( + id serial, + ship_voy_id integer DEFAULT NULL, + brand varchar(64) DEFAULT NULL, + sequence_number int DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_brand_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_brand.id IS '品牌id'; +COMMENT ON COLUMN applet_brand.ship_voy_id IS '船名航次id'; +COMMENT ON COLUMN applet_brand.brand IS '品牌名称'; +COMMENT ON COLUMN applet_brand.sequence_number IS '顺序号'; +COMMENT ON COLUMN applet_brand.create_time IS '创建时间'; +COMMENT ON COLUMN applet_brand.update_time IS '更新时间'; +COMMENT ON COLUMN applet_brand.is_del IS '是否软删除'; + + +--20-进港指令 +CREATE TABLE IF NOT EXISTS public.applet_entry_instruct( + id serial, + appointment_id integer DEFAULT NULL, + users_id integer DEFAULT NULL, + users_name varchar(32) DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + yard_name varchar(32) DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_entry_instruct_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_entry_instruct.id IS '进港指令id'; +COMMENT ON COLUMN applet_entry_instruct.appointment_id IS '预约id'; +COMMENT ON COLUMN applet_entry_instruct.users_id IS '司机id'; +COMMENT ON COLUMN applet_entry_instruct.users_name IS '司机姓名'; +COMMENT ON COLUMN applet_entry_instruct.truck_number IS '车牌号'; +COMMENT ON COLUMN applet_entry_instruct.yard_name IS '堆场'; +COMMENT ON COLUMN applet_entry_instruct.create_time IS '创建时间'; +COMMENT ON COLUMN applet_entry_instruct.update_time IS '更新时间'; +COMMENT ON COLUMN applet_entry_instruct.is_del IS '是否软删除'; + + +--21-服务配置 +CREATE TABLE IF NOT EXISTS public.applet_service_config( + id serial, + config_name varchar(32) default null, + config_code varchar(32) default null, + config_content varchar(256) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_service_config_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_service_config.id IS '自增id'; +COMMENT ON COLUMN applet_service_config.config_name IS '配置名称（系统服务地址,图片文件存储路径,图片访问路径,小程序appid,小程序密钥secret)'; +COMMENT ON COLUMN applet_service_config.config_code IS '配置代码（100-系统服务地址,200-图片文件存储路径,300-图片访问路径,400-小程序appid,500-小程序密钥secret)'; +COMMENT ON COLUMN applet_service_config.config_content IS '配置信息(文本)'; +COMMENT ON COLUMN applet_service_config.create_time IS '创建时间'; +COMMENT ON COLUMN applet_service_config.update_time IS '更新时间'; +COMMENT ON COLUMN applet_service_config.is_del IS '是否软删除'; + +--22-请求第三方接口 +CREATE TABLE IF NOT EXISTS public.applet_requester( + id serial, + url varchar(256) default null, + param_map varchar(256) default null, + request_type integer default null, + type_description varchar(32) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_requester_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_requester.id IS '自增id'; +COMMENT ON COLUMN applet_requester.url IS 'url（请求服务地址)'; +COMMENT ON COLUMN applet_requester.param_map IS '请求参数（值为空时，需要依赖实参传值。如小程序登录参数：{"appid":"","code":"","secret":"","grant_type":"authorization_code"}）'; +COMMENT ON COLUMN applet_requester.request_type IS '请求类型(1001-1999)'; +COMMENT ON COLUMN applet_requester.type_description IS '类别说明'; +COMMENT ON COLUMN applet_requester.create_time IS '创建时间'; +COMMENT ON COLUMN applet_requester.update_time IS '更新时间'; +COMMENT ON COLUMN applet_requester.is_del IS '是否软删除'; + +--23-用户登录日志 +CREATE TABLE IF NOT EXISTS public.applet_login_log( + id serial, + wx_nike varchar(32), + wx_openid varchar(32) DEFAULT NULL, + login_time timestamp default null, + ip varchar(32) default null, + area varchar(32) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_login_log_pkey PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_login_log.id IS '自增id'; +COMMENT ON COLUMN applet_login_log.wx_nike IS '微信昵称'; +COMMENT ON COLUMN applet_login_log.wx_openid IS '微信openid'; +COMMENT ON COLUMN applet_login_log.login_time IS '登录时间'; +COMMENT ON COLUMN applet_login_log.ip IS 'ip地址'; +COMMENT ON COLUMN applet_login_log.area IS '地区（省市）'; +COMMENT ON COLUMN applet_login_log.create_time IS '创建时间'; +COMMENT ON COLUMN applet_login_log.update_time IS '更新时间'; +COMMENT ON COLUMN applet_login_log.is_del IS '是否软删除'; + +--24-自定义表头 +CREATE TABLE IF NOT EXISTS public.applet_tb_head( + id serial, + table_name varchar(32), + table_code varchar(32) default null, + head_jason varchar(512) default null, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0, + CONSTRAINT applet_tb_head PRIMARY KEY (id) +); +COMMENT ON COLUMN applet_tb_head.id IS '自增id'; +COMMENT ON COLUMN applet_tb_head.table_name IS '表名'; +COMMENT ON COLUMN applet_tb_head.table_code IS '标识代码'; +COMMENT ON COLUMN applet_tb_head.head_jason IS '表头Json'; +COMMENT ON COLUMN applet_tb_head.create_time IS '创建时间'; +COMMENT ON COLUMN applet_tb_head.update_time IS '更新时间'; +COMMENT ON COLUMN applet_tb_head.is_del IS '是否软删除'; + + +--25--消息表 +CREATE TABLE IF NOT EXISTS public.applet_message( + id varchar(32), + type integer DEFAULT NULL, + type_content varchar(256)DEFAULT NULL, + truck_number varchar(32) DEFAULT NULL, + is_read integer DEFAULT NULL, + create_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + update_time timestamp(3) default ('now'::text)::timestamp(0) with time zone, + is_del integer DEFAULT 0 +); +COMMENT ON COLUMN applet_message.id IS 'id'; +COMMENT ON COLUMN applet_message.type IS '1-收车 2-提车'; +COMMENT ON COLUMN applet_message.type_content IS '1-收车 2-提车'; +COMMENT ON COLUMN applet_message.truck_number IS '板车号'; +COMMENT ON COLUMN applet_message.is_read IS '0-未读 1-已读'; +COMMENT ON COLUMN applet_message.create_time IS '创建时间'; +COMMENT ON COLUMN applet_message.update_time IS '更新时间'; +COMMENT ON COLUMN applet_message.is_del IS '是否软删除'; \ No newline at end of file diff --git a/mapper/target/classes/static/tableUpdate.txt b/mapper/target/classes/static/tableUpdate.txt new file mode 100644 index 0000000..448095d --- /dev/null +++ b/mapper/target/classes/static/tableUpdate.txt @@ -0,0 +1,3 @@ +-+1. 预约表applet_appointment head_frame_number 修改为 truck_vin +2. 预约表applet_punch_clock start_time 数据类型time 改为datetime + over_time 数据类型time 改为datetime diff --git a/mapper/target/mapper-1.0-SNAPSHOT.jar b/mapper/target/mapper-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..665141f Binary files /dev/null and b/mapper/target/mapper-1.0-SNAPSHOT.jar differ diff --git a/mapper/target/maven-archiver/pom.properties b/mapper/target/maven-archiver/pom.properties new file mode 100644 index 0000000..d03455b --- /dev/null +++ b/mapper/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jul 24 13:26:03 CST 2024 +version=1.0-SNAPSHOT +groupId=org.example +artifactId=mapper diff --git a/mapper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mapper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..921cbcb --- /dev/null +++ b/mapper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,33 @@ +com\haitongauto\mapper\client\TruckExtendMapper.class +com\haitongauto\mapper\base\LoginLogMapper.class +com\haitongauto\mapper\base\PunchClockMapper.class +com\haitongauto\mapper\base\RequesterMapper.class +com\haitongauto\mapper\base\AppointmentDetailMapper.class +com\haitongauto\mapper\base\ReceivingDetailMapper.class +com\haitongauto\mapper\base\TruckManagementMapper.class +com\haitongauto\mapper\base\ServiceConfigMapper.class +com\haitongauto\mapper\base\PortAreasMapper.class +com\haitongauto\mapper\base\NoviceIntroductionMapper.class +com\haitongauto\mapper\base\ReceivingVehicleMapper.class +com\haitongauto\mapper\client\OtherExtendMapper.class +com\haitongauto\mapper\base\FeedbackMapper.class +com\haitongauto\mapper\base\DepartureDetailMapper.class +com\haitongauto\mapper\base\TableHeadMapper.class +com\haitongauto\mapper\admin\AnnouncementAdminMapper.class +com\haitongauto\mapper\base\EntryInstructMapper.class +com\haitongauto\mapper\base\DepartureVehicleMapper.class +com\haitongauto\mapper\admin\UsersAdminMapper.class +com\haitongauto\mapper\admin\FeedbackAdminMapper.class +com\haitongauto\mapper\base\UsersMapper.class +com\haitongauto\mapper\admin\StatisticsAdminMapper.class +com\haitongauto\mapper\base\TruckMapper.class +com\haitongauto\mapper\client\PunchClockExtendMapper.class +com\haitongauto\mapper\base\AnnouncementMapper.class +com\haitongauto\mapper\client\AppointmentExtendMapper.class +com\haitongauto\mapper\admin\PunchClockAdminMapper.class +com\haitongauto\mapper\base\AppointmentMapper.class +com\haitongauto\mapper\admin\NoviceIntroductionAdminMapper.class +com\haitongauto\mapper\base\MessageMapper.class +com\haitongauto\mapper\admin\AppointmentAdminMapper.class +com\haitongauto\mapper\base\DicMapper.class +com\haitongauto\mapper\base\DataBaseMapper.class diff --git a/mapper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mapper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..19ca7c2 --- /dev/null +++ b/mapper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,33 @@ +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\EntryInstructMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\client\AppointmentExtendMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\UsersAdminMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\FeedbackMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\client\PunchClockExtendMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\TruckManagementMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\ServiceConfigMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\MessageMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\NoviceIntroductionMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\PortAreasMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\DicMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\ReceivingDetailMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\UsersMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\TruckMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\DepartureVehicleMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\PunchClockMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\LoginLogMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\NoviceIntroductionAdminMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\DataBaseMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\AnnouncementAdminMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\RequesterMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\FeedbackAdminMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\DepartureDetailMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\client\OtherExtendMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\client\TruckExtendMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\AnnouncementMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\AppointmentAdminMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\AppointmentMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\PunchClockAdminMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\AppointmentDetailMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\ReceivingVehicleMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\base\TableHeadMapper.java +F:\Codes\rtos\v4\mini-service-v4\mapper\src\main\java\com\haitongauto\mapper\admin\StatisticsAdminMapper.java diff --git a/models/models.iml b/models/models.iml new file mode 100644 index 0000000..c7479b5 --- /dev/null +++ b/models/models.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/models/pom.xml b/models/pom.xml new file mode 100644 index 0000000..7aeaa2f --- /dev/null +++ b/models/pom.xml @@ -0,0 +1,53 @@ + + + + rtos-wh + org.example + 1.0-SNAPSHOT + + 4.0.0 + + models + + + 1.8 + 1.8 + + + + + org.projectlombok + lombok + 1.18.26 + + + com.alibaba + easyexcel + 3.2.1 + compile + + + com.fasterxml.jackson.core + jackson-annotations + + + com.alibaba + fastjson + 2.0.40 + compile + + + top.jfunc.json + Json-Gson + 1.0 + + + top.jfunc.json + Json-Gson + 1.0 + + + + \ No newline at end of file diff --git a/models/src/main/java/com/haitongauto/models/dto/AnnouncementsDto.java b/models/src/main/java/com/haitongauto/models/dto/AnnouncementsDto.java new file mode 100644 index 0000000..8978cde --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/AnnouncementsDto.java @@ -0,0 +1,20 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +import java.util.Date; +@Data +public class AnnouncementsDto { + private String id; //- '公告id'; + private String title; //- '标题'; + private Integer sort; //- '类别（1-小程序，2-客服平台）'; + private String sort_name; //- '类别名称（1-小程序，2-客服平台）'; + private String abstracts; //-'摘要'; + private String announcement; //-'公告内容'; + private String announcement_text; + private String author; //-'作者'; + private Integer reading_volume; //-'阅读量'; + private String create_time; //-'创建时间'; + private String update_time; //-'更新时间'; + private Integer is_del; //-'是否软删除'; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/AppointmentDto.java b/models/src/main/java/com/haitongauto/models/dto/AppointmentDto.java new file mode 100644 index 0000000..e46a112 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/AppointmentDto.java @@ -0,0 +1,63 @@ +package com.haitongauto.models.dto; + +import lombok.Data; +import org.apache.poi.hpsf.Decimal; + +@Data +public class AppointmentDto { + /** 预约信息id */ + private String id ; + /** 用户id */ + private String users_id ; + /** 运输方式（1-板车运输，2-自开） */ + private String transport_type ; + /** 运输方式名称（1-板车运输，2-自开） */ + private String transport_type_name ; + /** 板车号 */ + private String truck_number ; + /** 身份证号 */ + private String id_code ; + /** 手机号 */ + private String tel_number ; + /** 车头车架号 */ + private String truck_vin ; + /** 板车自重（吨） */ + private Double vehicle_weight ; + /** 车架重（吨） */ + private Double vehicle_frame_weight ; + /** 行驶证编号 */ + private String driving_license ; + /** 预约进场日期 */ + private String approach_date ; + /** 进港港区Id */ + private String port_area_id ; + /** 进港港区名 */ + private String port_area_name; + /** 业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）【该字段貌似已取消】 */ + private String biz_type ; + /** 进港类型（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口） */ + private String enter_type ; + /** 预约类型(1-普通码头预约，2-特保区预约) 新增字段 */ + private Integer appointment_type ; + /** 预约类型名称(1-普通码头预约，2-特保区预约) 新增字段 */ + private String appointment_type_name ; + + /** 进港类型名（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口） */ + private String enter_type_name ; + /** 货物类型（1-商品车,2-设备,3-其他） */ + private String goods_type ; + /** 货物类型名（1-商品车,2-设备,3-其他） */ + private String goods_type_name ; + /** 货物数量（件数） */ + private Integer goods_quantity ; + /** 预约打卡状态（1-已预约，2-已签到，3-已完成，4-已取消，9-异常：预期未完成操作的） */ + private Integer appointment_state ; + /** 取消预约时间 */ + private String cancel_time ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/AppointmentPostDto.java b/models/src/main/java/com/haitongauto/models/dto/AppointmentPostDto.java new file mode 100644 index 0000000..8f247cb --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/AppointmentPostDto.java @@ -0,0 +1,16 @@ +package com.haitongauto.models.dto; +import com.haitongauto.models.pojo.Appointment; +import com.haitongauto.models.pojo.AppointmentDetail; +import lombok.Data; + +import java.util.List; + + +@Data +public class AppointmentPostDto { + private Appointment appointment; + //private String appointment; + + private List appointmentDetailList; + //private String appointmentDetailList; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/AppointmentQuery.java b/models/src/main/java/com/haitongauto/models/dto/AppointmentQuery.java new file mode 100644 index 0000000..2669204 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/AppointmentQuery.java @@ -0,0 +1,49 @@ +package com.haitongauto.models.dto; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +@Data +public class AppointmentQuery { + //进场预约类型,司机名称,司机手机号,身份证号,板车号,车头车架号,车自重,车架重,行驶证,进港港区,进港类型,运输方式,进场日期,货物类型,货物数量,预约状态,预约时间,操作人 + @ExcelProperty(value = "预约id") + private String appointment_id; //-'预约id'; + @ExcelProperty(value = "进场预约类型", order = 1) + private String appointment_type_content; + @ExcelProperty(value = "司机名称", order = 2) + private String users_name; //司机名称 + @ExcelProperty(value = "司机手机号", order = 3) + private String tel_number; //-'手机号'; + @ExcelProperty(value = "身份证号", order = 4) + private String id_code; //身份证号码 + @ExcelProperty(value = "板车号", order = 5) + private String truck_number; //-'板车号'; + @ExcelProperty(value = "车头车架号", order = 6) + private String head_frame_number; //-'车头车架号'; + @ExcelProperty(value = "板车自重" ,order = 7) + private Double vehicle_weight; //-'板车自重'; + @ExcelProperty(value = "车架重",order = 8) + private Double vehicle_frame_weight; //-'车架重'; + @ExcelProperty(value = "行驶证ID",order = 9) + private String driving_license_id; //-'行驶证ID'; + @ExcelProperty(value = "进港港区",order = 10) + private String port_area_name; //-'进港港区'; + @ExcelProperty(value = "进港类型",order = 11) + private String enter_type_name; //-'进港类型'; + @ExcelProperty(value = "运输方式",order = 12) + private String transport_type_name; //-'运输方式'; + @ExcelProperty(value = "进场日期",order = 13) + private String approach_date; //-'进场日期'; + @ExcelProperty(value = "货物类型",order = 14) + private String goods_type_name; //-'货物类型（商品车/设备...）'; + @ExcelProperty(value = "货物数量",order = 15) + private Integer goods_Quantity; //-'货物数量（件数）'; + @ExcelProperty(value = "预约状态值",order = 16) + private Integer appointment_state; //-预约状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常）; + @ExcelProperty(value = "预约状态",order = 17) + private String appointment_state_content; //-预约状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常）; + @ExcelProperty(value = "预约时间",order = 18) + private String approach_time; //-'预约时间'; + @ExcelProperty(value = "操作人",order = 19) + private String operator; //-' 操作人'; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/AppointmentQueryExl.java b/models/src/main/java/com/haitongauto/models/dto/AppointmentQueryExl.java new file mode 100644 index 0000000..fa7d3de --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/AppointmentQueryExl.java @@ -0,0 +1,44 @@ +package com.haitongauto.models.dto; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +@Data +public class AppointmentQueryExl { + //进场预约类型,司机名称,司机手机号,身份证号,板车号,车头车架号,车自重,车架重,行驶证,进港港区,进港类型,运输方式,进场日期,货物类型,货物数量,预约状态,预约时间,操作人 + @ExcelProperty(value = "进场预约类型", order = 1) + private String appointment_type_content; + @ExcelProperty(value = "司机名称", order = 2) + private String users_name; + @ExcelProperty(value = "司机手机号", order =3) + private String tel_number; + @ExcelProperty(value = "身份证号", order = 4) + private String id_code; + @ExcelProperty(value = "板车号", order = 5) + private String truck_number; + @ExcelProperty(value = "车头车架号", order = 6) + private String truck_vin; + @ExcelProperty(value = "车自重", order = 7) + private Double vehicle_weight; + @ExcelProperty(value = "车架重", order = 8) + private Double vehicle_frame_weight; + @ExcelProperty(value = "行驶证",order = 9) + private String driving_license; + @ExcelProperty(value = "进港港区",order = 10) + private String port_area_name; + @ExcelProperty(value = "进港类型",order = 11) + private String enter_type_name; + @ExcelProperty(value = "运输方式",order = 12) + private String transport_type_name; + @ExcelProperty(value = "进场日期",order = 13) + private String approach_date; + @ExcelProperty(value = "货物类型",order = 14) + private String goods_type_name; + @ExcelProperty(value = "货物数量",order = 15) + private Integer goods_quantity; + @ExcelProperty(value = "预约状态",order = 16) + private String appointment_state_content; //-预约状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常）; + @ExcelProperty(value = "预约时间",order = 17) + private String approach_time; //-'预约时间'; + @ExcelProperty(value = "操作人",order = 18) + private String operator; //-' 操作人'; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/Appointment_Dto.java b/models/src/main/java/com/haitongauto/models/dto/Appointment_Dto.java new file mode 100644 index 0000000..0b0b47f --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/Appointment_Dto.java @@ -0,0 +1,21 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +public class Appointment_Dto { + private String arrivalType; + private String printStatus; + private String trailerNo; + + private String goodsAmount; + private String bvmId; + private String arrivePortTime; + + private String potId; + private String pamId; + private String phoneNumber; + + private String transType; + private String ttiId; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/CurrentDayPunchClockDto.java b/models/src/main/java/com/haitongauto/models/dto/CurrentDayPunchClockDto.java new file mode 100644 index 0000000..74c676e --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/CurrentDayPunchClockDto.java @@ -0,0 +1,29 @@ +package com.haitongauto.models.dto; + +import com.haitongauto.models.pojo.PunchClock; +import lombok.Data; + +import java.util.List; + +/** + * 当天的打卡DTO + */ + +@Data +public class CurrentDayPunchClockDto { + /** + * 今天的打卡记录 + */ + private List punchClockList; + + /** + * 总工时 + */ + private double totalWorkingHours; + + /** + * 打卡次数 + */ + private Integer totalPunchClockCount; + +} diff --git a/models/src/main/java/com/haitongauto/models/dto/DataForMessage.java b/models/src/main/java/com/haitongauto/models/dto/DataForMessage.java new file mode 100644 index 0000000..5ab7e4c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/DataForMessage.java @@ -0,0 +1,14 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +public class DataForMessage { + private String access_token; //接口调用凭证，该参数为 URL 参数，非 Body 参数。使用access_token或者authorizer_access_token + private String template_id; //所需下发的订阅模板id + private String page; //点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转 + private String touser; //接收者（用户）的 openid + private String data; //模板内容，格式形如 { "key1": { "value": any }, "key2": { "value": any } }的object + private String miniprogram_state; //跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版 + private String lang; //进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN +} diff --git a/models/src/main/java/com/haitongauto/models/dto/Details.java b/models/src/main/java/com/haitongauto/models/dto/Details.java new file mode 100644 index 0000000..13974e9 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/Details.java @@ -0,0 +1,10 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +//商品车详情之品牌、车架号 +@Data +public class Details { + private String brand; //品牌 + private String vin; //车架号 +} diff --git a/models/src/main/java/com/haitongauto/models/dto/DicDto.java b/models/src/main/java/com/haitongauto/models/dto/DicDto.java new file mode 100644 index 0000000..1fa040c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/DicDto.java @@ -0,0 +1,14 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +/** + * 字典DTO + */ +public class DicDto { + private String id; + private String text; + + +} diff --git a/models/src/main/java/com/haitongauto/models/dto/EnterPortTypeDto.java b/models/src/main/java/com/haitongauto/models/dto/EnterPortTypeDto.java new file mode 100644 index 0000000..c3e8c74 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/EnterPortTypeDto.java @@ -0,0 +1,24 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +/** + * 进港类型Dto + */ +public class EnterPortTypeDto { + private String eteCode; + /** + * 进港类型值 + */ + private String eteType; + /** + * 进港类型名称 + */ + private String eteBusinesstp; + /** + * 业务类型名称 + */ + private String eteBusinesstpDesc; + +} diff --git a/models/src/main/java/com/haitongauto/models/dto/EnterPortTypeDtol.java b/models/src/main/java/com/haitongauto/models/dto/EnterPortTypeDtol.java new file mode 100644 index 0000000..a925f13 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/EnterPortTypeDtol.java @@ -0,0 +1,25 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +public class EnterPortTypeDtol { + + /** + * 进港类型值 + */ + private String id; + /** + * 进港类型名称 + */ + private String text; + + /** + * 进港类型值 + */ + private String eteBusinesstp; + /** + * 业务类型名称 + */ + private String eteBusinesstpDesc; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/Pages.java b/models/src/main/java/com/haitongauto/models/dto/Pages.java new file mode 100644 index 0000000..3e61bd0 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/Pages.java @@ -0,0 +1,16 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +/** + * 分页参数类 + */ +@Data +public class Pages { + private Integer pageNum; //当前页码 + private Integer pageSize; //每页记录条数 + private Integer pageCount; //总页数 + private long recordTotal; //记录总数 + private Integer unReadSize; //未读条数 + +} diff --git a/models/src/main/java/com/haitongauto/models/dto/PalletTruckAndUsers.java b/models/src/main/java/com/haitongauto/models/dto/PalletTruckAndUsers.java new file mode 100644 index 0000000..0c41a5d --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/PalletTruckAndUsers.java @@ -0,0 +1,11 @@ +package com.haitongauto.models.dto; + +import com.haitongauto.models.pojo.Truck; +import com.haitongauto.models.pojo.Users; +import lombok.Data; + +@Data +public class PalletTruckAndUsers { + private Truck plateNumber; + private Users users; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/PunchClockQuery.java b/models/src/main/java/com/haitongauto/models/dto/PunchClockQuery.java new file mode 100644 index 0000000..f4f5acd --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/PunchClockQuery.java @@ -0,0 +1,46 @@ +package com.haitongauto.models.dto; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalTime; + +@Data +public class PunchClockQuery { + //业务类型,进港类型,进场日期,进港港区,司机名称,手机号,板车号,预约时间,签到时间,完工打卡时间,签到状态(是否),完工打卡状态,签到地址,完工打卡地址,排队编号,前面车辆数 + @ExcelProperty(value = "打卡id") + private String punch_clock_id; //-'打卡id'; + @ExcelProperty(value = "业务类型") + private String biz_type_name; //-'业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）';//貌似已经取消 + @ExcelProperty(value = "进港类型") + private String enter_type_name; //-'进港类型'; + @ExcelProperty(value = "进场日期") + private String approach_date; //-'预约进场日期'; + @ExcelProperty(value = "进港港区") + private String port_area_name; //-'进港港区'; + @ExcelProperty(value = "司机名称") + private String users_name; //司机名称 + @ExcelProperty(value = "手机号") + private String tel_number; //-'手机号'; + @ExcelProperty(value = "板车号") + private String truck_number; //-'板车号'; + @ExcelProperty(value = "预约时间") + private String approach_time; //-'预约时间'; + @ExcelProperty(value = "签到打卡时间") + private String punch_start_time; //-'签到打卡时间（HH:mm:ss）'; + @ExcelProperty(value = "完成打卡时间") + private String punch_over_time; //-'完成打卡时间（HH:mm:ss）'; + @ExcelProperty(value = "签到状态") + private String is_start; //-签到状态（正常/缺卡）; + @ExcelProperty(value = "完卡状态") + private String is_over; //-完卡状态（正常/缺卡）; + @ExcelProperty(value = "签到打卡地点") + private String punch_address; //-签到打卡地点 + @ExcelProperty(value = "完成打卡地点") + private String over_address; //-完成打卡地点 + @ExcelProperty(value = "排队编号") + private String queue_number; //-排队编号 + @ExcelProperty(value = "前面车辆数") + private Integer befor_num; //- 前面车辆数 +} diff --git a/models/src/main/java/com/haitongauto/models/dto/PunchClockQueryExl.java b/models/src/main/java/com/haitongauto/models/dto/PunchClockQueryExl.java new file mode 100644 index 0000000..245adcf --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/PunchClockQueryExl.java @@ -0,0 +1,41 @@ +package com.haitongauto.models.dto; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +@Data +public class PunchClockQueryExl { + //业务类型,进港类型,进场日期,进港港区,司机名称,手机号,板车号,预约时间,签到时间,完工打卡时间,签到状态(是否),完工打卡状态,签到地址,完工打卡地址,排队编号,前面车辆数 + @ExcelProperty(value = "业务类型") + private String biz_type_name; //-'业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）';//貌似已经取消 + @ExcelProperty(value = "进港类型") + private String enter_type_name; //-'进港类型'; + @ExcelProperty(value = "进场日期") + private String approach_date; //-'预约进场日期'; + @ExcelProperty(value = "进港港区") + private String port_area_name; //-'进港港区'; + @ExcelProperty(value = "签到状态") + private String is_start; //-签到状态（正常/缺卡）; + @ExcelProperty(value = "完卡状态") + private String is_over; //-完卡状态（正常/缺卡）; + @ExcelProperty(value = "司机名称") + private String users_name; //司机名称 + @ExcelProperty(value = "手机号") + private String tel_number; //-'手机号'; + @ExcelProperty(value = "板车号") + private String truck_number; //-'板车号'; + @ExcelProperty(value = "预约时间") + private String approach_time; //-'预约时间'; + @ExcelProperty(value = "签到打卡时间") + private String punch_start_time; //-'签到打卡时间（HH:mm:ss）'; + @ExcelProperty(value = "完成打卡时间") + private String punch_over_time; //-'完成打卡时间（HH:mm:ss）'; + @ExcelProperty(value = "签到打卡地点") + private String punch_address; //-签到打卡地点 + @ExcelProperty(value = "完成打卡地点") + private String over_address; //-完成打卡地点 + @ExcelProperty(value = "排队编号") + private String queue_number; //-排队编号 + @ExcelProperty(value = "前面车辆数") + private Integer befor_num; //- 前面车辆数 +} diff --git a/models/src/main/java/com/haitongauto/models/dto/RecAndDepExcelDto.java b/models/src/main/java/com/haitongauto/models/dto/RecAndDepExcelDto.java new file mode 100644 index 0000000..2f72e2e --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/RecAndDepExcelDto.java @@ -0,0 +1,12 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +public class RecAndDepExcelDto { + + private String text1; + private String text2; + private String text3; + private String text4; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/Responser.java b/models/src/main/java/com/haitongauto/models/dto/Responser.java new file mode 100644 index 0000000..47988ed --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/Responser.java @@ -0,0 +1,10 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +@Data +public class Responser { + private Integer code; + private String message; + private Object data; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/VehicleDetails.java b/models/src/main/java/com/haitongauto/models/dto/VehicleDetails.java new file mode 100644 index 0000000..e4961d2 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/VehicleDetails.java @@ -0,0 +1,14 @@ +package com.haitongauto.models.dto; + +import lombok.Data; + +import java.util.List; + +//预约信息中的货物（商品车详情） +@Data +public class VehicleDetails { + private String ship_name; //船名 + private String port_name; //航次 + private List
Details; //{品牌，车架号} +} + diff --git a/models/src/main/java/com/haitongauto/models/dto/app/CarOperationCountRespDTO.java b/models/src/main/java/com/haitongauto/models/dto/app/CarOperationCountRespDTO.java new file mode 100644 index 0000000..4d1f039 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/app/CarOperationCountRespDTO.java @@ -0,0 +1,59 @@ +package com.haitongauto.models.dto.app; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 板车作业统计 + */ +@Data +public class CarOperationCountRespDTO implements Serializable { + /** + * 已预约板车数 + */ + private Integer reserveCarNumber; + + /** + * 取消预约板车数 + */ + private Integer cancelReserveCarNumber; + + /** + * 签到打卡板车数 + */ + private Integer startSignCarNumber; + + /** + * 完工打卡板车数 + */ + private Integer finishSignCarNumber; + + /** + * 发送指令板车数 + */ + private Integer sendInstructCarNumber; + + /** + * 外贸出口板车数 + */ + private Integer wexportCarNumber; + + /** + * 外贸进口板车数 + */ + private Integer wimportCarNumber; + + /** + * 内贸出口板车数 + */ + private Integer nexportCarNumber; + + /** + * 内贸进口板车数 + */ + private Integer nimportCarNumber; + + +} \ No newline at end of file diff --git a/models/src/main/java/com/haitongauto/models/dto/app/CarPalletTrafficInfoRespDTO.java b/models/src/main/java/com/haitongauto/models/dto/app/CarPalletTrafficInfoRespDTO.java new file mode 100644 index 0000000..65a03be --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/app/CarPalletTrafficInfoRespDTO.java @@ -0,0 +1,44 @@ +package com.haitongauto.models.dto.app; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 板车通行信息统计 + */ +@Data +public class CarPalletTrafficInfoRespDTO implements Serializable { + + /** + * 闸口板车进港阀值预警次数 + */ + private Integer gateCarEntryWarnNumber; + + + /** + * 自动进闸口板车数 + */ + private Integer autoEntryVehicleCarNumber; + + /** + * 人工抬杆板车数 + */ + private Integer poleRodCarNumber; + + /** + * 待进港通行板车数 + */ + private Integer unPortCarNumber; + + /** + * 已进港板车数 + */ + private Integer inPortCarNumber; + + /** + * 已离港板车数 + */ + private Integer leavePortCarNumber; +} \ No newline at end of file diff --git a/models/src/main/java/com/haitongauto/models/dto/app/ChuanItem.java b/models/src/main/java/com/haitongauto/models/dto/app/ChuanItem.java new file mode 100644 index 0000000..29b08c2 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/app/ChuanItem.java @@ -0,0 +1,15 @@ +package com.haitongauto.models.dto.app; + +import lombok.Data; + +import java.util.List; + +@Data +public class ChuanItem { + private Boolean isOpen; + private String ship_name; + private String ship_id; + private String port_name; + private String port_name_id; + private List commercial_vehicle_details; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/app/CommercialVehicleDetail.java b/models/src/main/java/com/haitongauto/models/dto/app/CommercialVehicleDetail.java new file mode 100644 index 0000000..82fe554 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/app/CommercialVehicleDetail.java @@ -0,0 +1,13 @@ +package com.haitongauto.models.dto.app; + +import lombok.Data; + +import java.util.List; + +@Data +public class CommercialVehicleDetail { + private Boolean isOpen; + private String brand; + private String brand_id; + private List vehicle_frame_num; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/app/GateCarNumberRespDTO.java b/models/src/main/java/com/haitongauto/models/dto/app/GateCarNumberRespDTO.java new file mode 100644 index 0000000..baf56df --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/app/GateCarNumberRespDTO.java @@ -0,0 +1,20 @@ +package com.haitongauto.models.dto.app; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class GateCarNumberRespDTO implements Serializable { + + /** + * 道口号 + */ + private String gateNo; + + /** + * 道口号板车数 + */ + private Integer gateCarNumber; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/app/Vin.java b/models/src/main/java/com/haitongauto/models/dto/app/Vin.java new file mode 100644 index 0000000..1a697d7 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/app/Vin.java @@ -0,0 +1,11 @@ +package com.haitongauto.models.dto.app; + +import lombok.Data; + +import java.util.List; + +@Data +public class Vin { + private String id; + private String vin; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/open/Appointment_Dto.java b/models/src/main/java/com/haitongauto/models/dto/open/Appointment_Dto.java new file mode 100644 index 0000000..50f89e6 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/open/Appointment_Dto.java @@ -0,0 +1,21 @@ +package com.haitongauto.models.dto.open; + +import lombok.Data; + +@Data +public class Appointment_Dto { + private String arrivalType; + private String printStatus; + private String trailerNo; + + private String goodsAmount; + private String bvmId; + private String arrivePortTime; + + private String potId; + private String pamId; + private String phoneNumber; + + private String transType; + private String ttiId; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/open/GoodsInfo.java b/models/src/main/java/com/haitongauto/models/dto/open/GoodsInfo.java new file mode 100644 index 0000000..5493867 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/open/GoodsInfo.java @@ -0,0 +1,13 @@ +package com.haitongauto.models.dto.open; + +import lombok.Data; + +@Data +public class GoodsInfo { + private String trdId; + private String ttiId; + private String spmId; + private String brdId; + private String vinCode; + +} diff --git a/models/src/main/java/com/haitongauto/models/dto/open/TruckUser.java b/models/src/main/java/com/haitongauto/models/dto/open/TruckUser.java new file mode 100644 index 0000000..bff610c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/open/TruckUser.java @@ -0,0 +1,40 @@ +package com.haitongauto.models.dto.open; + +import lombok.Data; + +@Data +public class TruckUser { + /** 板车id */ + private String id ; + /** 微信openid */ + private String wx_openid; + /** 用户id */ + private String users_id ; + /** 用户姓名 */ + private String users_name ; + /** 身份证 */ + private String id_code ; + /** 车牌号 */ + private String truck_number ; + /** 行驶证ID */ + private String driving_license_id ; + /** 司机电话 */ + private String tel_number ; + /** 车头车架号 */ + private String head_frame_number ; + /** 车辆自重 */ + private Double vehicle_weight ; + /** 车架重 */ + private Double vehicle_frame_weight ; + + /** 行驶证（扫描件） */ + private String driving_license ; + /** 板车状态（1-默认，0-其他，4-拉黑） */ + private Integer truck_state ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/dto/open/YardGoodsStateRespDTO.java b/models/src/main/java/com/haitongauto/models/dto/open/YardGoodsStateRespDTO.java new file mode 100644 index 0000000..6a4d8ea --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/dto/open/YardGoodsStateRespDTO.java @@ -0,0 +1,16 @@ +package com.haitongauto.models.dto.open; + +import lombok.Data; + +@Data +public class YardGoodsStateRespDTO { + /*** 车架号*/ + private String vinCode; + + /*** 在场状态: 1是 0否*/ + private Integer inYardFlag; + + /*** 是否调拨: 1是 0否*/ + private String isAllocate; + +} diff --git a/models/src/main/java/com/haitongauto/models/forward/AppointForward.java b/models/src/main/java/com/haitongauto/models/forward/AppointForward.java new file mode 100644 index 0000000..5bd4bc7 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/forward/AppointForward.java @@ -0,0 +1,42 @@ +package com.haitongauto.models.forward; + +import lombok.Data; + +import java.util.List; + +/** + * 转发预约 + */ +@Data +public class AppointForward { + //"openId": "oBFJt5KzWJPJHHRpYPEOWvTUvqjA", + //"truckNo":"沪A88888", + //"orderTm":"2024-1-1 10:20:00", + //"orderType":"外贸出口", + //"whafType":"外高桥", + //"godType":"商品车", + //"godNum":2, + //"phone":"13118057744", + //"dataList": + + /** 预约id*/ + //private String Id; + /** openId*/ + private String openId; + /** 板车号*/ + private String truckNo; + /** 预约时间*/ + private String orderTm; + /** 进港类型*/ + private String orderType; + /** 港区*/ + private String whafType; + /** 货物类型*/ + private String godType; + /** 货物数量*/ + private Integer godNum; + /** 手机号*/ + private String phone; + /** 预约明细*/ + private List dataList; +} diff --git a/models/src/main/java/com/haitongauto/models/forward/AppointOverState.java b/models/src/main/java/com/haitongauto/models/forward/AppointOverState.java new file mode 100644 index 0000000..8582fe6 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/forward/AppointOverState.java @@ -0,0 +1,17 @@ +package com.haitongauto.models.forward; + +import lombok.Data; + +@Data +public class AppointOverState { + //"openId": "oBFJt5KzWJPJHHRpYPEOWvTUvqjA", + //"truckNo":"沪A88888", + //"workTm":"2024-1-1 10:20:00" + + /*** 微信id*/ + private String openId; + /*** 板车号*/ + private String truckNo; + /*** 完成时间*/ + private String workTm; +} diff --git a/models/src/main/java/com/haitongauto/models/forward/AppointOverStateDto.java b/models/src/main/java/com/haitongauto/models/forward/AppointOverStateDto.java new file mode 100644 index 0000000..4c4e66c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/forward/AppointOverStateDto.java @@ -0,0 +1,16 @@ +package com.haitongauto.models.forward; + +import lombok.Data; + +@Data +public class AppointOverStateDto { + /*** 預約id*/ + private String appointmentId; + + /*** 微信id*/ + private String openId; + /*** 板车号*/ + private String truckNo; + /*** 完成时间*/ + private String workTm; +} diff --git a/models/src/main/java/com/haitongauto/models/forward/ForwardRes.java b/models/src/main/java/com/haitongauto/models/forward/ForwardRes.java new file mode 100644 index 0000000..348f741 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/forward/ForwardRes.java @@ -0,0 +1,17 @@ +package com.haitongauto.models.forward; + +import lombok.Data; + +/*** + * 转发返回消息 + */ +@Data +public class ForwardRes { + //"success":"1", + //"errmsg":"" + /** 成功值 0不成功；1成功*/ + private String success; + + /** 错误消息*/ + private String errmsg; +} diff --git a/models/src/main/java/com/haitongauto/models/forward/UserTruck.java b/models/src/main/java/com/haitongauto/models/forward/UserTruck.java new file mode 100644 index 0000000..0e0e7e4 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/forward/UserTruck.java @@ -0,0 +1,28 @@ +package com.haitongauto.models.forward; + +import lombok.Data; + +@Data +public class UserTruck { + + /** 用户id */ + private String users_id ; + /** 微信openid */ + private String wx_openid; + + /** 用户姓名,默认为微信昵称 */ + private String users_name ; + + /** 用户身分证号码 */ + private String id_code ; + + /** 司机电话 */ + private String tel_number ; + + /** 车牌号 */ + private String truck_number ; + + /** 行驶证（扫描件） */ + private String driving_license ; + +} diff --git a/models/src/main/java/com/haitongauto/models/forward/VinDetail.java b/models/src/main/java/com/haitongauto/models/forward/VinDetail.java new file mode 100644 index 0000000..b8105d7 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/forward/VinDetail.java @@ -0,0 +1,22 @@ +package com.haitongauto.models.forward; + +import lombok.Data; + +/** + * 转发的vin明细 + */ +@Data +public class VinDetail { + //"vin": "NSTOOS00000000001", + //"vlsNm":"阿拉伯海", + //"brdNm": "江淮", + //"potNm": "达曼", + /** 车架号*/ + private String vin; + /** 船名*/ + private String vlsNm; + /** 品牌*/ + private String brdNm; + /** 目的港*/ + private String potNm; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/AppointmentDetail_Ido.java b/models/src/main/java/com/haitongauto/models/ido/AppointmentDetail_Ido.java new file mode 100644 index 0000000..ef8303b --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/AppointmentDetail_Ido.java @@ -0,0 +1,21 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +@Data +public class AppointmentDetail_Ido { + /** + * 预约明细id + */ + private String trdId; + //板车预约信息主键ID + private String ttiId; + //船舶ID + private String spmId; + //港口ID + private String potId; + //品牌ID + private String brdId; + //vinCode + private String vinCode; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/BasicDataIdo.java b/models/src/main/java/com/haitongauto/models/ido/BasicDataIdo.java new file mode 100644 index 0000000..9480a97 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/BasicDataIdo.java @@ -0,0 +1,23 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +/** + * 基础数据 （从客服平台获得） + * 适用于： + * 船名(全部) + * 船名（必须有旬度计划信息） + * 航次 + * 港口 + * 国家 + * 提单号 + * 品牌 + */ +@Data +public class BasicDataIdo { + /** * id */ + private String id; + /** * 名称 */ + private String text; + private String extra1; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/CheckRes.java b/models/src/main/java/com/haitongauto/models/ido/CheckRes.java new file mode 100644 index 0000000..f295d50 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/CheckRes.java @@ -0,0 +1,10 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +@Data +public class CheckRes { + private String errorMsg; + private boolean result; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/CommonRes.java b/models/src/main/java/com/haitongauto/models/ido/CommonRes.java new file mode 100644 index 0000000..35581ab --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/CommonRes.java @@ -0,0 +1,35 @@ +package com.haitongauto.models.ido; + +import lombok.Data; +import org.apache.poi.ss.formula.functions.T; + +import java.io.Serializable; + +@Data +public class CommonRes implements Serializable { + private String status; + + private Integer result; + + private T data; + + /** + * 总数据条数 + */ + private int total; + /** + * 总页数 + */ + private int pages; + + /** + * 当前页码 + */ + private int current; + /** + * 单页数据条数 + */ + private int size; + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/CustomerRes.java b/models/src/main/java/com/haitongauto/models/ido/CustomerRes.java new file mode 100644 index 0000000..de50cba --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/CustomerRes.java @@ -0,0 +1,17 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +import java.io.Serializable; + + +@Data +public class CustomerRes implements Serializable { + private String code; + + private String msg; + + private T data; + +} + diff --git a/models/src/main/java/com/haitongauto/models/ido/DictionaryIdo.java b/models/src/main/java/com/haitongauto/models/ido/DictionaryIdo.java new file mode 100644 index 0000000..e556e71 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/DictionaryIdo.java @@ -0,0 +1,29 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +/** + * 通用数据字典表（数据源自RTOS） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备 件 MACHINE_TYPE + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class DictionaryIdo { + /** * 编号 */ + private String ptrCode; + /** * 描述 */ + private String ptrDesc; + /** * 创建人 */ + private String createUser; + /** * 创建时间 */ + private String createTime; + /** * 修改人 */ + private String updateUser; + /** * 修改时间 */ + private String updateTime; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/PicturePathIdo.java b/models/src/main/java/com/haitongauto/models/ido/PicturePathIdo.java new file mode 100644 index 0000000..8fa41b7 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/PicturePathIdo.java @@ -0,0 +1,42 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +/** + * 图片路径 + */ +@Data +public class PicturePathIdo { + //"data": "", + //"error": "", + //"error_description": "", + //"message": "", + //"path": "", + //"result": 0, + //"stack_info": "", + //"status": "", + //"time_stamp": "", + //"version": "" + + /** + * 数据 + */ + private String data; + /** * 错误 */ + private String error; + /** * 错误说明 */ + private String error_description; + /** * 消息 */ + private String message; + /** * 路径 */ + private String path; + /** * 结果 */ + private String result; + /** * 异常信息 */ + private String stack_info; + /** * 时间戳 */ + private String time_stamp; + /** * 版本 */ + private String version; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/PortAreasIdo.java b/models/src/main/java/com/haitongauto/models/ido/PortAreasIdo.java new file mode 100644 index 0000000..6b44527 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/PortAreasIdo.java @@ -0,0 +1,58 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 资源港区 + */ +@Data +public class PortAreasIdo implements Serializable { + //{ + //"limit": null, + //"orderItems": null, + //"pamId": "9f31ae78aa252c972eb1267789a234d6", + //"pamNo": "421001", + //"pamName": "外高桥港区", + //"pamNameEn": "WGQGGQ", + //"pamAddress": "上海市浦东新区港建路1919号海通国际汽车码头有限公司嗯呢", + //"valid": "Y", + //"pamEfficient": "启用", + //"tenantId": "", + //"termcd": "", + //"createTime": "2023-04-03 16:11:21", + //"createUser": "", + //"updateUser": "", + //"updateTime": "2023-04-21 09:21:58" + // }, + + private String limit; + /** * 排序 */ + private String orderItems; + /** * 港区id */ + private String pamId; + /** * 港区编码 */ + private String pamNo; + /** * 港区名称 */ + private String pamName; + /** * 港区英文名称 */ + private String pamNameEn; + /** * 港区地址 */ + private String pamAddress; + + private String valid; + + /** + * 是否启用 + */ + private String pamEfficient; + private String tenantId; + private String termcd; + private String createTime; + + private String createUser; + private String updateUser; + private String updateTime; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/RecAndDepInfoIdo.java b/models/src/main/java/com/haitongauto/models/ido/RecAndDepInfoIdo.java new file mode 100644 index 0000000..24e05fb --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/RecAndDepInfoIdo.java @@ -0,0 +1,31 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +@Data +public class RecAndDepInfoIdo { + + /** * 打印id*/ + private String prId; + + /** * 打印id类型 cprId-表示收车打印id ; pprId-表示提车打印id*/ + private String prIdType; + + /** * 编号 需要字段*/ + private String number; + /** * 打印小票时间/收车时间 需要的字段 */ + private String printTicketTime; + /** * 板车号 需要的字段 */ + private String trailerNo; + /** * 货物类型 需要的字段 */ + private String cargoType; + /** * 货物数量 需要的字段*/ + private String vehicleAmount; + /** * 核对 Y：已核对 N：未核对 */ + private String verifyStatus; + + + + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/ShipVoyIdo.java b/models/src/main/java/com/haitongauto/models/ido/ShipVoyIdo.java new file mode 100644 index 0000000..7561261 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/ShipVoyIdo.java @@ -0,0 +1,13 @@ +package com.haitongauto.models.ido; + +import lombok.Data; + +@Data +public class ShipVoyIdo { + private String shipId; + private String shipName; + private String shipEnName; + private String voyageId; + private String voyage; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepDetailIdo.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepDetailIdo.java new file mode 100644 index 0000000..6277abe --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepDetailIdo.java @@ -0,0 +1,61 @@ +package com.haitongauto.models.ido.departure; + +import lombok.Data; + +import java.util.List; +/** + * 提车明细 + */ + +@Data +public class DepDetailIdo { + + /* + "detailList": [ + { + "amount": "件数", + "customProperty": "通关性质,可用值:CLEARANCE,BONDED,NONE", + "customsDeclareNo": "报关单号", + "goodsName": "货名", + "mnfBl": "提单号", + "receivingCompany": "收货单位", + "remark": "备注", + "vinList": + [ + { + "damageFlag": 是否有残损 true, + "number": "序号", + "vinCode": "车架号" + } + ], + "vslCnname": "船名", + "vvyName": "航次", + "yplId": "提货清单ID" + } + ], + + */ + + + /** * 收货单位 */ + private String receivingCompany; + /** * 船名 */ + private String vslCnname; + /** * 航次 */ + private String vvyName; + /** * 通关性质,可用值:CLEARANCE,BONDED,NONE */ + private String customProperty; + /** * 提单号 */ + private String mnfBl; + /** * 报关单号 */ + private String customsDeclareNo; + /** * 货名 */ + private String goodsName; + /** * 件数 */ + private String amount; + /** * 备注 */ + private String remark; + /** * vin列表 */ + private List vinList; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepVinIdo.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepVinIdo.java new file mode 100644 index 0000000..729d73b --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepVinIdo.java @@ -0,0 +1,28 @@ +package com.haitongauto.models.ido.departure; + +import lombok.Data; + +/** + * 提车Vin + */ +@Data +public class DepVinIdo { + /* + "vinList": + [ + { + "damageFlag": 是否有残损 true, + "number": "序号", + "vinCode": "车架号" + } + ], + */ + + /** * 序号 */ + private String number; + /** * 车架号 */ + private String vinCode; + /** * 是否有残损 */ + private Boolean damageFg; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepartureDetailIdo.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureDetailIdo.java new file mode 100644 index 0000000..6efeaad --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureDetailIdo.java @@ -0,0 +1,81 @@ +package com.haitongauto.models.ido.departure; + +import com.haitongauto.models.ido.receiving.RecDetailIdo; +import lombok.Data; + +import java.util.List; + +/** + * 提车详情 + */ +@Data +public class DepartureDetailIdo { + /* + { + "cargoType": "货物类型,可用值:CAR,LARGE,MACHINE", + "collectUser": "作业人员", + "collectUserMobile": "作业人员联系电话", + "createTime": "制证日期", + "detailList": [ + { + "amount": "件数", + "customProperty": "通关性质,可用值:CLEARANCE,BONDED,NONE", + "customsDeclareNo": "报关单号", + "goodsName": "货名", + "mnfBl": "提单号", + "receivingCompany": "收货单位", + "remark": "备注", + "vinList": + [ + { + "damageFlag": 是否有残损 true, + "number": "序号", + "vinCode": "车架号" + } + ], + "vslCnname": "船名", + "vvyName": "航次", + "yplId": "提货清单ID" + } + ], + "driverName": "司机名称", + "id": "", + "number": "编号", + "pallectType": 0, + "phoneNumber": "司机联系电话", + "printTime": "提车时间", + "tradeType": "贸易类型,可用值:DOMESTIC,EXTERNAL,OTHER", + "trailerNo": "板车号/身份证号", + "verifyStatus": "", + "yplId": "提货清单ID" + } + + */ + + /** * 编号 */ + private String number; + /** * 提车时间 */ + private String printTime; + /** * 作业人员 */ + private String collectUser; + /** * 作业人员电话 */ + private String collectUserMobile; + /** * 司机名称 */ + private String driverName; + /** * 司机电话 */ + private String phoneNumber; + /** * 板车号/身份证号 */ + private String trailerNo; + /** * 货物类型 */ + private String cargoType; + /** * 内外贸,可用值:DOMESTIC,EXTERNAL,OTHER */ + private String tradeType; + /** * 预约id */ + private String ttiId; + /** * 提车清单ID */ + private String yplId; + /** * 提车明细 列表 */ + private List detailList; + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepartureDetailIdo_DTO.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureDetailIdo_DTO.java new file mode 100644 index 0000000..2252b7e --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureDetailIdo_DTO.java @@ -0,0 +1,16 @@ +package com.haitongauto.models.ido.departure; + +import lombok.Data; + +@Data +public class DepartureDetailIdo_DTO { + /** + * 提车详情 + */ + private DepartureDetailIdo departureDetailIdo; + + /** + * 状态码 + */ + private String status; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdo.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdo.java new file mode 100644 index 0000000..ddedc68 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdo.java @@ -0,0 +1,67 @@ +package com.haitongauto.models.ido.departure; + +import lombok.Data; + +/** + * 分页查询提车凭证 实体 + */ +@Data +public class DepartureVehicleIdo { + /** * 发车清单ID 需要字段 */ + private String yplId; + /** * 提车打印记录ID 需要的字段*/ + private String pprId; + /** * 编号 需要字段*/ + private String number; + /** * 打印小票时间/收车时间 需要的字段 */ + private String printTicketTime; + /** * 板车号 需要的字段 */ + private String trailerNo; + /** * 货物类型 需要的字段 */ + private String cargoType; + /** * 货物数量 需要的字段*/ + private Integer vehicleAmount; + /** * 核对 Y：已核对 N：未核对 */ + private String verifyStatus; + + private String pallectType; + + + +// "yplId": "df500e082e20506da67d14e0c12ac218", +// "pprId": "9fec5ce13cf531bd52fb0364e1a7ffae", +// "trailerNo": "襄A22222", +// "number": "20230803161844006", +// "verifyStatus": "Y", +// "pallectType": null, +// "printTicketTime": "2023-08-03 16:18:44", +// "vehicleAmount": 1, +// "cargoType": null + + + + + +// /** * 司机名称 */ +// private String driverName; +// /** * 手机号 */ +// private String phoneNumber; +// /** * 板车号 */ +// private String trailerNo; +// /** * 贸易类型, 可用值:DOMESTIC,EXTERNAL,OTHER */ +// private String tradeType; +// /** * 货物类型 */ +// private String cargoType; +// /** * 作业人员 */ +// private String createUser; +// +// /** * 核对人 */ +// private String verifyUser; +// /** * 核对 Y：已核对 N：未核对 */ +// private String verifyStatus; +// /** * 核对时间 */ +// private String verifyTime; + + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdoPar.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdoPar.java new file mode 100644 index 0000000..817a92b --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdoPar.java @@ -0,0 +1,10 @@ +package com.haitongauto.models.ido.departure; + +import com.haitongauto.models.ido.receiving.ReceivingVehicleIdo; +import lombok.Data; + +import java.util.List; +@Data +public class DepartureVehicleIdoPar { + private List records; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdo_DTO.java b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdo_DTO.java new file mode 100644 index 0000000..ad9892a --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/DepartureVehicleIdo_DTO.java @@ -0,0 +1,18 @@ +package com.haitongauto.models.ido.departure; + +import lombok.Data; + +import java.util.List; + +@Data +public class DepartureVehicleIdo_DTO { + /** + * 分页提车凭证数据列表 + */ + private List departureVehicleIdoList; + /** + * 状态码 + */ + private String status; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdoPar_pc.java b/models/src/main/java/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdoPar_pc.java new file mode 100644 index 0000000..e89e11b --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdoPar_pc.java @@ -0,0 +1,8 @@ +package com.haitongauto.models.ido.departure.pc; +import lombok.Data; + +import java.util.List; +@Data +public class DepartureVehicleIdoPar_pc { + private List records; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdo_pc.java b/models/src/main/java/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdo_pc.java new file mode 100644 index 0000000..41d5dc2 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdo_pc.java @@ -0,0 +1,33 @@ +package com.haitongauto.models.ido.departure.pc; +import lombok.Data; + +@Data +public class DepartureVehicleIdo_pc { + /** * 编号 */ + private String number; + /** * 司机名称 */ + private String driverName; + /** * 手机号 */ + private String phoneNumber; + /** * 板车号 */ + private String trailerNo; + /** * 贸易类型*/ + private String tradeType; + /** * 货物类型 */ + private String cargoType; + /** * 作业人员 */ + private String createUser; + /** * 收车时间 */ + private String printTicketTime; + /** * 核对人 */ + private String verifyUser; + /** * 核对状态 */ + private String verifyStatus; + /** * 核对时间 */ + private String verifyTime; + /** * 打印小票记录id */ + private String pprId; + /** * 发车清单ID */ + private String yplId; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/login/PostLoginRes.java b/models/src/main/java/com/haitongauto/models/ido/login/PostLoginRes.java new file mode 100644 index 0000000..8b76f15 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/login/PostLoginRes.java @@ -0,0 +1,20 @@ +package com.haitongauto.models.ido.login; + +import lombok.Data; + +@Data +public class PostLoginRes { + /** + * 用户id + */ + private String users_id; + /** + * 板车id + */ + private String truck_id; + /** + * Rtos权限访问令牌 + */ + private String access_token_rtos; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/login/UserAuthResponseDto.java b/models/src/main/java/com/haitongauto/models/ido/login/UserAuthResponseDto.java new file mode 100644 index 0000000..8a4c6ec --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/login/UserAuthResponseDto.java @@ -0,0 +1,19 @@ +package com.haitongauto.models.ido.login; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UserAuthResponseDto implements Serializable { + private static final long serialVersionUID = 7755697998307514841L; + + private String accessToken; + + private String tokenType; + + private String refreshToken; + + private Long expiresIn; + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/login/UserInfoRes.java b/models/src/main/java/com/haitongauto/models/ido/login/UserInfoRes.java new file mode 100644 index 0000000..83ad19b --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/login/UserInfoRes.java @@ -0,0 +1,71 @@ +package com.haitongauto.models.ido.login; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UserInfoRes implements Serializable { + private static final long serialVersionUID = 1L; + /** + * + */ + private String id; + + /** + * + */ + private String name; + + /** + * 需要打码 + */ + private String phone; + + /** + * + */ + private Integer phoneConfirmed; + + /** + * 需要打码 + */ + private String idCard; + + /** + * + */ + private Integer idCardConfirmed; + + /** + * + */ + private String tenantId; + + /** + * + */ + private String tenantName; + + /** + * + */ + private String empNumber; + /** + * + */ + private Integer passwordType; + + /** + * 头像上传地址 + */ + private String uploadUrl; + + /*** + * 小程序openId + */ + private String openId; + + private String mediaType; + +} \ No newline at end of file diff --git a/models/src/main/java/com/haitongauto/models/ido/login/UserLoginOrRegisterRequest.java b/models/src/main/java/com/haitongauto/models/ido/login/UserLoginOrRegisterRequest.java new file mode 100644 index 0000000..4a4000c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/login/UserLoginOrRegisterRequest.java @@ -0,0 +1,37 @@ +package com.haitongauto.models.ido.login; + +import lombok.Data; +/** + * 用户登录/注册 请求入参 + * 调用哪吒接口 + */ +@Data +public class UserLoginOrRegisterRequest { + /** + * 小程序appid (必填) + */ + private String appId; + + /** + * 渠道信息:app、小程序、pad、客户服务平台 (必填) + */ + private String mediaType; + + /** + * 手机号 (必填) + */ + private String mobile; + /** + * 小程序openid (必填) + */ + private String openId; + /** + * 小程序unionid (非必填) + */ + private String unionId; + + + + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/login/UserLoginOrRegisterResponse.java b/models/src/main/java/com/haitongauto/models/ido/login/UserLoginOrRegisterResponse.java new file mode 100644 index 0000000..862b013 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/login/UserLoginOrRegisterResponse.java @@ -0,0 +1,30 @@ +package com.haitongauto.models.ido.login; + +import lombok.Data; + +/** + * 用户登录/注册 请求出参 + * 调用哪吒接口 + */ +@Data +public class UserLoginOrRegisterResponse { + /** + * 访问令牌 + */ + private String access_token; + /** + * 是否过期 + */ + private Integer expires_in; + /** + * 刷新令牌 + */ + private String refresh_token; + /** + * 令牌类型 + */ + private String token_type; + + //差一个userid + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/login/UsersIdo.java b/models/src/main/java/com/haitongauto/models/ido/login/UsersIdo.java new file mode 100644 index 0000000..2e778f6 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/login/UsersIdo.java @@ -0,0 +1,36 @@ +package com.haitongauto.models.ido.login; + +import lombok.Data; + +/** + * 用户 + */ +@Data +public class UsersIdo { + // id 用户id string + // idCard 身份证号 string + // name 姓名 string + // phone 手机号 string + // uploadUrl 头像地址 + + ///** * 用户id */ + // private String id; + /** + * 身份证号 + */ + private String idCard; + /** + * 姓名 + */ + private String name; + /** + * 手机号 + */ + private String phone; + /** + * 头像地址 + */ + private String uploadUrl; + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/RecDetailIdo.java b/models/src/main/java/com/haitongauto/models/ido/receiving/RecDetailIdo.java new file mode 100644 index 0000000..a1b02fe --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/RecDetailIdo.java @@ -0,0 +1,48 @@ +package com.haitongauto.models.ido.receiving; + +import lombok.Data; + +import java.util.List; + +/** + * 收车明细 + */ +@Data +public class RecDetailIdo { + /* + "detailList": [ + { + "brdNname": "品牌", + "potCnname": "港口", + "vinList": [ + { + "number": "序号", + "vinCode": "vin码" + } + ], + "vslCnname": "船名" + } + ], + */ + + /** + * 品牌 + */ + private String brdNname; + + /** + * 港口 + */ + private String potCnname; + + /** + * 船名 + */ + private String vslCnname; + + /** + * 条形码或车架号 + */ + private List vinList; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/RecVinIdo.java b/models/src/main/java/com/haitongauto/models/ido/receiving/RecVinIdo.java new file mode 100644 index 0000000..586cb8c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/RecVinIdo.java @@ -0,0 +1,26 @@ +package com.haitongauto.models.ido.receiving; + +import lombok.Data; + +/** + * 收车Vin + */ +@Data +public class RecVinIdo { + + /* + "vinList": [ + { + "number": "序号", + "vinCode": "车架号" + } + ], + */ + + /** * 序号 */ + private String number; + /** * 车架号 */ + private String vinCode; + /** * 是否有残损 */ + private Boolean damageFg; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingDetailIdo.java b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingDetailIdo.java new file mode 100644 index 0000000..84c743d --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingDetailIdo.java @@ -0,0 +1,110 @@ +package com.haitongauto.models.ido.receiving; + +import lombok.Data; + +import java.util.List; + +/** + * 收车详情 + */ +@Data +public class ReceivingDetailIdo { + /* + { + "collectUser": "作业人员", + "collectUserMobile": "作业人员电话", + "detailList": [ + { + "brdNname": "品牌", + "potCnname": "港口", + "vinList": [ + { + "number": "序号", + "vinCode": "vin码" + } + ], + "vslCnname": "船名" + } + ], + "driverName": "司机名称", + "number": "编号", + "phoneNumber": "司机电话", + "printTicketTime": "收车时间", + "remark": "备注", + "tradeType": "内外贸,可用值:DOMESTIC,EXTERNAL,OTHER", + "trailerNo": "板车号", + "ttiId": "预约id", + "verifyStatus": "", + "yclId": "收车清单ID" + } + */ + + +/* + + + "data": { + "yclId": "43607c77292013b96c4157d17281f0bf", + "tradeType": "内贸", + "collectUser": null, + + "collectUserMobile": null, + "driverName": null, + "phoneNumber": "13900000001", + + "remark": null, + "trailerNo": "阳A99999", + "printTicketTime": "2023-08-04 13:41:27", + + "verifyStatus": null, + "number": "20230804133926003", + "ttiId": "c171b9b3-692d-4a13-b8d2-6b55fb61", + + "cargoType": null, + + "detailList": [ + { + "vslCnname": "山东号", + "brdNname": "宝马", + "potCnname": "南京港", + "vinList": [ + { + "number": 1, + "vinCode": "PNG99999" + } + ] + } + ] + }, + */ + + /** * 编号 */ + private String number; + /** * 收车时间 */ + private String printTicketTime; + /** * 作业人员 */ + private String collectUser; + /** * 作业人员电话 */ + private String collectUserMobile; + /** * 司机名称 */ + private String driverName; + /** * 司机电话 */ + private String phoneNumber; + /** * 板车号 */ + private String trailerNo; + /** * 备注 */ + private String remark; + /*** 货物类型 差货物类型*/ + private String cargoType; + /** * 内外贸,可用值:DOMESTIC,EXTERNAL,OTHER */ + private String tradeType; + /** * 预约id */ + private String ttiId; + /** * 收车清单ID */ + private String yclId; + /** + * 收车明细 列表 + */ + private List detailList; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingDetailIdo_DTO.java b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingDetailIdo_DTO.java new file mode 100644 index 0000000..e9461b1 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingDetailIdo_DTO.java @@ -0,0 +1,15 @@ +package com.haitongauto.models.ido.receiving; + +import lombok.Data; + +@Data +public class ReceivingDetailIdo_DTO { + /** + * 收车详情 + */ + private ReceivingDetailIdo receivingDetailIdo; + /** + * 状态码 + */ + private String status; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo.java b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo.java new file mode 100644 index 0000000..851e595 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo.java @@ -0,0 +1,58 @@ +package com.haitongauto.models.ido.receiving; + +import lombok.Data; + +/** + * 分页查询收车凭证 实体 + */ +@Data +public class ReceivingVehicleIdo { + /** * 收车清单ID 需要的字段 */ + private String yclId; + /** * 收车打印记录ID 需要的字段*/ + private String cprId; + /** * 编号 需要的字段*/ + private String number; + /** * 板车号 需要的字段 */ + private String trailerNo; + /** * 打印小票时间/收车时间 需要的字段 */ + private String printTicketTime; + /** * 货物类型 需要的字段 */ + private String cargoType; + /** * 货物数量 需要的字段*/ + private Integer vehicleAmount; + /** * 核对 Y：已核对 N：未核对 */ + private String verifyStatus; + +// /** * 司机名称 */ +// private String driverName; +// /** * 手机号 */ +// private String phoneNumber; +// /** * 板车号 需要的字段 */ +// private String trailerNo; +// /** * 贸易类型, 可用值:DOMESTIC,EXTERNAL,OTHER */ +// private String tradeType; +// /** * 作业人员 */ +// private String createUser; +// /** * 核对人 */ +// private String verifyUser; +// /** * 核对 Y：已核对 N：未核对 */ +// private String verifyStatus; +// /** * 核对时间 */ +// private String verifyTime; + + + +// private String yclId; +// private String cprId; +// private String number; +// private String yclId; +// private String printTicketTime; +// private String bvmName; +// private String cargoType; +// private String vehicleAmount; +// private String verifyStatus; +// private String tradeType; + + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdoPar.java b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdoPar.java new file mode 100644 index 0000000..756aaa8 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdoPar.java @@ -0,0 +1,11 @@ +package com.haitongauto.models.ido.receiving; +import com.haitongauto.models.ido.receiving.pc.ReceivingVehicleIdo_pc; +import lombok.Data; + +import java.util.List; + +@Data +public class ReceivingVehicleIdoPar { + private List records; + +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo_DTO.java b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo_DTO.java new file mode 100644 index 0000000..a693d0c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo_DTO.java @@ -0,0 +1,17 @@ +package com.haitongauto.models.ido.receiving; + +import lombok.Data; + +import java.util.List; + +@Data +public class ReceivingVehicleIdo_DTO { + /** + * 收车凭证分页数据列表 + */ + private List receivingVehicleIdoList; + /** + * 状态码 + */ + private String status; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdoPar_pc.java b/models/src/main/java/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdoPar_pc.java new file mode 100644 index 0000000..6ae2df9 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdoPar_pc.java @@ -0,0 +1,7 @@ +package com.haitongauto.models.ido.receiving.pc; +import lombok.Data; +import java.util.List; +@Data +public class ReceivingVehicleIdoPar_pc { + private List records; +} diff --git a/models/src/main/java/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdo_pc.java b/models/src/main/java/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdo_pc.java new file mode 100644 index 0000000..ce181f1 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdo_pc.java @@ -0,0 +1,88 @@ +package com.haitongauto.models.ido.receiving.pc; + +import lombok.Data; + +@Data +public class ReceivingVehicleIdo_pc { + /** * 编号 */ + private String number; + /** * 司机ID */ + private String driverId; + /** * 司机名称 */ + private String driverName; + /** * 手机号 */ + private String phoneNumber; + /** * 板车号 */ + private String trailerNo; + /** * 贸易类型,可用值:DOMESTIC,EXTERNAL,OTHER */ + private String tradeType; + /** * 货物类型 */ + private String bvmName; + /** * 作业人员 */ + private String createUser; + /** * 板车扫描时间(收车时间) */ + private String collectStartTime; + /** * 核对人 */ + private String verifyUser; + /** * 核对状态 Y：已核对 N：未核对 */ + private String verifyStatus; + /** * 核对时间 */ + private String verifyTime; + /** * 收车清单ID */ + private String yclId; + /** * 收车打印记录ID */ + private String cprId; + /** * 预约id */ + private String ttiId; + + + +///////////////////////其他多余字段//////////////////////////////////////////////////////////////////// + +// /** * 堆场操作员ID */ +// private String yardOperator; +// /** * 堆场操作员姓名 */ +// private String yardOperatorName; +// /** * 进港时间 */ +// private String arrivePortTime; +// /** * 品牌 */ +// private String brdName; +// /** * 联系电话 */ +// private String contactNumber; +// /** * 创建时间 */ +// private String createTime; +// /** * 版本号 */ +// private String dataVersion; +// /** * 完工打卡时间 */ +// private String finishSignTime; +// /** * 离港时间 */ +// private String leavePortTime; +// /** * 港口 */ +// private String potName; +// /** * 打印状态 待打印、已打印,可用值:WAIT,PRINTED */ +// private String printStatus; +// /** * 打印小票时间/收车时间 */ +// private String printTicketTime; +// /** * 预约时间 */ +// private String reserveTime; +// /** * 签到时间 */ +// private String startSignTime; +// /** * 租户ID */ +// private String tenantId; +// /** * 权限 */ +// private String termcd; +// /** * 运输方式，板车运输/自开,可用值:SCOOTER,DRIVE */ +// private String transType; +// /** * 更新时间 */ +// private String updateTime; +// /** * 更新人 */ +// private String updateUser; +// /** * 是否启用 */ +// private String valid; +// /** * 货物数量 */ +// private String vehicleAmount; +// /** * 船舶 */ +// private String vslCnname; + + +} diff --git a/models/src/main/java/com/haitongauto/models/open/AppointmentCmd.java b/models/src/main/java/com/haitongauto/models/open/AppointmentCmd.java new file mode 100644 index 0000000..8aee0bf --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/open/AppointmentCmd.java @@ -0,0 +1,30 @@ +package com.haitongauto.models.open; + +import lombok.Data; + +@Data +public class AppointmentCmd { + /** + * 预约id + */ + private String appointmentId; + /** + * 堆场id + */ + private String yardId; + /** + * 堆场名称 + */ + private String yardName; + + /** + * 通道号（特指进港道口号） + */ + private String gateCanal; + + /** + * 发送人 + */ + private String sender; + +} diff --git a/models/src/main/java/com/haitongauto/models/open/AppointmentDetailSort.java b/models/src/main/java/com/haitongauto/models/open/AppointmentDetailSort.java new file mode 100644 index 0000000..b10c0db --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/open/AppointmentDetailSort.java @@ -0,0 +1,142 @@ +package com.haitongauto.models.open; + +import lombok.Data; + +/** + * 用于板车管控，指令列表 + */ +@Data +public class AppointmentDetailSort { + + /** + * 预约id + */ + private String appointment_id; + + /** + * 用户id + */ + private String users_id; + /** + * 运输方式（1-板车运输，2-自开） + */ + private String transport_type; + /** + * 板车号 + */ + private String truck_number; + /** + * 手机号 + */ + private String tel_number; + /** + * 预约进场日期 + */ + private String approach_date; + /** + * 进港港区Id + */ + private String port_area_id; + /** + * 进港港区Id + */ + private String port_area_name; + /** + * 预约类型(1-普通码头预约，2-特保区预约) 新增字段 + */ + private Integer appointment_type; + /** + * 进港类型（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口） + */ + private String enter_type; + /** + * 货物类型（1-商品车,2-设备,3-其他） + */ + private String goods_type; + /** + * 货物类型名（1-商品车,2-设备,3-其他） + */ + private String goods_type_name; + /** + * 货物数量（件数） + */ + private Integer goods_quantity; + /** + * 预约打卡状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常：预期未完成操作的） + */ + private Integer appointment_state; + /** + * 堆场 + */ + private String yard; + /** + * 进道口 + */ + private String gate_canal_in; + /** + * 出道口 + */ + private String gate_canal_out; + /** + * 进道口时间 + */ + private String gate_canal_in_time; + /** + * 出道口时间 + */ + private String gate_canal_out_time; + /** + * 指令状态 0-指令待发送 1-指令已发送 + */ + private Integer instruct_state; + /** + * 发送时间 + */ + private String send_time; + /** + * 发送人 + */ + private String sender; + /** + * 打卡签到时间 + */ + private String check_in_time; + /** + * 打卡完工时间 + */ + private String check_over_time; + /** + * 船名 + */ + private String ship_name; + /** + * 船舶id + **/ + private String ship_id; + /** + * 品牌id + */ + private String brand_id; + /** + * 品牌 + */ + private String brand_name; + /** + * 排队号 + */ + private String queue_number; + /** + * 创建时间 + */ + private String create_time; + /** + * 更新时间 + */ + private String update_time; + /** + * 是否软删除 + */ + private Integer is_del; + + +} diff --git a/models/src/main/java/com/haitongauto/models/open/AppointmentDetail_Ido.java b/models/src/main/java/com/haitongauto/models/open/AppointmentDetail_Ido.java new file mode 100644 index 0000000..47e4bd7 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/open/AppointmentDetail_Ido.java @@ -0,0 +1,21 @@ +package com.haitongauto.models.open; + +import lombok.Data; + +@Data +public class AppointmentDetail_Ido { + /** + * 预约明细id + */ + private String trdId; + //板车预约信息主键ID + private String ttiId; + //船舶ID + private String spmId; + //港口ID + private String potId; + //品牌ID + private String brdId; + //vinCode + private String vinCode; +} diff --git a/models/src/main/java/com/haitongauto/models/open/Appointment_Ido.java b/models/src/main/java/com/haitongauto/models/open/Appointment_Ido.java new file mode 100644 index 0000000..fce6ce4 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/open/Appointment_Ido.java @@ -0,0 +1,103 @@ +package com.haitongauto.models.open; + +import lombok.Data; + +@Data +public class Appointment_Ido { + /** 预约信息id */ + private String id ; + + /** 运输方式（1-板车运输，2-自开） */ + private String transportType ; + /** 板车号 */ + private String truckNumber ; + /** 手机号 */ + private String telNumber ; + /** 身份证 */ + private String idCode ; + + /** 车头车架号 */ + private String truckVin ; + /** 板车自重（吨） */ + private Double vehicleWeight ; + /** 车架重（吨） */ + private Double vehicleFrameWeight ; + /** 行驶证编号 */ + private String drivingLicense ; + /** 预约进场日期 */ + private String approachDate ; + /** 进港港区Id */ + private String portAreaId ; + /** 预约类型(1-普通码头预约，2-特保区预约) 新增字段 */ + private Integer appointmentType ; + ///** 业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）【该字段貌似已取消】 */ + //private String biz_type ; + /** 进港类型（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口） */ + private String enterPortType; + /** 货物类型（1-商品车,2-设备,3-其他） */ + private String cargoType ; + /** 货物数量（件数） */ + private Integer goodsQuantity ; + /** 预约打卡状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常：预期未完成操作的） */ + private Integer appointmentState ; + + /** 取消预约时间 */ + private String cancelTime ; + + /** 创建时间 */ + private String createTime ; + /** 更新时间 */ + private String updateTime ; + ///** 是否软删除 */ + //private Integer is_del ; + + /** 堆场*/ + private String yard; + /** 进道口*/ + private String gateCanalIn; + /** 出道口*/ + private String gateCanalOut; + /** 指令状态 */ + private Integer instructState; + /** 发送时间 */ + private String sendTime; + /** 发送人 */ + private String sender; + + /** 打卡签到时间*/ + private String checkInTime; + /** 打卡完工时间 */ + private String checkOverTime; + + /** 进港时间*/ + private String gateCanalInTime; + + /** 出港时间*/ + private String gateCanalOutTime; + + /** 排队号*/ + private String queueNumber; + + /** 船名*/ + private String shipName; + /** 船名*/ + private String shipId; + + /** 品牌id*/ + private String brandIds; + /** 品牌*/ + private String brands; + /*** 用户id(司机id)*/ + private String userId ; + + /*** 用户名称 (司机名称)*/ + private String userName ; + + /** 板车扫描时间 */ + private String plateScanTime; + + ///** 用户id */ + //private String users_id ; + + +} diff --git a/models/src/main/java/com/haitongauto/models/open/QueryCondition.java b/models/src/main/java/com/haitongauto/models/open/QueryCondition.java new file mode 100644 index 0000000..d8cd45d --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/open/QueryCondition.java @@ -0,0 +1,55 @@ +package com.haitongauto.models.open; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.Locale; + +@Data +public class QueryCondition { + + /** + * 开始日期（必填） + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime startDate; + /** + * 结束日期（必填） + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime endDate; + /** + * 港区id （必填） + */ + private String portAreaId; + + /** + * 班车号(模糊条件) （非必填） + */ + private String truckNum; + + /** + * 船id （非必填） + */ + private String shipId; + + /** + * 指令状态 （非必填） + */ + private Integer instructState; + + /** + * 品牌id （非必填） + */ + private String brandId; + + + private Integer pageNum; + + private Integer pageSize; + + +} diff --git a/models/src/main/java/com/haitongauto/models/open/TruckIdo.java b/models/src/main/java/com/haitongauto/models/open/TruckIdo.java new file mode 100644 index 0000000..8598082 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/open/TruckIdo.java @@ -0,0 +1,8 @@ +package com.haitongauto.models.open; + +import lombok.Data; + +@Data +public class TruckIdo { + private String trailerNo; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Announcement.java b/models/src/main/java/com/haitongauto/models/pojo/Announcement.java new file mode 100644 index 0000000..518b74d --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Announcement.java @@ -0,0 +1,35 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; +/** + * 公告 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Announcement { + /** 公告id */ + private String id ; + /** 分类（1-小程序，2-客服平台） */ + private Integer sort ; + /** 标题 */ + private String title ; + /** 摘要 */ + private String abstracts ; + /** 公告内容 */ + private String announcement ; + + /** 公告文本 */ + private String announcement_text ; + + /** 作者 */ + private String author ; + /** 阅读量 */ + private int reading_volume ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private int is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Appointment.java b/models/src/main/java/com/haitongauto/models/pojo/Appointment.java new file mode 100644 index 0000000..af2ae9d --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Appointment.java @@ -0,0 +1,84 @@ +package com.haitongauto.models.pojo; +import lombok.Data; + +/** + * 预约信息 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Appointment { + /** 预约信息id */ + private String id ; + /** 用户id */ + private String users_id ; + /** 运输方式（1-驳船，2-板车运输, 3.商品车自开）*/ + private String transport_type ; + /** 板车号 */ + private String truck_number ; + /** 手机号 */ + private String tel_number ; + /** 身份证号 */ + private String id_code; + /** 车头车架号 */ + private String truck_vin ; + /** 板车自重（吨） */ + private Double vehicle_weight ; + /** 车架重（吨） */ + private Double vehicle_frame_weight ; + /** 行驶证编号 */ + private String driving_license ; + /** 预约进场日期 */ + private String approach_date ; + /** 进港港区Id */ + private String port_area_id ; + /** 预约类型(1-海通码头预约，2-特保区预约) 新增字段 */ + private Integer appointment_type ; + /** 业务类型（1-码头业务，2-整车物流）【该字段貌似已取消】， 又生效了，在进港类型请求接口，添加了业务类型扩展字段*/ + private String biz_type ; + /** 进港类型（1-外贸出口,2-外贸进口,3-整车物流,4-特保区出口,5-特保区进口,6-内贸出口,7-内贸进口） */ + private String enter_type ; + /** 货物类型（1-商品车,2-设备,3-其他） */ + private String goods_type ; + /** 货物数量（件数） */ + private Integer goods_quantity ; + /** 预约打卡状态（1-已预约，2-已签到，3-已进港，5-操作中，6-已完成，7-已离港，4-已取消，9-异常：预期未完成操作的）*/ + private Integer appointment_state ; + /** 取消预约时间 */ + private String cancel_time ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; + /** 堆场*/ + private String yard; + /** 堆场名*/ + private String yard_name; + /** 进道口*/ + private String gate_canal_in; + /** 出道口*/ + private String gate_canal_out; + /** 进道口时间*/ + private String gate_canal_in_time; + /** 出道口*/ + private String gate_canal_out_time; + /** 指令状态 0-指令待发送 1-指令已发送*/ + private Integer instruct_state; + /** 发送时间 */ + private String send_time; + /** 发送人 */ + private String sender; + /** 打卡签到时间*/ + private String check_in_time; + /** 打卡完工时间 */ + private String check_over_time; + /** 板车扫描时间 */ + private String plate_scan_time; + /** 是否常规进闸(0-是常规自动进闸，1-是非常规人工抬杆进闸) */ + private Integer is_conventionality_in; + /** 申报时返回的主键 逗号分隔 */ + private String push_ids; + +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/AppointmentDetail.java b/models/src/main/java/com/haitongauto/models/pojo/AppointmentDetail.java new file mode 100644 index 0000000..3636632 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/AppointmentDetail.java @@ -0,0 +1,38 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 预约详细(详情) + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class AppointmentDetail { + /** 预约详细id */ + private String id ; + /** 预约id */ + private String appointment_id ; + /** 船id */ + private String ship_id ; + /** 船名 */ + private String ship_name ; + /** 航次号 */ + private String voy_number ; + /** 目的港Id */ + private String destination_port_id ; + /** 目的港 */ + private String destination_port ; + /** 品牌id */ + private String brand_id; + /** 品牌 */ + private String brand_name ; + /** 车架号 */ + private String vin ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/DepartureDetail.java b/models/src/main/java/com/haitongauto/models/pojo/DepartureDetail.java new file mode 100644 index 0000000..040fe83 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/DepartureDetail.java @@ -0,0 +1,41 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; +/** + * 提车明细 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class DepartureDetail { + /** 明细id */ + private String id ; + /** 提车id */ + private String applet_departure_vehicle_id ; + /** 收货单位 */ + private String receiving_unit ; + /** 船名 */ + private String ship_name ; + /** 航次 */ + private String voy_number ; + /** 通关性质 */ + private String customs_clearance_nature ; + /** 提单号 */ + private String lading_no ; + /** 报关单号 */ + private String customs_declaration_no ; + /** 货名 */ + private String cargo_name ; + /** 件数 */ + private Integer cargoQuantity ; + /** 备注 */ + private String remarks ; + /** 车架号列表（逗号分隔） */ + private String vinList ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/DepartureVehicle.java b/models/src/main/java/com/haitongauto/models/pojo/DepartureVehicle.java new file mode 100644 index 0000000..3e80ec8 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/DepartureVehicle.java @@ -0,0 +1,50 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 提车信息 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class DepartureVehicle { + /** 发车Id */ + private String id ; + /** 编号 */ + private String voucher_number ; + /** 司机id */ + private String users_id ; + /** 司机姓名 */ + private String users_name ; + /** 司机电话 */ + private String tel_number ; + /** 作业人员 */ + private String operators ; + /** 联系电话 */ + private String phone_number ; + /** 板车号 */ + private String truck_number ; + /** 贸易类型(内贸/外贸) */ + private String trade_type ; + /** 货物类型 */ + private String cargo_type ; + /** 货物数量 */ + private Integer cargo_quantity ; + /** 提车时间 */ + private String delivery_time ; + /** 核对人（小程序中收到该凭证的司机，实际上就是操作司机）=== */ + private String checker ; + /** 核对状态（0-待核对，1-已核对）=== */ + private String check_status ; + /** 核对时间（核对操作时生成的日期时间）=== */ + private String check_time ; + /** 备注=== */ + private String remarks ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Dic.java b/models/src/main/java/com/haitongauto/models/pojo/Dic.java new file mode 100644 index 0000000..60f6007 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Dic.java @@ -0,0 +1,32 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 通用数据字典表（数据源自RTOS） + * 运输方式 TRANSPORT_TYPE + * 进港类型 ENTER_PORT_TYPE + * 货物类型 CARGO_TYPE + * 操作模式 OPERATING_MODE + * 备 件 MACHINE_TYPE + * + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Dic { + /** 字典id */ + private String id ; + /** 内容 */ + private String content ; + /** 分类 */ + private String dic_sort ; + /** 分类描述 */ + private String description ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/EntryInstruct.java b/models/src/main/java/com/haitongauto/models/pojo/EntryInstruct.java new file mode 100644 index 0000000..25b48b9 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/EntryInstruct.java @@ -0,0 +1,30 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 进港指令 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class EntryInstruct { + /** 进港指令id */ + private String id ; + /** 预约id */ + private String appointment_id ; + /** 司机id */ + private String users_id ; + /** 司机姓名 */ + private String users_name ; + /** 车牌号 */ + private String truck_number ; + /** 堆场 */ + private String yard_name ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Feedback.java b/models/src/main/java/com/haitongauto/models/pojo/Feedback.java new file mode 100644 index 0000000..2a8ec91 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Feedback.java @@ -0,0 +1,32 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 意见反馈 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Feedback { + /** 意见反馈id */ + private String id ; + /** 用户id */ + private String users_id ; + /** 昵称 */ + private String nike_name ; + /** 意见（限500字） */ + private String feedback_info ; + /** 图片文件名集合，逗号分隔 */ + private String pictures ; + /** 联系电话 */ + private String tel_number ; + /** 联系方式（微信号/qq/邮箱） */ + private String contact_info ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/LoginLog.java b/models/src/main/java/com/haitongauto/models/pojo/LoginLog.java new file mode 100644 index 0000000..0100b1c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/LoginLog.java @@ -0,0 +1,30 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 用户登录日志 + * @author : KeChanghui + */ +@Data +public class LoginLog { + /** 自增id */ + private String id ; + /** 微信昵称 */ + private String wx_nike ; + /** 微信openid */ + private String wx_openid ; + /** 登录时间 */ + private String login_time ; + /** ip地址 */ + private String ip ; + /** 地区（省市） */ + private String area ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; + +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Message.java b/models/src/main/java/com/haitongauto/models/pojo/Message.java new file mode 100644 index 0000000..74e9cf7 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Message.java @@ -0,0 +1,36 @@ +package com.haitongauto.models.pojo; +import lombok.Data; + +@Data +public class Message { + /** id*/ + private String id; + + /** 1-收车 2-提车*/ + private Integer type; + + /*** 小票id*/ + private String prc_id; + + /** */ + private String biz_id; + + /** 1-收车 2-提车*/ + private String type_content; + + /** 板车号*/ + private String truck_number; + + /** 0-未读 1-已读*/ + private Integer is_read; + + /** 创建时间*/ + private String create_time; + + /** 修改时间*/ + private String update_time; + + /** 是否删除*/ + private Integer is_del; + +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/NoviceIntroduction.java b/models/src/main/java/com/haitongauto/models/pojo/NoviceIntroduction.java new file mode 100644 index 0000000..cc27bfb --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/NoviceIntroduction.java @@ -0,0 +1,28 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 新手攻略（小程序/客服平台/生产APP操作指南） + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class NoviceIntroduction { + /** 攻略_id */ + private String id ; + /** 类别（1-小程序，2-客服平台，3-生产APP） */ + private Integer sort ; + /** 小标题 */ + private String title ; + /** 内容（html文本，允许包含图片标签） */ + private String content ; + /** 顺序号 */ + private Integer sequence_number ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/PortArea.java b/models/src/main/java/com/haitongauto/models/pojo/PortArea.java new file mode 100644 index 0000000..5918f0b --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/PortArea.java @@ -0,0 +1,36 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 港区表（数据源自RTOS，请求时返回200，则使用数据，并更新表；否则，直接使用本表） + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class PortArea { + /** 港区id */ + private String id ; + /** 港区名 */ + private String port_area_name ; + /** 港区英文名 */ + private String port_area_name_en ; + /** 港区编码 */ + private String port_area_code ; + /** 港区地址 */ + private String port_area_address ; + /** 港区坐标 */ + private String area_center_poi ; + /** 打卡范围（距离港区中心坐标的半径，米） */ + private Integer punch_range ; + /** 是否启用（0-未启用，1-启用，默认） */ + private Integer is_enable ; + /** 排序 */ + private Integer order_items ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/PunchClock.java b/models/src/main/java/com/haitongauto/models/pojo/PunchClock.java new file mode 100644 index 0000000..60aa5eb --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/PunchClock.java @@ -0,0 +1,41 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; +/** + * （签到/完成）打卡信息 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class PunchClock { + /** 打卡信息id */ + private String id ; + /** 用户id */ + private String users_id ; + /** 预约Id */ + private String appointment_id ; + /** 业务类型（1-全部，2-码头业务，3-整车物流，4-特保区预约）【该字段貌似已取消】 */ + private String biz_type ; + /** 排队编号 */ + private String queue_number ; + /** 签到日期时间【该字段添加日期】 */ + private String start_time ; + /** 完成日期时间【该字段添加日期】 */ + private String over_time ; + /** 打卡港区(ID) */ + private String port_area_id ; + /** 签到打卡地点 */ + private String punch_address ; + /** 完成打卡地点 */ + private String over_address ; + /** 打卡类别（0-预约未签到，1-签到，2-已进港，3-操作中，4-已完成，5-已离港） */ + private Integer punch_clock_type ; + /** 打卡（位置坐标）{"1":poi2,"2",poi2} */ + private String punch_clock_poi ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/ReceivingDetail.java b/models/src/main/java/com/haitongauto/models/pojo/ReceivingDetail.java new file mode 100644 index 0000000..72c9801 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/ReceivingDetail.java @@ -0,0 +1,30 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 收车明细（数据源自RTOS） + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class ReceivingDetail { + /** 明细Id */ + private String id ; + /** 收车Id */ + private String applet_receiving_vehicle_id ; + /** 船名 */ + private String ship_name ; + /** 品牌名称 */ + private String brand ; + /** 港口（目的港） */ + private String port_name ; + /** 车架号数据（逗号分隔） */ + private String vin_list ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/ReceivingVehicle.java b/models/src/main/java/com/haitongauto/models/pojo/ReceivingVehicle.java new file mode 100644 index 0000000..c71752c --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/ReceivingVehicle.java @@ -0,0 +1,51 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; +/** + * 收车信息（数据源自RTOS） + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class ReceivingVehicle { + /** 收车id */ + private String id ; + /** 收车数据id */ + private String receiving_vehicl_id ; + /** 收车（凭证）编号 */ + private String voucher_number ; + /** 司机id */ + private String users_id ; + /** 司机姓名 */ + private String users_name ; + /** 司机电话 */ + private String tel_number ; + /** 作业人员（堆场作业班组安排的该车作业人员）,=== */ + private String operators ; + /** 联系电话 */ + private String phone_number ; + /** 板车号 */ + private String truck_number ; + /** 贸易类型(内贸/外贸/其他：DOMESTIC,EXTERNAL,OTHER) */ + private String trade_type ; + /** 货物类型(取自字典表，源于RTOS字典接口，如：CARGO_TYPE,111,商品车) */ + private String cargo_type ; + /** 货物数量 */ + private Integer cargoQuantity ; + /** 收车时间 */ + private String collect_time ; + /** 核对人（小程序中收到该凭证的司机，实际上就是操作司机）=== */ + private String checker ; + /** 核对状态（N-待核对，Y-已核对）=== */ + private String check_status ; + /** 核对时间：核对操作时生成的日期时间=== */ + private String check_time ; + /** 备注=== */ + private String remarks ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Requester.java b/models/src/main/java/com/haitongauto/models/pojo/Requester.java new file mode 100644 index 0000000..2b175ef --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Requester.java @@ -0,0 +1,29 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 请求第三方接口 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Requester { + /** 自增id */ + private String id ; + /** url（请求服务地址) */ + private String url ; + /** 请求参数（值为空时，需要依赖实参传值。如小程序登录参数：{"appid":"","code":"","secret":"","grant_type":"authorization_code"}） */ + private String param_map ; + /** 请求类型(1001-1999) */ + private Integer request_type ; + /** 类别说明 */ + private String type_description ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; + +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/ServiceConfig.java b/models/src/main/java/com/haitongauto/models/pojo/ServiceConfig.java new file mode 100644 index 0000000..21ee08a --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/ServiceConfig.java @@ -0,0 +1,26 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 服务配置 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class ServiceConfig { + /** 自增id */ + private String id ; + /** 配置名称（系统服务地址,图片文件存储路径,图片访问路径,小程序appid,小程序密钥secret) */ + private String config_name ; + /** 配置代码（100-系统服务地址,200-图片文件存储路径,300-图片访问路径,400-小程序appid,500-小程序密钥secret) */ + private String config_code ; + /** 配置信息(文本) */ + private String config_content ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer isDel ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/TableHead.java b/models/src/main/java/com/haitongauto/models/pojo/TableHead.java new file mode 100644 index 0000000..9c27a66 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/TableHead.java @@ -0,0 +1,27 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 自定义表头（后台管理客户端可自定义勾选表头显示字段） + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class TableHead { + /** 自增id */ + private String id ; + /** 表名 */ + private String table_name ; + /** 标识代码 */ + private String table_code ; + /** 表头Json */ + private String head_jason ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; + +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Truck.java b/models/src/main/java/com/haitongauto/models/pojo/Truck.java new file mode 100644 index 0000000..b557cdf --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Truck.java @@ -0,0 +1,43 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; +import org.apache.poi.hpsf.Decimal; + +/** + * 板车信息（用户扫描行驶证获取） + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Truck { + /** 板车id */ + private String id ; + /** 微信openid */ + private String wx_openid; + + /** 用户id */ + private String users_id ; + /** 车牌号 */ + private String truck_number ; + /** 行驶证ID */ + private String driving_license_id ; + /** 司机电话 */ + private String tel_number ; + /** 车头车架号 */ + private String head_frame_number ; + /** 车辆自重 */ + private Double vehicle_weight ; + /** 车架重 */ + private Double vehicle_frame_weight ; + + /** 行驶证（扫描件） */ + private String driving_license ; + /** 板车状态（1-默认，0-其他，4-拉黑） */ + private Integer truck_state ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/TruckManagement.java b/models/src/main/java/com/haitongauto/models/pojo/TruckManagement.java new file mode 100644 index 0000000..0bd2761 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/TruckManagement.java @@ -0,0 +1,36 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 板车管理 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class TruckManagement { + /** 车辆管理id */ + private String id ; + /** 用户id */ + private String users_id ; + /** （加入黑名单的）车牌号 */ + private String truck_number ; + /** 原因 */ + private String cause ; + /** 司机姓名 */ + private String drivers_name ; + /** 司机电话 */ + private String drivers_phone ; + /** 管理员姓名 */ + private String administrators_name ; + /** 管理员电话 */ + private String administrators_phone ; + /** 加入黑名单时间 */ + private String enter_time ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; +} diff --git a/models/src/main/java/com/haitongauto/models/pojo/Users.java b/models/src/main/java/com/haitongauto/models/pojo/Users.java new file mode 100644 index 0000000..c6aa8fe --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/pojo/Users.java @@ -0,0 +1,44 @@ +package com.haitongauto.models.pojo; + +import lombok.Data; + +/** + * 用户（司机）信息 + * @author : KeChanghui + * @date : 2023-7-9 + */ +@Data +public class Users { + private String access_token ; + + private String access_token_rtos ; + + /** 用户id */ + private String id ; + /** 用户姓名,默认为微信昵称 */ + private String users_name ; + /** 微信获取openid-用户小程序唯一标识 */ + private String wx_openid ; + /** 微信获取unionid-用户微信应用唯一标识 */ + private String wx_unionid ; + /** 微信获取昵称 */ + private String wx_nick ; + /** 微信获取性别 */ + private String wx_sex ; + /** 微信获取头像 */ + private String wx_head_sculpture ; + /** 手机号码 */ + private String tel_number ; + /** 用户身分证号码 */ + private String id_code ; + /** 用户状态（0-正常，1-停用） */ + private Integer users_state ; + /** 创建时间 */ + private String create_time ; + /** 更新时间 */ + private String update_time ; + /** 是否软删除 */ + private Integer is_del ; + + +} diff --git a/models/src/main/java/com/haitongauto/models/res/Response.java b/models/src/main/java/com/haitongauto/models/res/Response.java new file mode 100644 index 0000000..7711a19 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/res/Response.java @@ -0,0 +1,22 @@ +package com.haitongauto.models.res; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; +import lombok.Data; + +import java.io.Serializable; + + +@Data +public class Response implements Serializable { + private Integer code = 200; + + private String msg = "success"; + + private T data; + + public String toJSONString() { + return JSON.toJSONString(this, SerializerFeature.WriteMapNullValue); + } + +} + diff --git a/models/src/main/java/com/haitongauto/models/sysuser/OldSysTruck.java b/models/src/main/java/com/haitongauto/models/sysuser/OldSysTruck.java new file mode 100644 index 0000000..974fabd --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/sysuser/OldSysTruck.java @@ -0,0 +1,16 @@ +package com.haitongauto.models.sysuser; + +import lombok.Data; + +@Data +public class OldSysTruck { + //id、users_id、truck_number、 tel_number、is_del、wx_openid、truck_state + private String id; + private String users_id; + private String truck_number; + private String tel_number; + private String wx_openid; + private String is_del; + private String truck_state; + +} diff --git a/models/src/main/java/com/haitongauto/models/sysuser/OldSysUT.java b/models/src/main/java/com/haitongauto/models/sysuser/OldSysUT.java new file mode 100644 index 0000000..1ae2c85 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/sysuser/OldSysUT.java @@ -0,0 +1,10 @@ +package com.haitongauto.models.sysuser; + +import lombok.Data; + +@Data +public class OldSysUT { + private OldSysTruck applet_truck; + + private OldSysUser applet_users; +} diff --git a/models/src/main/java/com/haitongauto/models/sysuser/OldSysUTDto.java b/models/src/main/java/com/haitongauto/models/sysuser/OldSysUTDto.java new file mode 100644 index 0000000..1cb18e9 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/sysuser/OldSysUTDto.java @@ -0,0 +1,11 @@ +package com.haitongauto.models.sysuser; + +import lombok.Data; + +@Data +public class OldSysUTDto { + + private String wx_openid; + + private String tel_number; +} diff --git a/models/src/main/java/com/haitongauto/models/sysuser/OldSysUser.java b/models/src/main/java/com/haitongauto/models/sysuser/OldSysUser.java new file mode 100644 index 0000000..7c37bcb --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/sysuser/OldSysUser.java @@ -0,0 +1,21 @@ +package com.haitongauto.models.sysuser; + +import lombok.Data; + +@Data +public class OldSysUser { + // id、users_name、wx_openid、tel_number、is_del、users_state + + private String id; + + private String users_name; + + private String wx_openid; + + private String tel_number; + + private String is_del; + + private String users_state; + +} diff --git a/models/src/main/java/com/haitongauto/models/valid/cus/CheckStatus.java b/models/src/main/java/com/haitongauto/models/valid/cus/CheckStatus.java new file mode 100644 index 0000000..b141f93 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/cus/CheckStatus.java @@ -0,0 +1,11 @@ +package com.haitongauto.models.valid.cus; + +import lombok.Data; + +@Data +public class CheckStatus { + /*** id*/ + private String id; + /*** text*/ + private String text; +} diff --git a/models/src/main/java/com/haitongauto/models/valid/cus/IsActivate.java b/models/src/main/java/com/haitongauto/models/valid/cus/IsActivate.java new file mode 100644 index 0000000..351f723 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/cus/IsActivate.java @@ -0,0 +1,11 @@ +package com.haitongauto.models.valid.cus; + +import lombok.Data; + +@Data +public class IsActivate { + /*** id*/ + private String id; + /*** text*/ + private String text; +} diff --git a/models/src/main/java/com/haitongauto/models/valid/cus/ValidCusVin.java b/models/src/main/java/com/haitongauto/models/valid/cus/ValidCusVin.java new file mode 100644 index 0000000..971f474 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/cus/ValidCusVin.java @@ -0,0 +1,91 @@ +package com.haitongauto.models.valid.cus; + +import lombok.Data; + +@Data +public class ValidCusVin { + /*** id*/ + private String id; //ID integer(int64) + /*** 申请人*/ + private String applicant; //申请人 string + /*** 申请人Id*/ + private String applicantId; //申请人Id string + /*** 申请时间*/ + private String applyTime; //申请时间 string(date-time) + /*** 批次号*/ + private String batchNo;// 批次号 string + /*** 商品编码*/ + private String cargoCode; //商品编码 string + /*** 商品料号*/ + private String cargoItemNo; //商品料号 string + /*** 商品名称*/ + private String cargoName; //商品名称 string + /*** 审核人*/ + private String checkMan; //审核人 string + /*** 审核人ID*/ + private String checkManId; //审核人ID string + /*** 审核原因*/ + private String checkResult; //审核原因 string + /*** 审核状态,可用值:SUBMIT,AUDIT,AUDIT_PASS,AUDIT_REJECT*/ + private CheckStatus checkStatus;//审核状态,可用值:SUBMIT,AUDIT,AUDIT_PASS,AUDIT_REJECT string + /*** 审核时间*/ + private String checkTime; //审核时间 string(date-time) + /*** 城市*/ + private String city; //城市 string + /*** 企业编码*/ + private String companyCode;// 企业编码 string + /*** 企业名称*/ + private String companyName; //企业名称 string + /*** 企业社会信用代码*/ + private String companySocialCode; //企业社会信用代码 string + /*** 国家*/ + private String country;// 国家 string + /*** 创建人*/ + private String createBy; //创建人 string + /*** 创建人姓名*/ + private String createByName; //创建人姓名 string + /*** 创建时间*/ + private String createDate; //创建时间 string(date-time) + /*** 币制*/ + private String currency; //币制 string + + + // private String isActivate;// 是否激活,可用值:SUBMIT,YES,NO string + /*** 是否激活,可用值:SUBMIT,YES,NO*/ + private IsActivate isActivate; + /*** 净重*/ + private String netWeight; //净重 number + /*** 原产国*/ + private String originArea; //原产国 string + /*** 港区*/ + private String portArea; //港区 string + /*** 港区ID*/ + private String portAreaId;// 港区ID string + /*** 规格型号*/ + private String spec; //规格型号 string + /*** 权限港区*/ + private String termcd; //权限港区 string + /*** 总价*/ + private String totalPrice; //总价 number + /*** 法定单位*/ + private String unitLegal; //法定单位 string + /*** 申报计量单位*/ + private String unitMeasure; //申报计量单位 string + /*** 修改人*/ + private String updateBy; //修改人 string + /*** 修改人名称*/ + private String updateByName; //修改人名称 string + /*** 修改时间*/ + private String updateDate; //修改时间 string(date-time) + /*** 车架号*/ + private String vin;// 车架号 + + /*** */ + private String isDel; + //"version": 0, + + /*** */ + private String version; + + +} diff --git a/models/src/main/java/com/haitongauto/models/valid/cus/ValidRequest.java b/models/src/main/java/com/haitongauto/models/valid/cus/ValidRequest.java new file mode 100644 index 0000000..ac65d66 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/cus/ValidRequest.java @@ -0,0 +1,12 @@ +package com.haitongauto.models.valid.cus; + +import lombok.Data; + +import java.util.List; + +@Data +public class ValidRequest { + private String shipId; + private String voyageId; + private List vins; +} diff --git a/models/src/main/java/com/haitongauto/models/valid/naz/CargoInfo.java b/models/src/main/java/com/haitongauto/models/valid/naz/CargoInfo.java new file mode 100644 index 0000000..09744b5 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/naz/CargoInfo.java @@ -0,0 +1,15 @@ +package com.haitongauto.models.valid.naz; + +import lombok.Data; + +/*** 板车信息*/ +@Data +public class CargoInfo { + /*** 板车车牌号*/ + private String vehicleNo; //板车车牌号 + /*** 板车车自重*/ + private String vehicleWt;//板车车自重 + /*** 板车车架重*/ + private String vehicleFrameWt;//板车车架重 + +} diff --git a/models/src/main/java/com/haitongauto/models/valid/naz/CargoInfoNaz.java b/models/src/main/java/com/haitongauto/models/valid/naz/CargoInfoNaz.java new file mode 100644 index 0000000..71e6933 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/naz/CargoInfoNaz.java @@ -0,0 +1,19 @@ +package com.haitongauto.models.valid.naz; + +import lombok.Data; + +import java.util.List; + +@Data +public class CargoInfoNaz { + /*** 板车信息*/ + private CargoInfo cargoInfo; + /*** 企业信息(货源方)*/ + private EnterpriseInfo enterpriseInfo; + + /*** 货物信息*/ + private List goodsInfo; + + /*** //申报类型,oneByOne/oneByMany*/ + private String pushType; +} diff --git a/models/src/main/java/com/haitongauto/models/valid/naz/EnterpriseInfo.java b/models/src/main/java/com/haitongauto/models/valid/naz/EnterpriseInfo.java new file mode 100644 index 0000000..d838fd9 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/naz/EnterpriseInfo.java @@ -0,0 +1,18 @@ +package com.haitongauto.models.valid.naz; + +import lombok.Data; +/*** 企业信息(货源方)*/ +@Data +public class EnterpriseInfo { + /*** 企业编码（自定义）*/ + private String number; + /*** 企业社会信用代码*/ + private String code; + /*** 企业名称*/ + private String name; + /*** 企业所在国家，后台默认给参数（142/中国）*/ + private String country; + /*** 企业所在城市*/ + private String city; + +} diff --git a/models/src/main/java/com/haitongauto/models/valid/naz/Good.java b/models/src/main/java/com/haitongauto/models/valid/naz/Good.java new file mode 100644 index 0000000..11f7239 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/naz/Good.java @@ -0,0 +1,50 @@ +package com.haitongauto.models.valid.naz; + +import lombok.Data; +/*** 货物信息*/ +@Data +public class Good { +//"gdsMtno": "AAA-CH-1", //商品料号 +//"gdecd": "8703800090", //商品编码 +//"gdsNm": "超级可以起飞的轿车01", //商品名称 + + + /*** 商品料号*/ + private String gdsMtno; + /*** 商品编码*/ + private String gdecd; + /*** 商品名称*/ + private String gdsNm; + + +//"gdsSpcfModelDesc": "AAA-0101-001", //规格型号 +//"dclCurrcd": "142", //币制 +//"dclTotalAmt": "10000.0000", //总价 +//"netWt": "1755.00000", //净重 + /*** 规格型号*/ + private String gdsSpcfModelDesc; + /*** 币制*/ + private String dclCurrcd; + /*** 总价*/ + private String dclTotalAmt; + /*** 净重*/ + private String netWt; + + + +//"dclUnitcd": "003", //申报计量单位 +//"unit1": "003", //法定单位 +//"natcd": "142", //原产国（地区） +//"vin": "AAA100000011000012" //整车VIN + /*** 申报计量单位*/ + private String dclUnitcd; + /*** 法定单位*/ + private String unit1; + /*** 原产国（地区）*/ + private String natcd; + + /*** 整车VIN*/ + private String vin; + + +} diff --git a/models/src/main/java/com/haitongauto/models/valid/naz/res/NarData.java b/models/src/main/java/com/haitongauto/models/valid/naz/res/NarData.java new file mode 100644 index 0000000..41a7505 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/naz/res/NarData.java @@ -0,0 +1,18 @@ +package com.haitongauto.models.valid.naz.res; + +import lombok.Data; + +@Data +public class NarData { + // "errorMsg": "", +// "pushId": "", +// "pushType": "", +// "successMsg": "" + + private String errorMsg; + private String pushId; + private String pushType; + + private String successMsg; + +} diff --git a/models/src/main/java/com/haitongauto/models/valid/naz/res/NarRes.java b/models/src/main/java/com/haitongauto/models/valid/naz/res/NarRes.java new file mode 100644 index 0000000..e0d7ae2 --- /dev/null +++ b/models/src/main/java/com/haitongauto/models/valid/naz/res/NarRes.java @@ -0,0 +1,29 @@ +package com.haitongauto.models.valid.naz.res; + +import lombok.Data; + +@Data +public class NarRes { +// "code": "", +// "data": { +// "errorMsg": "", +// "pushId": "", +// "pushType": "", +// "successMsg": "" +// }, +// "flag": true, +// "msg": "", +// "now": "", +// "relationKey": "", +// "success": true + + private String code; + + private NarData data; + private Boolean flag; + private String msg; + private String now; + private String relationKey; + private Boolean success; + +} diff --git a/models/target/classes/com/haitongauto/models/dto/AnnouncementsDto.class b/models/target/classes/com/haitongauto/models/dto/AnnouncementsDto.class new file mode 100644 index 0000000..a209db9 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/AnnouncementsDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/AppointmentDto.class b/models/target/classes/com/haitongauto/models/dto/AppointmentDto.class new file mode 100644 index 0000000..d7534d6 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/AppointmentDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/AppointmentPostDto.class b/models/target/classes/com/haitongauto/models/dto/AppointmentPostDto.class new file mode 100644 index 0000000..4d9d9fe Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/AppointmentPostDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/AppointmentQuery.class b/models/target/classes/com/haitongauto/models/dto/AppointmentQuery.class new file mode 100644 index 0000000..6e7c4c6 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/AppointmentQuery.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/AppointmentQueryExl.class b/models/target/classes/com/haitongauto/models/dto/AppointmentQueryExl.class new file mode 100644 index 0000000..28cfa27 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/AppointmentQueryExl.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/Appointment_Dto.class b/models/target/classes/com/haitongauto/models/dto/Appointment_Dto.class new file mode 100644 index 0000000..390c758 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/Appointment_Dto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/CurrentDayPunchClockDto.class b/models/target/classes/com/haitongauto/models/dto/CurrentDayPunchClockDto.class new file mode 100644 index 0000000..8a8d298 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/CurrentDayPunchClockDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/DataForMessage.class b/models/target/classes/com/haitongauto/models/dto/DataForMessage.class new file mode 100644 index 0000000..5d5acf2 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/DataForMessage.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/Details.class b/models/target/classes/com/haitongauto/models/dto/Details.class new file mode 100644 index 0000000..01a2f1b Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/Details.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/DicDto.class b/models/target/classes/com/haitongauto/models/dto/DicDto.class new file mode 100644 index 0000000..d59e67e Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/DicDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/EnterPortTypeDto.class b/models/target/classes/com/haitongauto/models/dto/EnterPortTypeDto.class new file mode 100644 index 0000000..a57dabe Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/EnterPortTypeDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/EnterPortTypeDtol.class b/models/target/classes/com/haitongauto/models/dto/EnterPortTypeDtol.class new file mode 100644 index 0000000..30aced2 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/EnterPortTypeDtol.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/Pages.class b/models/target/classes/com/haitongauto/models/dto/Pages.class new file mode 100644 index 0000000..1bd4a57 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/Pages.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/PalletTruckAndUsers.class b/models/target/classes/com/haitongauto/models/dto/PalletTruckAndUsers.class new file mode 100644 index 0000000..0649753 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/PalletTruckAndUsers.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/PunchClockQuery.class b/models/target/classes/com/haitongauto/models/dto/PunchClockQuery.class new file mode 100644 index 0000000..cf560c1 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/PunchClockQuery.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/PunchClockQueryExl.class b/models/target/classes/com/haitongauto/models/dto/PunchClockQueryExl.class new file mode 100644 index 0000000..c4342d6 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/PunchClockQueryExl.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/RecAndDepExcelDto.class b/models/target/classes/com/haitongauto/models/dto/RecAndDepExcelDto.class new file mode 100644 index 0000000..1445ad4 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/RecAndDepExcelDto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/Responser.class b/models/target/classes/com/haitongauto/models/dto/Responser.class new file mode 100644 index 0000000..feba503 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/Responser.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/VehicleDetails.class b/models/target/classes/com/haitongauto/models/dto/VehicleDetails.class new file mode 100644 index 0000000..7e5b156 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/VehicleDetails.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/app/CarOperationCountRespDTO.class b/models/target/classes/com/haitongauto/models/dto/app/CarOperationCountRespDTO.class new file mode 100644 index 0000000..8dd1762 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/app/CarOperationCountRespDTO.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/app/CarPalletTrafficInfoRespDTO.class b/models/target/classes/com/haitongauto/models/dto/app/CarPalletTrafficInfoRespDTO.class new file mode 100644 index 0000000..dd5b3d9 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/app/CarPalletTrafficInfoRespDTO.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/app/ChuanItem.class b/models/target/classes/com/haitongauto/models/dto/app/ChuanItem.class new file mode 100644 index 0000000..ab33c6e Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/app/ChuanItem.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/app/CommercialVehicleDetail.class b/models/target/classes/com/haitongauto/models/dto/app/CommercialVehicleDetail.class new file mode 100644 index 0000000..df80ee6 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/app/CommercialVehicleDetail.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/app/GateCarNumberRespDTO.class b/models/target/classes/com/haitongauto/models/dto/app/GateCarNumberRespDTO.class new file mode 100644 index 0000000..c864808 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/app/GateCarNumberRespDTO.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/app/Vin.class b/models/target/classes/com/haitongauto/models/dto/app/Vin.class new file mode 100644 index 0000000..45d9518 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/app/Vin.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/open/Appointment_Dto.class b/models/target/classes/com/haitongauto/models/dto/open/Appointment_Dto.class new file mode 100644 index 0000000..a00b162 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/open/Appointment_Dto.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/open/GoodsInfo.class b/models/target/classes/com/haitongauto/models/dto/open/GoodsInfo.class new file mode 100644 index 0000000..18ea18a Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/open/GoodsInfo.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/open/TruckUser.class b/models/target/classes/com/haitongauto/models/dto/open/TruckUser.class new file mode 100644 index 0000000..fe3e5d6 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/open/TruckUser.class differ diff --git a/models/target/classes/com/haitongauto/models/dto/open/YardGoodsStateRespDTO.class b/models/target/classes/com/haitongauto/models/dto/open/YardGoodsStateRespDTO.class new file mode 100644 index 0000000..d0eb5a7 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/dto/open/YardGoodsStateRespDTO.class differ diff --git a/models/target/classes/com/haitongauto/models/forward/AppointForward.class b/models/target/classes/com/haitongauto/models/forward/AppointForward.class new file mode 100644 index 0000000..abdf42c Binary files /dev/null and b/models/target/classes/com/haitongauto/models/forward/AppointForward.class differ diff --git a/models/target/classes/com/haitongauto/models/forward/AppointOverState.class b/models/target/classes/com/haitongauto/models/forward/AppointOverState.class new file mode 100644 index 0000000..9bad722 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/forward/AppointOverState.class differ diff --git a/models/target/classes/com/haitongauto/models/forward/AppointOverStateDto.class b/models/target/classes/com/haitongauto/models/forward/AppointOverStateDto.class new file mode 100644 index 0000000..6e5e5dd Binary files /dev/null and b/models/target/classes/com/haitongauto/models/forward/AppointOverStateDto.class differ diff --git a/models/target/classes/com/haitongauto/models/forward/ForwardRes.class b/models/target/classes/com/haitongauto/models/forward/ForwardRes.class new file mode 100644 index 0000000..ae70aab Binary files /dev/null and b/models/target/classes/com/haitongauto/models/forward/ForwardRes.class differ diff --git a/models/target/classes/com/haitongauto/models/forward/UserTruck.class b/models/target/classes/com/haitongauto/models/forward/UserTruck.class new file mode 100644 index 0000000..2e4ce46 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/forward/UserTruck.class differ diff --git a/models/target/classes/com/haitongauto/models/forward/VinDetail.class b/models/target/classes/com/haitongauto/models/forward/VinDetail.class new file mode 100644 index 0000000..5b72c01 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/forward/VinDetail.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/AppointmentDetail_Ido.class b/models/target/classes/com/haitongauto/models/ido/AppointmentDetail_Ido.class new file mode 100644 index 0000000..cf2ec01 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/AppointmentDetail_Ido.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/BasicDataIdo.class b/models/target/classes/com/haitongauto/models/ido/BasicDataIdo.class new file mode 100644 index 0000000..caf0ab5 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/BasicDataIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/CheckRes.class b/models/target/classes/com/haitongauto/models/ido/CheckRes.class new file mode 100644 index 0000000..88b4fd8 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/CheckRes.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/CommonRes.class b/models/target/classes/com/haitongauto/models/ido/CommonRes.class new file mode 100644 index 0000000..322dd91 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/CommonRes.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/CustomerRes.class b/models/target/classes/com/haitongauto/models/ido/CustomerRes.class new file mode 100644 index 0000000..5f38114 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/CustomerRes.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/DictionaryIdo.class b/models/target/classes/com/haitongauto/models/ido/DictionaryIdo.class new file mode 100644 index 0000000..ade5c49 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/DictionaryIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/PicturePathIdo.class b/models/target/classes/com/haitongauto/models/ido/PicturePathIdo.class new file mode 100644 index 0000000..46a6311 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/PicturePathIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/PortAreasIdo.class b/models/target/classes/com/haitongauto/models/ido/PortAreasIdo.class new file mode 100644 index 0000000..8c40ac9 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/PortAreasIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/RecAndDepInfoIdo.class b/models/target/classes/com/haitongauto/models/ido/RecAndDepInfoIdo.class new file mode 100644 index 0000000..2810854 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/RecAndDepInfoIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/ShipVoyIdo.class b/models/target/classes/com/haitongauto/models/ido/ShipVoyIdo.class new file mode 100644 index 0000000..c3a735f Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/ShipVoyIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepDetailIdo.class b/models/target/classes/com/haitongauto/models/ido/departure/DepDetailIdo.class new file mode 100644 index 0000000..092b672 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepDetailIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepVinIdo.class b/models/target/classes/com/haitongauto/models/ido/departure/DepVinIdo.class new file mode 100644 index 0000000..7e75295 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepVinIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepartureDetailIdo.class b/models/target/classes/com/haitongauto/models/ido/departure/DepartureDetailIdo.class new file mode 100644 index 0000000..15c90d0 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepartureDetailIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepartureDetailIdo_DTO.class b/models/target/classes/com/haitongauto/models/ido/departure/DepartureDetailIdo_DTO.class new file mode 100644 index 0000000..3c92d64 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepartureDetailIdo_DTO.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdo.class b/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdo.class new file mode 100644 index 0000000..faea6dc Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdoPar.class b/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdoPar.class new file mode 100644 index 0000000..f336c96 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdoPar.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdo_DTO.class b/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdo_DTO.class new file mode 100644 index 0000000..b0deb76 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/DepartureVehicleIdo_DTO.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdoPar_pc.class b/models/target/classes/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdoPar_pc.class new file mode 100644 index 0000000..da1522f Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdoPar_pc.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdo_pc.class b/models/target/classes/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdo_pc.class new file mode 100644 index 0000000..10c354a Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/departure/pc/DepartureVehicleIdo_pc.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/login/PostLoginRes.class b/models/target/classes/com/haitongauto/models/ido/login/PostLoginRes.class new file mode 100644 index 0000000..bdc1e1d Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/login/PostLoginRes.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/login/UserAuthResponseDto.class b/models/target/classes/com/haitongauto/models/ido/login/UserAuthResponseDto.class new file mode 100644 index 0000000..af3a6f4 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/login/UserAuthResponseDto.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/login/UserInfoRes.class b/models/target/classes/com/haitongauto/models/ido/login/UserInfoRes.class new file mode 100644 index 0000000..5891c08 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/login/UserInfoRes.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/login/UserLoginOrRegisterRequest.class b/models/target/classes/com/haitongauto/models/ido/login/UserLoginOrRegisterRequest.class new file mode 100644 index 0000000..fe00534 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/login/UserLoginOrRegisterRequest.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/login/UserLoginOrRegisterResponse.class b/models/target/classes/com/haitongauto/models/ido/login/UserLoginOrRegisterResponse.class new file mode 100644 index 0000000..8bd07ec Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/login/UserLoginOrRegisterResponse.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/login/UsersIdo.class b/models/target/classes/com/haitongauto/models/ido/login/UsersIdo.class new file mode 100644 index 0000000..5405038 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/login/UsersIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/RecDetailIdo.class b/models/target/classes/com/haitongauto/models/ido/receiving/RecDetailIdo.class new file mode 100644 index 0000000..e7b1878 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/RecDetailIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/RecVinIdo.class b/models/target/classes/com/haitongauto/models/ido/receiving/RecVinIdo.class new file mode 100644 index 0000000..33b1098 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/RecVinIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingDetailIdo.class b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingDetailIdo.class new file mode 100644 index 0000000..d7f6f57 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingDetailIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingDetailIdo_DTO.class b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingDetailIdo_DTO.class new file mode 100644 index 0000000..7b68ba4 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingDetailIdo_DTO.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo.class b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo.class new file mode 100644 index 0000000..db9efb8 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdoPar.class b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdoPar.class new file mode 100644 index 0000000..1270888 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdoPar.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo_DTO.class b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo_DTO.class new file mode 100644 index 0000000..c30250b Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/ReceivingVehicleIdo_DTO.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdoPar_pc.class b/models/target/classes/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdoPar_pc.class new file mode 100644 index 0000000..e77293c Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdoPar_pc.class differ diff --git a/models/target/classes/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdo_pc.class b/models/target/classes/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdo_pc.class new file mode 100644 index 0000000..f58f0c4 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/ido/receiving/pc/ReceivingVehicleIdo_pc.class differ diff --git a/models/target/classes/com/haitongauto/models/open/AppointmentCmd.class b/models/target/classes/com/haitongauto/models/open/AppointmentCmd.class new file mode 100644 index 0000000..f02cd34 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/open/AppointmentCmd.class differ diff --git a/models/target/classes/com/haitongauto/models/open/AppointmentDetailSort.class b/models/target/classes/com/haitongauto/models/open/AppointmentDetailSort.class new file mode 100644 index 0000000..c31e79c Binary files /dev/null and b/models/target/classes/com/haitongauto/models/open/AppointmentDetailSort.class differ diff --git a/models/target/classes/com/haitongauto/models/open/AppointmentDetail_Ido.class b/models/target/classes/com/haitongauto/models/open/AppointmentDetail_Ido.class new file mode 100644 index 0000000..34b68cd Binary files /dev/null and b/models/target/classes/com/haitongauto/models/open/AppointmentDetail_Ido.class differ diff --git a/models/target/classes/com/haitongauto/models/open/Appointment_Ido.class b/models/target/classes/com/haitongauto/models/open/Appointment_Ido.class new file mode 100644 index 0000000..1037836 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/open/Appointment_Ido.class differ diff --git a/models/target/classes/com/haitongauto/models/open/QueryCondition.class b/models/target/classes/com/haitongauto/models/open/QueryCondition.class new file mode 100644 index 0000000..fc31c26 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/open/QueryCondition.class differ diff --git a/models/target/classes/com/haitongauto/models/open/TruckIdo.class b/models/target/classes/com/haitongauto/models/open/TruckIdo.class new file mode 100644 index 0000000..eea04d2 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/open/TruckIdo.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Announcement.class b/models/target/classes/com/haitongauto/models/pojo/Announcement.class new file mode 100644 index 0000000..db2686f Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Announcement.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Appointment.class b/models/target/classes/com/haitongauto/models/pojo/Appointment.class new file mode 100644 index 0000000..6054f77 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Appointment.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/AppointmentDetail.class b/models/target/classes/com/haitongauto/models/pojo/AppointmentDetail.class new file mode 100644 index 0000000..24df26b Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/AppointmentDetail.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/DepartureDetail.class b/models/target/classes/com/haitongauto/models/pojo/DepartureDetail.class new file mode 100644 index 0000000..1fdaab7 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/DepartureDetail.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/DepartureVehicle.class b/models/target/classes/com/haitongauto/models/pojo/DepartureVehicle.class new file mode 100644 index 0000000..c6ae66e Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/DepartureVehicle.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Dic.class b/models/target/classes/com/haitongauto/models/pojo/Dic.class new file mode 100644 index 0000000..6e5e9a7 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Dic.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/EntryInstruct.class b/models/target/classes/com/haitongauto/models/pojo/EntryInstruct.class new file mode 100644 index 0000000..a4db45d Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/EntryInstruct.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Feedback.class b/models/target/classes/com/haitongauto/models/pojo/Feedback.class new file mode 100644 index 0000000..c83f736 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Feedback.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/LoginLog.class b/models/target/classes/com/haitongauto/models/pojo/LoginLog.class new file mode 100644 index 0000000..77a8914 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/LoginLog.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Message.class b/models/target/classes/com/haitongauto/models/pojo/Message.class new file mode 100644 index 0000000..7eb11d8 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Message.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/NoviceIntroduction.class b/models/target/classes/com/haitongauto/models/pojo/NoviceIntroduction.class new file mode 100644 index 0000000..fe59c1d Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/NoviceIntroduction.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/PortArea.class b/models/target/classes/com/haitongauto/models/pojo/PortArea.class new file mode 100644 index 0000000..d7227fe Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/PortArea.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/PunchClock.class b/models/target/classes/com/haitongauto/models/pojo/PunchClock.class new file mode 100644 index 0000000..7d6fcdd Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/PunchClock.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/ReceivingDetail.class b/models/target/classes/com/haitongauto/models/pojo/ReceivingDetail.class new file mode 100644 index 0000000..c651b8c Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/ReceivingDetail.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/ReceivingVehicle.class b/models/target/classes/com/haitongauto/models/pojo/ReceivingVehicle.class new file mode 100644 index 0000000..3a38f3d Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/ReceivingVehicle.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Requester.class b/models/target/classes/com/haitongauto/models/pojo/Requester.class new file mode 100644 index 0000000..7da9516 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Requester.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/ServiceConfig.class b/models/target/classes/com/haitongauto/models/pojo/ServiceConfig.class new file mode 100644 index 0000000..c1144be Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/ServiceConfig.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/TableHead.class b/models/target/classes/com/haitongauto/models/pojo/TableHead.class new file mode 100644 index 0000000..1c74acd Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/TableHead.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Truck.class b/models/target/classes/com/haitongauto/models/pojo/Truck.class new file mode 100644 index 0000000..24d3785 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Truck.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/TruckManagement.class b/models/target/classes/com/haitongauto/models/pojo/TruckManagement.class new file mode 100644 index 0000000..e24032d Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/TruckManagement.class differ diff --git a/models/target/classes/com/haitongauto/models/pojo/Users.class b/models/target/classes/com/haitongauto/models/pojo/Users.class new file mode 100644 index 0000000..9642412 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/pojo/Users.class differ diff --git a/models/target/classes/com/haitongauto/models/res/Response.class b/models/target/classes/com/haitongauto/models/res/Response.class new file mode 100644 index 0000000..ed8b51a Binary files /dev/null and b/models/target/classes/com/haitongauto/models/res/Response.class differ diff --git a/models/target/classes/com/haitongauto/models/sysuser/OldSysTruck.class b/models/target/classes/com/haitongauto/models/sysuser/OldSysTruck.class new file mode 100644 index 0000000..1471d3f Binary files /dev/null and b/models/target/classes/com/haitongauto/models/sysuser/OldSysTruck.class differ diff --git a/models/target/classes/com/haitongauto/models/sysuser/OldSysUT.class b/models/target/classes/com/haitongauto/models/sysuser/OldSysUT.class new file mode 100644 index 0000000..cf701c1 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/sysuser/OldSysUT.class differ diff --git a/models/target/classes/com/haitongauto/models/sysuser/OldSysUTDto.class b/models/target/classes/com/haitongauto/models/sysuser/OldSysUTDto.class new file mode 100644 index 0000000..29e8cdb Binary files /dev/null and b/models/target/classes/com/haitongauto/models/sysuser/OldSysUTDto.class differ diff --git a/models/target/classes/com/haitongauto/models/sysuser/OldSysUser.class b/models/target/classes/com/haitongauto/models/sysuser/OldSysUser.class new file mode 100644 index 0000000..c5da541 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/sysuser/OldSysUser.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/cus/CheckStatus.class b/models/target/classes/com/haitongauto/models/valid/cus/CheckStatus.class new file mode 100644 index 0000000..b9b9a10 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/cus/CheckStatus.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/cus/IsActivate.class b/models/target/classes/com/haitongauto/models/valid/cus/IsActivate.class new file mode 100644 index 0000000..357f385 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/cus/IsActivate.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/cus/ValidCusVin.class b/models/target/classes/com/haitongauto/models/valid/cus/ValidCusVin.class new file mode 100644 index 0000000..22df922 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/cus/ValidCusVin.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/cus/ValidRequest.class b/models/target/classes/com/haitongauto/models/valid/cus/ValidRequest.class new file mode 100644 index 0000000..18f339c Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/cus/ValidRequest.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/naz/CargoInfo.class b/models/target/classes/com/haitongauto/models/valid/naz/CargoInfo.class new file mode 100644 index 0000000..c164218 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/naz/CargoInfo.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/naz/CargoInfoNaz.class b/models/target/classes/com/haitongauto/models/valid/naz/CargoInfoNaz.class new file mode 100644 index 0000000..8aa23c5 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/naz/CargoInfoNaz.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/naz/EnterpriseInfo.class b/models/target/classes/com/haitongauto/models/valid/naz/EnterpriseInfo.class new file mode 100644 index 0000000..7d9ada0 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/naz/EnterpriseInfo.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/naz/Good.class b/models/target/classes/com/haitongauto/models/valid/naz/Good.class new file mode 100644 index 0000000..b82711d Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/naz/Good.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/naz/res/NarData.class b/models/target/classes/com/haitongauto/models/valid/naz/res/NarData.class new file mode 100644 index 0000000..00a05c9 Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/naz/res/NarData.class differ diff --git a/models/target/classes/com/haitongauto/models/valid/naz/res/NarRes.class b/models/target/classes/com/haitongauto/models/valid/naz/res/NarRes.class new file mode 100644 index 0000000..b726a5b Binary files /dev/null and b/models/target/classes/com/haitongauto/models/valid/naz/res/NarRes.class differ diff --git a/models/target/maven-archiver/pom.properties b/models/target/maven-archiver/pom.properties new file mode 100644 index 0000000..8382bb2 --- /dev/null +++ b/models/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jul 24 13:25:57 CST 2024 +version=1.0-SNAPSHOT +groupId=org.example +artifactId=models diff --git a/models/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/models/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..f3a41d9 --- /dev/null +++ b/models/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,111 @@ +com\haitongauto\models\dto\open\Appointment_Dto.class +com\haitongauto\models\ido\ShipVoyIdo.class +com\haitongauto\models\dto\app\CommercialVehicleDetail.class +com\haitongauto\models\pojo\DepartureVehicle.class +com\haitongauto\models\ido\login\UserInfoRes.class +com\haitongauto\models\ido\departure\DepartureDetailIdo_DTO.class +com\haitongauto\models\ido\login\UserLoginOrRegisterResponse.class +com\haitongauto\models\pojo\TruckManagement.class +com\haitongauto\models\ido\receiving\RecDetailIdo.class +com\haitongauto\models\dto\RecAndDepExcelDto.class +com\haitongauto\models\valid\cus\CheckStatus.class +com\haitongauto\models\dto\app\GateCarNumberRespDTO.class +com\haitongauto\models\ido\PicturePathIdo.class +com\haitongauto\models\dto\open\TruckUser.class +com\haitongauto\models\open\TruckIdo.class +com\haitongauto\models\ido\CommonRes.class +com\haitongauto\models\forward\AppointForward.class +com\haitongauto\models\ido\departure\DepVinIdo.class +com\haitongauto\models\dto\AppointmentPostDto.class +com\haitongauto\models\forward\AppointOverState.class +com\haitongauto\models\open\Appointment_Ido.class +com\haitongauto\models\ido\departure\DepartureVehicleIdoPar.class +com\haitongauto\models\dto\EnterPortTypeDto.class +com\haitongauto\models\pojo\Feedback.class +com\haitongauto\models\pojo\LoginLog.class +com\haitongauto\models\open\AppointmentDetailSort.class +com\haitongauto\models\dto\app\Vin.class +com\haitongauto\models\ido\departure\DepartureVehicleIdo_DTO.class +com\haitongauto\models\dto\PunchClockQueryExl.class +com\haitongauto\models\pojo\TableHead.class +com\haitongauto\models\dto\DicDto.class +com\haitongauto\models\ido\CheckRes.class +com\haitongauto\models\ido\receiving\pc\ReceivingVehicleIdoPar_pc.class +com\haitongauto\models\open\AppointmentDetail_Ido.class +com\haitongauto\models\dto\AnnouncementsDto.class +com\haitongauto\models\forward\AppointOverStateDto.class +com\haitongauto\models\valid\naz\Good.class +com\haitongauto\models\ido\login\UserAuthResponseDto.class +com\haitongauto\models\dto\PunchClockQuery.class +com\haitongauto\models\pojo\ReceivingVehicle.class +com\haitongauto\models\ido\receiving\ReceivingDetailIdo.class +com\haitongauto\models\res\Response.class +com\haitongauto\models\dto\Responser.class +com\haitongauto\models\forward\VinDetail.class +com\haitongauto\models\ido\departure\DepartureVehicleIdo.class +com\haitongauto\models\pojo\Users.class +com\haitongauto\models\valid\naz\CargoInfo.class +com\haitongauto\models\dto\app\ChuanItem.class +com\haitongauto\models\ido\receiving\ReceivingVehicleIdo_DTO.class +com\haitongauto\models\pojo\Requester.class +com\haitongauto\models\dto\AppointmentDto.class +com\haitongauto\models\dto\VehicleDetails.class +com\haitongauto\models\dto\open\GoodsInfo.class +com\haitongauto\models\pojo\ReceivingDetail.class +com\haitongauto\models\dto\Pages.class +com\haitongauto\models\sysuser\OldSysUTDto.class +com\haitongauto\models\dto\CurrentDayPunchClockDto.class +com\haitongauto\models\pojo\PunchClock.class +com\haitongauto\models\valid\naz\res\NarData.class +com\haitongauto\models\pojo\EntryInstruct.class +com\haitongauto\models\valid\cus\ValidRequest.class +com\haitongauto\models\dto\app\CarPalletTrafficInfoRespDTO.class +com\haitongauto\models\dto\AppointmentQuery.class +com\haitongauto\models\pojo\Announcement.class +com\haitongauto\models\dto\Appointment_Dto.class +com\haitongauto\models\valid\naz\CargoInfoNaz.class +com\haitongauto\models\valid\naz\EnterpriseInfo.class +com\haitongauto\models\ido\AppointmentDetail_Ido.class +com\haitongauto\models\sysuser\OldSysUT.class +com\haitongauto\models\pojo\PortArea.class +com\haitongauto\models\valid\naz\res\NarRes.class +com\haitongauto\models\pojo\Message.class +com\haitongauto\models\valid\cus\IsActivate.class +com\haitongauto\models\pojo\AppointmentDetail.class +com\haitongauto\models\ido\PortAreasIdo.class +com\haitongauto\models\ido\BasicDataIdo.class +com\haitongauto\models\pojo\NoviceIntroduction.class +com\haitongauto\models\ido\receiving\ReceivingDetailIdo_DTO.class +com\haitongauto\models\ido\receiving\RecVinIdo.class +com\haitongauto\models\dto\app\CarOperationCountRespDTO.class +com\haitongauto\models\dto\DataForMessage.class +com\haitongauto\models\ido\receiving\ReceivingVehicleIdoPar.class +com\haitongauto\models\open\QueryCondition.class +com\haitongauto\models\pojo\Appointment.class +com\haitongauto\models\ido\departure\DepDetailIdo.class +com\haitongauto\models\pojo\Dic.class +com\haitongauto\models\sysuser\OldSysUser.class +com\haitongauto\models\open\AppointmentCmd.class +com\haitongauto\models\pojo\Truck.class +com\haitongauto\models\ido\departure\pc\DepartureVehicleIdo_pc.class +com\haitongauto\models\dto\AppointmentQueryExl.class +com\haitongauto\models\ido\login\UserLoginOrRegisterRequest.class +com\haitongauto\models\dto\EnterPortTypeDtol.class +com\haitongauto\models\pojo\DepartureDetail.class +com\haitongauto\models\dto\PalletTruckAndUsers.class +com\haitongauto\models\ido\departure\DepartureDetailIdo.class +com\haitongauto\models\ido\login\PostLoginRes.class +com\haitongauto\models\pojo\ServiceConfig.class +com\haitongauto\models\ido\CustomerRes.class +com\haitongauto\models\valid\cus\ValidCusVin.class +com\haitongauto\models\ido\receiving\pc\ReceivingVehicleIdo_pc.class +com\haitongauto\models\dto\Details.class +com\haitongauto\models\forward\UserTruck.class +com\haitongauto\models\ido\receiving\ReceivingVehicleIdo.class +com\haitongauto\models\ido\departure\pc\DepartureVehicleIdoPar_pc.class +com\haitongauto\models\ido\RecAndDepInfoIdo.class +com\haitongauto\models\dto\open\YardGoodsStateRespDTO.class +com\haitongauto\models\forward\ForwardRes.class +com\haitongauto\models\ido\DictionaryIdo.class +com\haitongauto\models\ido\login\UsersIdo.class +com\haitongauto\models\sysuser\OldSysTruck.class diff --git a/models/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/models/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..156419f --- /dev/null +++ b/models/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,111 @@ +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\EnterPortTypeDtol.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\DictionaryIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\naz\CargoInfoNaz.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\Details.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\PortAreasIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\login\UserAuthResponseDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\DataForMessage.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\ReceivingDetailIdo_DTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\PunchClockQuery.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\ReceivingVehicleIdoPar.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\open\AppointmentCmd.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\sysuser\OldSysUser.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\DepartureVehicle.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\app\GateCarNumberRespDTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\AppointmentQueryExl.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\login\UserLoginOrRegisterRequest.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\NoviceIntroduction.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\PunchClockQueryExl.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\DicDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\AppointmentQuery.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\open\QueryCondition.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\TruckManagement.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\TableHead.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\Pages.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\ServiceConfig.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\BasicDataIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\app\CarOperationCountRespDTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\PunchClock.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\VehicleDetails.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\Appointment_Dto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\login\UsersIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Users.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Feedback.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\pc\DepartureVehicleIdoPar_pc.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\forward\AppointOverStateDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\res\Response.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepDetailIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\login\PostLoginRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\PortArea.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\app\CarPalletTrafficInfoRespDTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\PicturePathIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\pc\ReceivingVehicleIdo_pc.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepartureVehicleIdoPar.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Announcement.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\open\GoodsInfo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\cus\ValidCusVin.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\AppointmentDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\open\YardGoodsStateRespDTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\pc\ReceivingVehicleIdoPar_pc.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\ReceivingVehicle.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\app\CommercialVehicleDetail.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepartureDetailIdo_DTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\AppointmentDetail.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Message.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\login\UserInfoRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\LoginLog.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\open\Appointment_Dto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\sysuser\OldSysUT.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\CustomerRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Requester.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\cus\IsActivate.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Truck.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\sysuser\OldSysUTDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\naz\res\NarData.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\naz\res\NarRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\EnterPortTypeDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\naz\Good.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\open\AppointmentDetailSort.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\CheckRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\RecAndDepInfoIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\ReceivingVehicleIdo_DTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\sysuser\OldSysTruck.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepartureVehicleIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\open\TruckUser.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepVinIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\forward\VinDetail.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\forward\UserTruck.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepartureVehicleIdo_DTO.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\ReceivingDetailIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\AppointmentPostDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\AnnouncementsDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\RecAndDepExcelDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\login\UserLoginOrRegisterResponse.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\RecDetailIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Appointment.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\ReceivingDetail.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\ShipVoyIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\cus\ValidRequest.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\forward\AppointOverState.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\app\Vin.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\EntryInstruct.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\RecVinIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\receiving\ReceivingVehicleIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\Dic.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\forward\ForwardRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\open\Appointment_Ido.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\PalletTruckAndUsers.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\naz\CargoInfo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\DepartureDetailIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\open\AppointmentDetail_Ido.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\CurrentDayPunchClockDto.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\Responser.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\open\TruckIdo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\naz\EnterpriseInfo.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\departure\pc\DepartureVehicleIdo_pc.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\pojo\DepartureDetail.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\valid\cus\CheckStatus.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\CommonRes.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\forward\AppointForward.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\ido\AppointmentDetail_Ido.java +F:\Codes\rtos\v4\mini-service-v4\models\src\main\java\com\haitongauto\models\dto\app\ChuanItem.java diff --git a/models/target/models-1.0-SNAPSHOT.jar b/models/target/models-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..0ac96f0 Binary files /dev/null and b/models/target/models-1.0-SNAPSHOT.jar differ