From a0aa8844c4449ccd9fcccb78fcca5102ac15844b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 25 七月 2023 09:50:07 +0800
Subject: [PATCH] 后台代码删除
---
/dev/null | 58 --------------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/jobs/AddNotice.java | 71 -----------------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 56 +-------------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/base/AbstractJob.java | 19 ----
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/TaskUtil.java | 16 ----
5 files changed, 4 insertions(+), 216 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IncomeClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IncomeClient.java
deleted file mode 100644
index 4a9c16d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IncomeClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dsh.course.feignClient.account;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.feignClient.account.model.IncomeReq;
-import com.dsh.course.feignClient.account.model.QueryIncomeListReq;
-import com.dsh.guns.modular.system.model.Income;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-account", path = "/income")
-public interface IncomeClient {
-
-
- @PostMapping("/queryIncomeListByType")
- List<Income> queryIncomeListByType(QueryIncomeListReq req);
-
- @PostMapping("/insertIncome")
- void insertIncome(IncomeReq req);
-
- @PostMapping("/selectList")
- List<Income> selectList(QueryWrapper<Income> eq);
-
- @PostMapping("/updateById")
- void updateById(Income income);
-
- @PostMapping("/insert")
- void insert(Income income1);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/SmsreordClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/SmsreordClient.java
deleted file mode 100644
index 76708c1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/SmsreordClient.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.account;
-
-import com.dsh.course.feignClient.account.model.SmsCodeReq;
-import com.dsh.guns.modular.system.model.TSmsrecord;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-account", path = "/tSmsrecord")
-public interface SmsreordClient {
- @PostMapping("querySmsrecordById")
- TSmsrecord querySmsrecordById(Integer smsrecordId);
-
- @PostMapping("querySmsrecordList")
- List<Map<String,Object>> querySmsrecordList(SmsCodeReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/TPubWithdrawalClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/TPubWithdrawalClient.java
deleted file mode 100644
index dc2c23a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/TPubWithdrawalClient.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dsh.course.feignClient.account;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.model.QueryWithdrawalReq;
-import com.dsh.guns.modular.system.model.TPubWithdrawal;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-account", path = "/tPubWithdrawal")
-public interface TPubWithdrawalClient {
- @PostMapping(value = "/queryTPubWithdrawalId")
- TPubWithdrawal queryTPubWithdrawalId(Integer tPubWithdrawalId);
-
- @PostMapping(value = "/update")
- Object update(TPubWithdrawal tPubWithdrawal);
-
- @PostMapping(value = "/add")
- Object add(TPubWithdrawal tPubWithdrawal);
-
- @PostMapping(value = "/queryTPubWithdrawalList")
- Page<Map<String, Object>> queryTPubWithdrawalList(QueryWithdrawalReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/UserClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/UserClient.java
deleted file mode 100644
index eb66cde..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/UserClient.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.account;
-
-import com.dsh.course.feignClient.account.model.GetUserInfoByNameOrPhone;
-import com.dsh.guns.modular.system.model.TUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-account", path = "/tUser")
-public interface UserClient {
-
- @PostMapping("/getUserIdByName")
- List<Map<String,Object>> getUserIdByName(@RequestParam("name") String name);
-
- @PostMapping("/getUserInfoByNameOrPhone")
- List<Map<String,Object>> getUserInfoByNameOrPhone(GetUserInfoByNameOrPhone phone);
-
- @PostMapping("/getUserListByState")
- List<TUser> getUserList();
-
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Company.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Company.java
deleted file mode 100644
index 17d8254..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Company.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 企业信息
- */
-@Data
-@TableName("t_company")
-public class Company {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 是否经营专车(1=是，2=否) 1:Y 2:N
- */
- @TableField("isSpe")
- private Integer isSpe;
- /**
- * 是否经营出租车(1=是，2=否) 1:Y 2:N
- */
- @TableField("isTaxi")
- private Integer isTaxi;
- /**
- * 是否经营跨城(1=是，2=否) 1:Y 2:N
- */
- @TableField("isCross")
- private Integer isCross;
- /**
- * 是否经营跨城物流(1=是，2=否) 1:Y 2:N
- */
- @TableField("isCrossLogistics")
- private Integer isCrossLogistics;
- /**
- * 是否经营同城物流(1=是，2=否) 1:Y 2:N
- */
- @TableField("isSameLogistics")
- private Integer isSameLogistics;
- /**
- * 是否经营包车(1=是，2=否) 1:Y 2:N
- */
- @TableField("isCharter")
- private Integer isCharter;
- /**
- * 专车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- @TableField("isSpeFixedOrProportional")
- private Integer isSpeFixedOrProportional;
- /**
- * 出租车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- @TableField("isTaxiFixedOrProportional")
- private Integer isTaxiFixedOrProportional;
- /**
- * 跨城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- @TableField("isCrossLogisticsFixedOrProportional")
- private Integer isCrossLogisticsFixedOrProportional;
- /**
- * 同城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- @TableField("isSameLogisticsFixedOrProportional")
- private Integer isSameLogisticsFixedOrProportional;
- /**
- * 专车提成数值
- */
- @TableField("speMoney")
- private Double speMoney;
- /**
- * 出租车提成数值
- */
- @TableField("taxiMoney")
- private Double taxiMoney;
- /**
- * 跨城物流提成数值
- */
- @TableField("crossLogisticsMoney")
- private Double crossLogisticsMoney;
- /**
- * 同城物流
- */
- @TableField("sameLogisticsMoney")
- private Double sameLogisticsMoney;
- /**
- * 是否需要摆渡车(1=是，2=否) 1:Y 2:N
- */
- @TableField("isNeedFerry")
- private Integer isNeedFerry;
- /**
- * 企业名称
- */
- @TableField("name")
- private String name;
- /**
- * 企业类型（1=平台，2=分公司，3=加盟商）Enterprise types (1=Platform, 2=Branch, 3=Franchisee).
- */
- @TableField("type")
- private Integer type;
- /**
- * 上级企业
- */
- @TableField("superiorId")
- private Integer superiorId;
- /**
- * 负责人姓名
- */
- @TableField("principalName")
- private String principalName;
- /**
- * 负责人电话
- */
- @TableField("principalPhone")
- private String principalPhone;
- /**
- * 管理员姓名
- */
- @TableField("adminName")
- private String adminName;
- /**
- * 管理员电话
- */
- @TableField("adminPhone")
- private String adminPhone;
- /**
- * 紧急联系电话
- */
- @TableField("urgentPhoen")
- private String urgentPhoen;
- /**
- * 服务机构设立时间
- */
- @TableField("setupTime")
- private Date setupTime;
- /**
- * 社会统一信用代码
- */
- @TableField("identifier")
- private String identifier;
- /**
- * 注册地行政区域代码
- */
- @TableField("addressCode")
- private String addressCode;
- /**
- * 经营范围
- */
- @TableField("businessScope")
- private String businessScope;
- /**
- * 通信地址
- */
- @TableField("contactAddress")
- private String contactAddress;
- /**
- * 行政文书送达地址
- */
- @TableField("documentAddress")
- private String documentAddress;
- /**
- * 经营业户经济类型
- */
- @TableField("economicType")
- private String economicType;
- /**
- * 注册资本
- */
- @TableField("regCapital")
- private String regCapital;
- /**
- * 法人代表姓名
- */
- @TableField("legalName")
- private String legalName;
- /**
- * 法人代表身份证号码
- */
- @TableField("legalId")
- private String legalId;
- /**
- * 法人代表电话
- */
- @TableField("legalPhone")
- private String legalPhone;
- /**
- * 法人代表身份证图片地址
- */
- @TableField("legalPhotoUrl")
- private String legalPhotoUrl;
- /**
- * 经营许可证发证机构
- */
- @TableField("licensingAgency")
- private String licensingAgency;
- /**
- * 经营许可证初次发证日期
- */
- @TableField("licenseTime")
- private Date licenseTime;
- /**
- * 镜经营许可证有效日期起
- */
- @TableField("licenseStartTime")
- private Date licenseStartTime;
- /**
- * 经营许可证有效日期止
- */
- @TableField("licenseEndTime")
- private Date licenseEndTime;
- /**
- * 网络预约车经营许可证号
- */
- @TableField("licenseNumber")
- private String licenseNumber;
- /**
- * 注册网络预约车数量
- */
- @TableField("carNum")
- private Integer carNum;
- /**
- * 注册网络预约车驾驶员数量
- */
- @TableField("driverNum")
- private Integer driverNum;
- /**
- * 绑定mac地址
- */
- @TableField("mac")
- private String mac;
- /**
- * 状态（1=正常，2=禁用）
- */
- @TableField("state")
- private Integer state;
- /**
- * 1=创建，2=修改，3=删除
- */
- @TableField("flag")
- private Integer flag;
- /**
- * 上传标识（1：未上传，2：已上传）
- */
- @TableField("upload")
- private Integer upload;
- /**
- * 创建日期
- */
- @TableField("insertTime")
- private Date insertTime;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq.java
deleted file mode 100644
index 0da0122..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq {
- private Integer type;
- private Integer flg;
- private String name;
- private Integer superiorId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgAndNameReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgAndNameReq.java
deleted file mode 100644
index c23b92a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgAndNameReq.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CompanyQueryTypeAndFlgAndNameReq {
- private Integer type;
- private Integer flg;
- private String name;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgReq.java
deleted file mode 100644
index 3d8c216..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/CompanyQueryTypeAndFlgReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CompanyQueryTypeAndFlgReq {
- private Integer type;
- private Integer flg;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/GetUserInfoByNameOrPhone.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/GetUserInfoByNameOrPhone.java
deleted file mode 100644
index ce36be5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/GetUserInfoByNameOrPhone.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetUserInfoByNameOrPhone {
- private String name;
- private String phone;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/IncomeReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/IncomeReq.java
deleted file mode 100644
index 9e30a8e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/IncomeReq.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.Data;
-
-@Data
-public class IncomeReq {
- /**
- * 收入方类型（1=公司，2=司机）
- */
- private Integer userType;
- /**
- * 收入对象id
- */
- private Integer objectId;
- /**
- * 收入类型（1=活动，2=业务）
- */
- private Integer type;
- /**
- * 收入类型id
- */
- private Integer incomeId;
- /**
- * 订单类型
- */
- private Integer orderType;
- /**
- * 收入金额
- */
- private Double money;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryIncomeListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryIncomeListReq.java
deleted file mode 100644
index 0898215..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryIncomeListReq.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryIncomeListReq {
-
- private Integer type;
- private Long incomeId;
- private Integer orderType;
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryWithdrawalReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryWithdrawalReq.java
deleted file mode 100644
index 3cd5882..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/QueryWithdrawalReq.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryWithdrawalReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private String name;
- private Integer withdrawalType;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/SmsCodeReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/SmsCodeReq.java
deleted file mode 100644
index 57c8279..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/SmsCodeReq.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.account.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SmsCodeReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private String phone;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/AdvertisementClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/AdvertisementClient.java
deleted file mode 100644
index 0aaa425..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/AdvertisementClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.QueryAdvertisementReq;
-import com.dsh.guns.modular.system.model.TAdvertisement;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-activity", path = "/base/advertisement")
-public interface AdvertisementClient {
-
- @PostMapping("/updateAdvertisementById")
- Object updateAdvertisementById(TAdvertisement tAdvertisement);
-
- @PostMapping("/queryAdvertisementById")
- TAdvertisement queryAdvertisementById(Integer tAdvertisementId);
-
- @PostMapping("/deleteAdvertisementById")
- Object deleteAdvertisementById(Integer tAdvertisementId );
-
- @PostMapping("/saveAdvertisement")
- Object saveAdvertisement(TAdvertisement tAdvertisement );
-
- @PostMapping("/getAdvertisementList")
- List<Map<String, Object>> getAdvertisementList(QueryAdvertisementReq req );
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyCityClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyCityClient.java
deleted file mode 100644
index e87c182..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyCityClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.CompanyCityQueryCompanyReq;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient("mb-cloud-account")
-public interface CompanyCityClient {
-
- /**
- * 根据经纬度获取服务企业
- * @param req
- * @return
- */
- @PostMapping("/companyCity/queryCompany")
- CompanyInfoRes query(CompanyCityQueryCompanyReq req);
-
-
-
- /**
- * 获取企业服务的城市id
- * @param companyId
- * @return
- */
- @PostMapping("/companyCity/getCompanyServiceCitys")
- List<Integer> getCompanyServiceCitys(Integer companyId);
-
- /**
- * 获取该开通城市是否绑定企业服务
- * @param openCityId
- * @return
- */
- @PostMapping("/companyCity/isBindCompany")
- Boolean isBindCompany(Integer openCityId);
-
- /**
- * 通过公司id删除经营业务
- * @param companyId
- * @return
- */
- @PostMapping("/companyCity/removeByCompanyId")
- Boolean removeByCompanyId(Integer companyId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyClient.java
deleted file mode 100644
index dada56f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CompanyClient.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.feignClient.account.model.Company;
-import com.dsh.course.feignClient.account.model.CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq;
-import com.dsh.course.feignClient.account.model.CompanyQueryTypeAndFlgAndNameReq;
-import com.dsh.course.feignClient.account.model.CompanyQueryTypeAndFlgReq;
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.course.feignClient.order.model.GetAllTradeMoneyReq;
-import com.dsh.guns.modular.system.model.DriverUpdateReq;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-account")
-public interface CompanyClient {
- @PostMapping("/companyCity/queryByIdCompany")
- CompanyInfoRes queryById(Integer id);
-
- @PostMapping("/companyCity/queryByTypeCompany")
- List<CompanyInfoRes> queryByTypeCompany(Integer type);
-
-
- @PostMapping("/companyCity/queryListCompany")
- List<CompanyInfoRes> queryByListCompany(CompanyQueryReq req);
-
- @PostMapping("/company/queryByTypeAndFlg")
- CompanyInfoRes queryByTypeAndFlg(CompanyQueryTypeAndFlgReq req);
-
- @PostMapping("/company/queryByTypeAndFlgAndName")
- CompanyInfoRes queryByTypeAndFlgAndName(CompanyQueryTypeAndFlgAndNameReq req);
-
-
- @PostMapping("/company/queryBySuperiorIdAndTypeAndFlgAndName")
- CompanyInfoRes queryBySuperiorIdAndTypeAndFlgAndName(CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq req);
-
- @PostMapping("/company/queryByStateAndFlg")
- List<CompanyInfoRes> queryByStateAndFlg(CompanyQueryStateAndFlgReq req);
-
- @PostMapping("/company/queryByStateAndFlgGetOne")
- CompanyInfoRes queryByStateAndFlgGetOne(CompanyQueryStateAndFlgReq req);
-
- @PostMapping("/company/saveCompany")
- Integer saveCompany(SaveCompanyReq req);
-
- @PostMapping("/companyCity/deleteByCompanyId")
- Boolean deleteByCompanyId(Integer companyId);
-
- @PostMapping("/companyCity/queryCompanyCityByIdAndCompanyId")
- TCompanyCityResp queryCompanyCityByIdAndCompanyId(QueryCompanyCityReq req);
-
- @PostMapping("/companyCity/saveCompanyCity")
- Boolean saveCompanyCity(TCompanyCityResp req);
-
- @PostMapping("/companyCity/updateCompanyCity")
- Boolean updateCompanyCity(TCompanyCityResp req);
-
- @PostMapping("/company/updateCompany")
- Boolean updateCompany(CompanyInfoRes req);
-
- @PostMapping("/companyCity/getFranchiseeList")
- List<CompanyInfoRes> getFranchiseeList(FranchiseeListReq req);
-
- @PostMapping("/company/selectList")
- List<Company> selectList(QueryWrapper<Company> ne);
-
- @PostMapping("/company/getCompanyScopeById")
- List<Map<String, Object>> getCompanyScopeById( Integer id);
-
- @PostMapping("/company/getCompanyList")
- List<Map<String, Object>> getCompanyList( GetCompanyListReq req);
-
- @PostMapping("/company/getFranchiseeList1")
- List<Map<String, Object>> getFranchiseeList1( GetFranchiseeList1Req req);
-
- @PostMapping("/company/selectList1")
- List<Company> selectList1(DriverUpdateReq driverUpdateReq);
-
-
- @PostMapping("/company/getCompanyByTypeAndFlag")
- Company getCompanyByTypeAndFlag(CompanyQueryStateAndFlgReq companyQueryStateAndFlgReq);
-
- @PostMapping("/companyCity/deleteCompanyCity")
- void deleteCompanyCity(Integer id);
-
-
- @PostMapping("/companyCity/selectListOneChange")
- List<Company> selectListOneChange(Integer oneId);
-
- @PostMapping("/companyCity/queryIdByName")
- List<Integer> queryIdByName(String company);
-
- @PostMapping("/companyCity/getAllIncomeMoney")
- Double getAllIncomeMoney(Integer companyId);
-
- @PostMapping("/companyCity/getAllIncomeMoney1")
- Double getAllIncomeMoney1(GetAllTradeMoneyReq getAllTradeMoneyReq);
-
-
- @PostMapping("/companyCity/selectList2")
- List<Company> selectList2(Integer id);
-
-
- @PostMapping("/companyCity/selectList3")
- List<Company> selectList3(Integer id);
-
- @PostMapping("/company/getAuditList")
- List<Map<String, Object>> getAuditList( GetCompanyListReq req);
-
- @PostMapping("/company/getCompanyCityByCompanyId")
- List<TCompanyCityResp> getCompanyCityByCompanyId(Integer id);
-
- @PostMapping("/company/removeById")
- Boolean removeById(Integer id);
-
- @PostMapping("/company/getCompanyCityById")
- List<Map<String, Object>> getCompanyCityById( Integer id);
-
-
-// Object queryOperationalData(Integer type, String start, String end, Integer companyId, Integer offset, Integer limit);
-//
-//
-// HSSFWorkbook downloadOperationalData(Integer type, String start, String end, Integer companyId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityClient.java
deleted file mode 100644
index 344c2e1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityClient.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.guns.modular.system.model.DriverActivity;
-import com.dsh.guns.modular.system.model.DriverActivityOnline;
-import com.dsh.guns.modular.system.model.DriverActivityOrder;
-import com.dsh.guns.modular.system.model.DriverActivitySubsidy;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-activity", path = "/api/driver")
-public interface DriverActivityClient {
-
- @PostMapping("/queryById")
- DriverActivity queryById(Integer activityId);
-
- @PostMapping("/onLineQueryById")
- DriverActivityOnline onLineQueryById(QueryBean queryBean);
-
-
- @PostMapping("/orderQueryById")
- List<DriverActivityOrder> orderQueryById(Integer activityId);
-
- @PostMapping("/onLineQueryList")
- DriverActivityOnline onLineQueryList(RegisteredQuerySelectReq queryBean);
-
- @PostMapping("/deleteById")
- Boolean deleteById(Integer activityId);
-
- @PostMapping("/orderQueryList")
- DriverActivityOrder orderQueryList(RegisteredQuerySelectReq registeredQuerySelectReq);
-
- @PostMapping("/updateStatus")
- Boolean updateStatus(DriverActivity driverActivity);
-
- @PostMapping("/onLineQueryAll")
- DriverActivityOnline onLineQueryAll();
-
-
- @PostMapping("/getList")
- List<Map<String,Object>> getList(QueryDriverGetListReq req);
-
- @PostMapping("/insertOrUpdate")
- void insertOrUpdate(DriverActivityInsertReq req);
-
- @PostMapping("/subsidyQueryById")
- List<DriverActivitySubsidy> subsidyQueryById(Integer driverActivityId);
-
- /**
- * 获取每个司机的奖励金额汇总
- * @param tEnsureIncomeRuleId
- * @return
- */
- @PostMapping("/queryDriverMoney")
- List<Map<String, Object>> queryDriverMoney(Integer tEnsureIncomeRuleId);
-
- /**
- * 获取每个保底活动的参与人次
- * @param tEnsureIncomeRuleId
- * @return
- */
- @PostMapping("/queryJoinCount")
- Integer queryJoinCount(Integer tEnsureIncomeRuleId);
-
- /**
- * 获取每个司机的补贴金额汇总
- * @return
- */
- @PostMapping("/queryDriverIncomeMoney")
- List<Map<String, Object>> queryDriverIncomeMoney(Integer tEnsureIncomeRuleId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityHistoryClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityHistoryClient.java
deleted file mode 100644
index 074b128..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityHistoryClient.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.model.DriverActivityHistoryReq;
-import com.dsh.course.feignClient.activity.model.DriverActivityHistoryRes;
-import com.dsh.course.feignClient.activity.model.QueryDriverActivityHistoryReq;
-import com.dsh.guns.modular.system.model.DriverActivityHistory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-activity", path = "/driverActivityHistory")
-public interface DriverActivityHistoryClient {
-
- @PostMapping("/queryList")
- DriverActivityHistoryRes queryList(DriverActivityHistoryReq req);
-
- @PostMapping("/queryById")
- DriverActivityHistory queryById(Integer id);
-
- @RequestMapping(value = "/add")
- Object add(DriverActivityHistory driverActivityHistory);
-
- @RequestMapping(value = "/deleteById")
- Object deleteById(Integer id);
-
- @PostMapping("/updateById")
- boolean updateById(DriverActivityHistory driverActivityHistory);
-
- @RequestMapping(value = "/getList")
- Page<Map<String, Object>> getList(QueryDriverActivityHistoryReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOnlineClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOnlineClient.java
deleted file mode 100644
index 3048c77..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOnlineClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.DriverActivityOnlineReq;
-import com.dsh.course.feignClient.activity.model.QueryDriverActivityOnlineReq;
-import com.dsh.course.feignClient.activity.model.QueryOnlineDriverReq;
-import com.dsh.guns.modular.system.model.DriverActivityOnline;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-activity", path = "/driverActivityOnline")
-public interface DriverActivityOnlineClient {
-
- @PostMapping("save")
- Boolean save(DriverActivityOnlineReq driverActivityOnline);
-
- @PostMapping("deleteById")
- Boolean deleteById(Integer id);
-
- @PostMapping("updateById")
- Boolean updateById(DriverActivityOnlineReq driverActivityOnline);
-
- @PostMapping("queryById")
- DriverActivityOnline queryById(Integer driverActivityOnlineId);
-
- @PostMapping("queryOnlineDriverCount")
- int queryOnlineDriverCount();
-
- @PostMapping("queryOnlineDriver")
- Map<String, Object> queryOnlineDriver( QueryOnlineDriverReq req);
-
- @PostMapping("/queryDriverActivityOnline")
- List<DriverActivityOnline> queryDriverActivityOnline(QueryDriverActivityOnlineReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOrderClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOrderClient.java
deleted file mode 100644
index 85d16e6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityOrderClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.DriverActivityOrder;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-activity", path = "/driverActivityOrder")
-public interface DriverActivityOrderClient {
- @PostMapping("queryById")
- DriverActivityOrder queryById(Integer driverActivityOrderId);
-
- @PostMapping("queryList")
- List<DriverActivityOrder> queryList();
-
- @PostMapping("save")
- Boolean save(DriverActivityOrder driverActivityOrder);
-
- @PostMapping("deleteById")
- Boolean deleteById(Integer driverActivityOrderId);
-
- @PostMapping("updateById")
- Boolean updateById(DriverActivityOrder driverActivityOrder);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityRegisterClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityRegisterClient.java
deleted file mode 100644
index f9bb8f5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverActivityRegisterClient.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.QueryBean;
-import com.dsh.course.feignClient.activity.model.RegisteredQuerySelectReq;
-import com.dsh.guns.modular.system.model.DriverActivityRegistered;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-activity", path = "/driverActivityRegistered")
-public interface DriverActivityRegisterClient {
-
- @PostMapping("/query1")
- DriverActivityRegistered query1(QueryBean queryBean);
-
- @PostMapping("/querySelect")
- DriverActivityRegistered querySelect(RegisteredQuerySelectReq registeredQuerySelectReq);
-
- /**
- * 根据id查询
- * @param id
- * @return
- */
- @PostMapping("/queryById")
- DriverActivityRegistered queryById(Integer id);
-
- /**
- * 查询所有
- * @return
- */
- @PostMapping("/queryAll")
- List<DriverActivityRegistered> queryAll();
-
- /**
- * 添加
- * @param driverActivityRegistered
- * @return
- */
- @RequestMapping(value = "/add")
- Object add(DriverActivityRegistered driverActivityRegistered);
-
- /**
- * 删除
- * @param driverActivityRegisteredId
- * @return
- */
- @RequestMapping(value = "/delete")
- Object delete(Integer driverActivityRegisteredId);
-
- /**
- * 更新
- * @param driverActivityRegistered
- * @return
- */
- @RequestMapping(value = "/update")
- Object update(DriverActivityRegistered driverActivityRegistered) ;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverClient.java
deleted file mode 100644
index 2d91433..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/DriverClient.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.TDriverReq;
-import com.dsh.course.feignClient.activity.model.UpdateCompanyDriverReq;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-account", path = "/base/driver")
-public interface DriverClient {
- @PostMapping("/queryDriverListByCarId")
- List<TDriverReq> queryDriverListByCarId(Integer carId);
-
- @PostMapping("/updateById")
- Boolean updateById(TDriverReq req);
-
-
- @PostMapping("/updateCompanyDriverState")
- void updateCompanyDriverState( UpdateCompanyDriverReq req);
-
- @PostMapping("/updateFranchiseeDriverState")
- void updateFranchiseeDriverState( UpdateCompanyDriverReq req);
-
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserClinet.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserClinet.java
deleted file mode 100644
index 167a262..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserClinet.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.model.QueryUserListReq;
-import com.dsh.course.feignClient.activity.model.SelectCountReq;
-import com.dsh.course.feignClient.activity.model.TUserOutUser;
-import com.dsh.course.feignClient.activity.model.TUserReq;
-import com.dsh.guns.modular.system.model.TUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-account", path = "/tUser")
-public interface TUserClinet {
- @PostMapping("/queryUserListByCompanyId")
- List<TUser> queryUserListByCompanyId(Integer companyId);
-
- @PostMapping("/queryById")
- TUser queryById(Integer userId);
-
- @PostMapping("/getUserDetailById")
- Map<String,Object> getUserDetailById(Integer userId);
-
- @PostMapping("/getUserList")
- Page<Map<String, Object>> getUserList(QueryUserListReq queryUserListReq);
-
- @PostMapping("/updateById")
- boolean updateById(TUser tUser);
-
- @PostMapping("/selectCountByPhone")
- Integer selectCountByPhone(TUserReq tUser);
-
- @PostMapping("/save")
- Integer save(TUser tUser);
-
- @PostMapping("/getUserListNoPage")
- List<Map<String,Object>> getUserListNoPage(TUserOutUser tUser);
-
- @PostMapping("/selectCount")
- int selectCount(SelectCountReq req);
-
- @PostMapping("/getUserIdByName")
- List<Map<String,Object>> getUserIdByName(String name);
-
- @PostMapping("/userExit")
- void userExit(Integer userId);
-
- @PostMapping("/getUserList1")
- List<Map<String, Object>> getUserList1(QueryUserListReq queryUserListReq);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserRedPackerRecordClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserRedPackerRecordClient.java
deleted file mode 100644
index c6a7330..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/TUserRedPackerRecordClient.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.UpdateUserRedPacketRecordReq;
-import com.dsh.course.feignClient.activity.model.UserRedPacketRecordRes;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userRedPacketRecord")
-public interface TUserRedPackerRecordClient {
- @PostMapping("/queryUserRedPacketRecordById")
- UserRedPacketRecordRes queryUserRedPacketRecordById(Integer id);
-
- @PostMapping("/saveUserRedPacketRecordById")
- Boolean saveUserRedPacketRecordById(UserRedPacketRecordRes redPacketRecordRes);
-
- @PostMapping("/deleteById")
- Boolean deleteById(Integer id);
-
- @PostMapping("/updateUserRedPacketRecord")
- void updateUserRedPacketRecord(UpdateUserRedPacketRecordReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityBalanceClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityBalanceClient.java
deleted file mode 100644
index 67aa2eb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityBalanceClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.UserActivityBalance;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivityBalance")
-public interface UserActivityBalanceClient {
-
- @PostMapping(value = "/queryUserActivityBalanceId")
- UserActivityBalance detail(Integer userActivityBalanceId);
-
- @PostMapping(value = "/update")
- Object update(UserActivityBalance userActivityBalance);
-
- @PostMapping(value = "/delete")
- Object delete( Integer userActivityBalanceId);
-
-
- @PostMapping(value = "/add")
- Object add(UserActivityBalance userActivityBalance);
-
- @PostMapping(value = "/list")
- Object list();
-
- @PostMapping(value = "/queryUserActivityBalanceList")
- List<UserActivityBalance> queryUserActivityBalanceList(Integer userActivityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityClient.java
deleted file mode 100644
index a1f6a11..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityClient.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.model.LargeCouponUpdateReq;
-import com.dsh.course.feignClient.activity.model.QueryUserActivityListReq;
-import com.dsh.course.feignClient.activity.model.UserActivityInsertOrUpdateReq;
-import com.dsh.course.feignClient.activity.model.UserLargeCouponReq;
-import com.dsh.guns.modular.system.model.TUserLargeCoupon;
-import com.dsh.guns.modular.system.model.UserActivity;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivity")
-public interface UserActivityClient {
-
- @PostMapping("queryUserActivityById")
- UserActivity queryUserActivityById(Integer userActivityId);
-
- @PostMapping("queryUserActivityList")
- Object queryUserActivityList(QueryUserActivityListReq queryUserActivityListReq);
-
- @PostMapping("deleteUserActivityById")
- Object deleteUserActivityById(Integer userActivityId);
-
- @PostMapping("updateUserActivityById")
- Object updateStatus(UserActivity driverActivity);
-
-
- @PostMapping("insertOrUpdate")
- Object insertOrUpdate(UserActivityInsertOrUpdateReq req);
-
- @PostMapping("getUserLargeCoupon")
- Page<Map<String, Object>> getUserLargeCoupon(UserLargeCouponReq userLargeCouponReq);
-
- @PostMapping("addLargeCoupon")
- void addLargeCoupon(TUserLargeCoupon tUserLargeCoupon);
-
- @PostMapping("updateStatusFromId")
- void updateStatusFromId(Integer tCarModelId);
-
- @PostMapping("getUserLargeCouponFromId")
- TUserLargeCoupon getUserLargeCouponFromId(Integer tCarModelId);
-
- @PostMapping("getLargeCouponIds")
- List<Integer> getLargeCouponIds();
-
- @PostMapping("updateLargeCounpon")
- TUserLargeCoupon updateLargeCounpon(LargeCouponUpdateReq largeCouponUpdateReq);
-
-
-}
-
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount1Client.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount1Client.java
deleted file mode 100644
index 157a3f1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount1Client.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.UserActivityDiscount1;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivityDiscount1")
-public interface UserActivityDiscount1Client {
- @PostMapping( "/queryUserActivityDiscount1Id")
- UserActivityDiscount1 queryUserActivityDiscount1Id(Integer userActivityDiscount1Id);
-
- @PostMapping(value = "/updateUserActivityDiscount1")
- Object update(UserActivityDiscount1 userActivityDiscount1);
-
- @PostMapping(value = "/deleteByUserActivityDiscount1Id")
- Object delete(Integer userActivityDiscount1Id);
-
- @PostMapping(value = "/addUserActivityDiscount1")
- Object add(UserActivityDiscount1 userActivityDiscount1);
-
- @PostMapping(value = "/queryUserActivityDiscount1List")
- Object queryUserActivityDiscount1List();
-
- @PostMapping(value = "/queryUserActivityDiscount1ByActivityId")
- UserActivityDiscount1 queryUserActivityDiscount1ByActivityId(Integer userActivityId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount2Client.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount2Client.java
deleted file mode 100644
index 1a8428c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityDiscount2Client.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.UserActivityDiscount2;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivityDiscount2")
-public interface UserActivityDiscount2Client {
- @PostMapping(value = "/queryUserActivityDiscount2Id")
- UserActivityDiscount2 queryUserActivityDiscount2Id(Integer userActivityDiscount2Id);
-
- @PostMapping(value = "/update")
- Object update(UserActivityDiscount2 userActivityDiscount2);
-
- @PostMapping(value = "/delete")
- Object delete(Integer userActivityDiscount2Id);
-
- @PostMapping(value = "/add")
- Object add(UserActivityDiscount2 userActivityDiscount2);
-
- @PostMapping(value = "/list")
- Object list();
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityInviteClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityInviteClient.java
deleted file mode 100644
index 0183147..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityInviteClient.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.UserActivityInvite;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivityInvite")
-public interface UserActivityInviteClient {
- @PostMapping(value = "queryUserActivityInviteId")
- UserActivityInvite queryUserActivityInviteId(Integer userActivityInviteId);
-
- @PostMapping(value = "/update")
- Object update(UserActivityInvite userActivityInvite);
-
- @PostMapping(value = "/delete")
- Object delete( Integer userActivityInviteId);
-
- @PostMapping(value = "/add")
- Object add(UserActivityInvite userActivityInvite);
-
- @PostMapping(value = "/list")
- Object list();
-
- @PostMapping(value = "/queryUserActivityInviteByActivityId")
- UserActivityInvite queryUserActivityInviteByActivityId(Integer userActivityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRedenvelpoeClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRedenvelpoeClient.java
deleted file mode 100644
index 4698c69..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRedenvelpoeClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.UserActivityRedenvelope;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivityRedenvelope")
-public interface UserActivityRedenvelpoeClient {
- @PostMapping(value = "queryUserActivityRedenvelopeId")
- UserActivityRedenvelope queryUserActivityRedenvelopeId(Integer userActivityRedenvelopeId);
-
- @PostMapping(value = "queryUserActivityRedenvelopeAll")
- List<UserActivityRedenvelope> queryUserActivityRedenvelopeAll();
-
- @PostMapping(value = "/add")
- Object addUserActivityRedenvelope(UserActivityRedenvelope userActivityRedenvelope);
-
- @PostMapping(value = "/delete")
- Object deleteUserActivityRedenvelope(Integer userActivityRedenvelopeId);
-
- @PostMapping(value = "/update")
- Object updateUserActivityRedenvelope(UserActivityRedenvelope userActivityRedenvelope);
-
- @PostMapping(value = "/queryUserActivityRedenvelopeByActivityId")
- UserActivityRedenvelope queryUserActivityRedenvelopeByActivityId(Integer userActivityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRegisteredClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRegisteredClient.java
deleted file mode 100644
index bba3520..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserActivityRegisteredClient.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.guns.modular.system.model.UserActivityRegistered;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userActivityRegistered")
-public interface UserActivityRegisteredClient {
- @PostMapping("/queryUserCouponRecordById")
- UserActivityRegistered queryUserActivityRegisteredById(Integer userActivityRegisteredId);
-
- @PostMapping("/queryUserCouponRecordList")
- Object queryUserCouponRecordList();
-
- @PostMapping(value = "/addUserActivityRegistered")
- Object addUserActivityRegistered(UserActivityRegistered userActivityRegistered);
-
- @PostMapping(value = "/deleteUserActivityRegisteredById")
- Object deleteUserActivityRegisteredById(Integer userActivityRegisteredId);
-
- @PostMapping(value = "/updateUserActivityRegisteredById")
- Object updateUserActivityRegisteredById(UserActivityRegistered userActivityRegistered);
-
- @PostMapping(value = "/queryUserActivityRegisteredByActivityId")
- UserActivityRegistered queryUserActivityRegisteredByActivityId(Integer userActivityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserCouponRecordClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserCouponRecordClient.java
deleted file mode 100644
index e6113ca..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/UserCouponRecordClient.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.guns.modular.system.model.UserCouponRecord;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-activity", path = "/userCouponRecord")
-public interface UserCouponRecordClient {
-
- @PostMapping("/queryUserCouponRecordById")
- UserCouponRecordRes queryUserCouponRecordById(Integer id);
-
- @PostMapping("/queryUserCouponRecordList")
- List<Map<String, Object>> queryUserCouponRecordList(UserCouponRecordQueryReq req);
-
- @PostMapping(value = "/addUserCouponRecord1")
- Object addUserCouponRecord(UserCouponRecord userCouponRecord);
-
- @PostMapping(value = "/deleteUserCouponRecordById")
- Object deleteUserCouponRecordById(Integer userCouponRecordId);
-
- @PostMapping(value = "/updateUserCouponRecord")
- Object UserCouponRecord(UserCouponRecord userCouponRecord);
-
- @PostMapping(value = "/getRedList")
- List<Map<String, Object>> getRedList(GetRedListReq req);
-
- @PostMapping(value = "/getCouponStatic")
- Map<String, Object> getCouponStatic(GetCouponStaticReq req);
-
- @PostMapping(value = "/getDiscountStatic")
- Map<String, Object> getDiscountStatic(GetDiscountStaticReq req);
-
- @PostMapping(value = "/getRedStatic")
- Map<String, Object> getRedStatic( GetDiscountStaticReq req);
-
- @PostMapping(value = "/getRegStatic")
- Map<String, Object> getRegStatic( GetDiscountStaticReq req);
-
- @PostMapping(value = "/getBlanceList")
- List<Map<String, Object>> getBlanceList(GetBlanceListReq req);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/VerifyClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/VerifyClient.java
deleted file mode 100644
index 9942ac8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/VerifyClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dsh.course.feignClient.activity;
-
-import com.dsh.course.feignClient.activity.model.VerifiedReq;
-import com.dsh.course.feignClient.activity.model.VerifiedSearchReq;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-account", path = "/tVerified")
-public interface VerifyClient {
- @RequestMapping(value = "/delete")
- Object delete( Integer tVerifiedId);
-
- @RequestMapping(value = "/queryById")
- VerifiedReq queryById(Integer tVerifiedId);
-
- @RequestMapping(value = "/updateById")
- Boolean updateById(VerifiedReq req);
-
-
- @RequestMapping(value = "/queryVerifySearch")
- List<Map<String, Object>> queryVerifySearch(VerifiedSearchReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Advertisement.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Advertisement.java
deleted file mode 100644
index 93e7858..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Advertisement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dsh.course.entity.BaseBean;
-import lombok.Data;
-
-/**
- * 广告
- */
-@Data
-@TableName("t_advertisement")
-public class Advertisement extends BaseBean {
- /**
- * 广告名称
- */
- @TableField("name")
- private String name;
- /**
- * 图片路径
- */
- @TableField("imgUrl")
- private String imgUrl;
- /**
- * 广告类型（1：弹窗，2：首页底部）
- */
- @TableField("type")
- private Integer type;
- /**
- * 是否跳转（1：是，2：否）
- */
- @TableField("isJump")
- private Integer isJump;
- /**
- * 跳转类型（1：外部，2：内部）
- */
- @TableField("jumpType")
- private Integer jumpType;
- /**
- * 跳转地址
- */
- @TableField("jumpUrl")
- private String jumpUrl;
- /**
- * 文本内容
- */
- @TableField("content")
- private String content;
- /**
- * 状态（1=已上线，2=已下线）
- * @return
- */
- @TableField("state")
- private Integer state;
- /**
- * 所属省id
- * @return
- */
- @TableField("provinceId")
- private Integer provinceId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyCityQueryCompanyReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyCityQueryCompanyReq.java
deleted file mode 100644
index 43eca5e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyCityQueryCompanyReq.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.Data;
-
-@Data
-public class CompanyCityQueryCompanyReq {
- private String lon;
-
- private String lat;
-
- public CompanyCityQueryCompanyReq(String lon, String lat) {
- this.lon = lon;
- this.lat = lat;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyInfoRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyInfoRes.java
deleted file mode 100644
index a3bbd7f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyInfoRes.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 企业信息
- */
-@Data
-public class CompanyInfoRes {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 是否经营专车(1=是，2=否) 1:Y 2:N
- */
- private Integer isSpe;
- /**
- * 是否经营出租车(1=是，2=否) 1:Y 2:N
- */
- private Integer isTaxi;
- /**
- * 是否经营跨城(1=是，2=否) 1:Y 2:N
- */
- private Integer isCross;
- /**
- * 是否经营跨城物流(1=是，2=否) 1:Y 2:N
- */
- private Integer isCrossLogistics;
- /**
- * 是否经营同城物流(1=是，2=否) 1:Y 2:N
- */
- private Integer isSameLogistics;
- /**
- * 是否经营包车(1=是，2=否) 1:Y 2:N
- */
- private Integer isCharter;
- /**
- * 专车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isSpeFixedOrProportional;
- /**
- * 出租车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isTaxiFixedOrProportional;
- /**
- * 跨城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isCrossLogisticsFixedOrProportional;
- /**
- * 同城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isSameLogisticsFixedOrProportional;
- /**
- * 专车提成数值
- */
- private Double speMoney;
- /**
- * 出租车提成数值
- */
- private Double taxiMoney;
- /**
- * 跨城物流提成数值
- */
- private Double crossLogisticsMoney;
- /**
- * 同城物流
- */
- private Double sameLogisticsMoney;
- /**
- * 是否需要摆渡车(1=是，2=否) 1:Y 2:N
- */
- private Integer isNeedFerry;
- /**
- * 企业名称
- */
- private String name;
- /**
- * 企业类型（1=平台，2=分公司，3=加盟商）Enterprise types (1=Platform, 2=Branch, 3=Franchisee).
- */
- private Integer type;
- /**
- * 上级企业
- */
- private Integer superiorId;
- /**
- * 负责人姓名
- */
- private String principalName;
- /**
- * 负责人电话
- */
- private String principalPhone;
- /**
- * 管理员姓名
- */
- private String adminName;
- /**
- * 管理员电话
- */
- private String adminPhone;
- /**
- * 紧急联系电话
- */
- private String urgentPhoen;
- /**
- * 服务机构设立时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date setupTime;
- /**
- * 社会统一信用代码
- */
- private String identifier;
- /**
- * 注册地行政区域代码
- */
- private String addressCode;
- /**
- * 经营范围
- */
- private String businessScope;
- /**
- * 通信地址
- */
- private String contactAddress;
- /**
- * 行政文书送达地址
- */
- private String documentAddress;
- /**
- * 经营业户经济类型
- */
- private String economicType;
- /**
- * 注册资本
- */
- private String regCapital;
- /**
- * 法人代表姓名
- */
- private String legalName;
- /**
- * 法人代表身份证号码
- */
- private String legalId;
- /**
- * 法人代表电话
- */
- private String legalPhone;
- /**
- * 法人代表身份证图片地址
- */
- private String legalPhotoUrl;
- /**
- * 经营许可证发证机构
- */
- private String licensingAgency;
- /**
- * 经营许可证初次发证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date licenseTime;
- /**
- * 镜经营许可证有效日期起
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date licenseStartTime;
- /**
- * 经营许可证有效日期止
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date licenseEndTime;
- /**
- * 网络预约车经营许可证号
- */
- private String licenseNumber;
- /**
- * 注册网络预约车数量
- */
- private Integer carNum;
- /**
- * 注册网络预约车驾驶员数量
- */
- private Integer driverNum;
- /**
- * 绑定mac地址
- */
- private String mac;
- /**
- * 状态（1=正常，2=禁用）
- */
- private Integer state;
- /**
- * 1=创建，2=修改，3=删除
- */
- private Integer flag;
- /**
- * 上传标识（1：未上传，2：已上传）
- */
- private Integer upload;
- /**
- * 创建日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
-
- private String code;
-
- private String idCardPositive;
- private String idCardReverse;
- private String scopeCode;
- private String detailAddress;
- private String serviceScope;
- private Integer superId;
- private Integer status;
- private String remark;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryReq.java
deleted file mode 100644
index 1ac2009..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CompanyQueryReq {
- private Integer type;
- private Integer superiorId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryStateAndFlgReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryStateAndFlgReq.java
deleted file mode 100644
index c8236c9..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CompanyQueryStateAndFlgReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CompanyQueryStateAndFlgReq {
- private Integer state;
- private Integer flg;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryReq.java
deleted file mode 100644
index 451f309..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryReq.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.Data;
-
-
-@Data
-public class DriverActivityHistoryReq {
- private Integer driverId;
- private Integer activityId;
- private Integer driverActivityId;
- private Integer type;
- private Integer carryOut;
- private String start;
- private String end;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryRes.java
deleted file mode 100644
index 624fd93..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityHistoryRes.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.dsh.guns.modular.system.model.DriverActivityHistory;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class DriverActivityHistoryRes {
-
- private List<DriverActivityHistory> list;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertOrUpdateReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertOrUpdateReq.java
deleted file mode 100644
index 201852b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertOrUpdateReq.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverActivityInsertOrUpdateReq {
- private Integer objectId;
- private Integer roleType;
- private Integer id;
- private String staTime;
- private String startTime;
- private String num1;
- private Double num2;
- private Double num3;
- private Integer num4;
- private Double num5;
- private Integer num6;
- private Double num7;
- private Integer num8;
- private Double num9;
- private Integer num10;
- private Double num11;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertReq.java
deleted file mode 100644
index 869594e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityInsertReq.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverActivityInsertReq {
- private Integer id;
- private Integer objectId;
- private Integer roleType;
- private String name;
- private String createTime;
-
- private String json2;
- private String json3;
- private String json4;
- private String json5;
- private String json6;
- private String json8;
- private String driverId;
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityOnlineReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityOnlineReq.java
deleted file mode 100644
index 92e2808..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverActivityOnlineReq.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 司机在线活动
- */
-@Data
-public class DriverActivityOnlineReq {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 活动主表id
- */
- private Integer driverActivityId;
- /**
- * 获取业务类型（1=专车）
- */
- private Integer type;
- /**
- * 在线小时数
- */
- private Integer online;
- /**
- * 奖励金额
- */
- private Double money;
- /**
- * 活动开始时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
- /**
- * 活动结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameReq.java
deleted file mode 100644
index 1b2de3b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameReq.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverNameReq {
- private List<Integer> id;
- private String driverName;
- private String companyName;
- private String franchiseeName;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameRes.java
deleted file mode 100644
index 38988d7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/DriverNameRes.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverNameRes {
- private Integer id;
- private String driverName;
- private String cname;
- private String fname;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/FranchiseeListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/FranchiseeListReq.java
deleted file mode 100644
index a74537c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/FranchiseeListReq.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class FranchiseeListReq {
-
- private Integer type;
-
- private Integer objectId;
-
- private Integer state;
-
- private Integer flag;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetBlanceListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetBlanceListReq.java
deleted file mode 100644
index 3a15ccf..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetBlanceListReq.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetBlanceListReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private Integer activityId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCompanyListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCompanyListReq.java
deleted file mode 100644
index c997073..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCompanyListReq.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetCompanyListReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private String name;
- private String principalName;
- private String principalPhone;
- private String adminName;
- private String adminPhone;
- private String serviceStr;
- private Integer state;
- private Integer language;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCouponStaticReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCouponStaticReq.java
deleted file mode 100644
index 50fddbd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetCouponStaticReq.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetCouponStaticReq {
- private String startTimes;
- private String endTimes;
- private Integer id;
- private int i;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetDiscountStaticReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetDiscountStaticReq.java
deleted file mode 100644
index e43b4f5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetDiscountStaticReq.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetDiscountStaticReq {
- private String startTimes;
- private String endTimes;
- private Integer id;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetFranchiseeList1Req.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetFranchiseeList1Req.java
deleted file mode 100644
index 9f7c6c3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetFranchiseeList1Req.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetFranchiseeList1Req {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private String name;
- private String account;
- private String principalName;
- private String principalPhone;
- private String serviceStr;
- private Integer state;
- private Integer roleType;
- private Integer objectId;
- private Integer language;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetRedListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetRedListReq.java
deleted file mode 100644
index 7b1a4ea..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/GetRedListReq.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetRedListReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private String userName;
- private String userPhone;
- private Integer couponActivityId;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/LargeCouponUpdateReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/LargeCouponUpdateReq.java
deleted file mode 100644
index 949c830..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/LargeCouponUpdateReq.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LargeCouponUpdateReq {
- private Integer id;
- // 3通过 2拒绝
- private Integer state;
-
- private String remark;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryAdvertisementReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryAdvertisementReq.java
deleted file mode 100644
index 6928889..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryAdvertisementReq.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryAdvertisementReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private Integer type;
- private String name;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryBean.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryBean.java
deleted file mode 100644
index 3cbf410..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryBean.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryBean {
- private Integer type;
-
- private Integer activityId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryCompanyCityReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryCompanyCityReq.java
deleted file mode 100644
index ac4f634..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryCompanyCityReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryCompanyCityReq {
- private Integer id;
- private Integer companyId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityHistoryReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityHistoryReq.java
deleted file mode 100644
index a98f48b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityHistoryReq.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryDriverActivityHistoryReq {
- private Integer limit;
- private Integer offset;
- private Integer activityId;
- private Integer type;
- private String startTime;
- private String endTime;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityOnlineReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityOnlineReq.java
deleted file mode 100644
index 412ee67..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverActivityOnlineReq.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.Data;
-
-@Data
-public class QueryDriverActivityOnlineReq {
- private Integer companyId;
-
- private Integer driverActivityId;
-
- private Integer type;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverGetListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverGetListReq.java
deleted file mode 100644
index 99f9b40..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryDriverGetListReq.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryDriverGetListReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private String name;
- private Integer companyType;
- private Integer companyId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryOnlineDriverReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryOnlineDriverReq.java
deleted file mode 100644
index d2393a4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryOnlineDriverReq.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryOnlineDriverReq {
- private String name;
- private String phone;
- private Integer offset;
- private Integer limit;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserActivityListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserActivityListReq.java
deleted file mode 100644
index 8984544..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserActivityListReq.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryUserActivityListReq {
- private Integer uid;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date start;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date end;
- private String name;
- private Integer status;
- private Integer offse;
- private Integer limit;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserListReq.java
deleted file mode 100644
index f1c1b9b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/QueryUserListReq.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryUserListReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private Integer roleType;
- private Integer nowUserId;
- private Integer isAuth;
- private Integer state;
- private String id;
- private String nickName;
- private String phone;
- private String companyName;
- private Integer code;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/RegisteredQuerySelectReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/RegisteredQuerySelectReq.java
deleted file mode 100644
index a266ddb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/RegisteredQuerySelectReq.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class RegisteredQuerySelectReq {
- private String startTimes;
- private String endTimes;
- private Integer activityId;
- private Integer type;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SaveCompanyReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SaveCompanyReq.java
deleted file mode 100644
index 2a0c2cc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SaveCompanyReq.java
+++ /dev/null
@@ -1,723 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <p>
- * 公司信息表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-06
- */
-@Data
-public class SaveCompanyReq {
- /**
- * 主键id
- */
- private Integer id;
- /**
- * 是否经营专车(1=是，2=否) 1:Y 2:N
- */
- private Integer isSpe;
- /**
- * 是否经营出租车(1=是，2=否) 1:Y 2:N
- */
- private Integer isTaxi;
- /**
- * 是否经营跨城(1=是，2=否) 1:Y 2:N
- */
- private Integer isCross;
- /**
- * 是否经营跨城物流(1=是，2=否) 1:Y 2:N
- */
- private Integer isCrossLogistics;
- /**
- * 是否经营同城物流(1=是，2=否) 1:Y 2:N
- */
- private Integer isSameLogistics;
- /**
- * 是否经营包车(1=是，2=否) 1:Y 2:N
- */
- private Integer isCharter;
- /**
- * 专车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isSpeFixedOrProportional;
- /**
- * 出租车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isTaxiFixedOrProportional;
- /**
- * 跨城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isCrossLogisticsFixedOrProportional;
- /**
- * 同城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isSameLogisticsFixedOrProportional;
- /**
- * 专车提成数值
- */
- private Double speMoney;
- /**
- * 出租车提成数值
- */
- private Double taxiMoney;
- /**
- * 跨城物流提成数值
- */
- private Double crossLogisticsMoney;
- /**
- * 同城物流
- */
- private Double sameLogisticsMoney;
- /**
- * 是否需要摆渡车(1=是，2=否) 1:Y 2:N
- */
- private Integer isNeedFerry;
- /**
- * 企业名称
- */
- private String name;
- /**
- * 企业类型（1：平台，2：分公司，3：加盟商）
- */
- private Integer type;
- /**
- * 上级企业id
- */
- private Integer superiorId;
- /**
- * 负责人姓名
- */
- private String principalName;
- /**
- * 负责人电话
- */
- private String principalPhone;
- /**
- * 管理员姓名
- */
- private String adminName;
- /**
- * 管理员电话
- */
- private String adminPhone;
- /**
- * 紧急联系电话
- */
- private String urgentPhoen;
- /**
- * 服务机构设立日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date setupTime;
- /**
- * 统一社会信用代码
- */
- private String identifier;
- /**
- * 注册地行政区划分代码
- */
- private String addressCode;
- /**
- * 经营范围
- */
- private String businessScope;
- /**
- * 通信地址
- */
- private String contactAddress;
- /**
- * 行政文书送达地址
- */
- private String documentAddress;
- /**
- * 经营业户经济类型
- */
- private String economicType;
- /**
- * 注册资本
- */
- private String regCapital;
- /**
- * 法人代表姓名
- */
- private String legalName;
- /**
- * 法人代表身份证号
- */
- private String legalId;
- /**
- * 法人代表电话
- */
- private String legalPhone;
- /**
- * 法人代表身份证扫描件文件地址
- */
- private String legalPhotoUrl;
- /**
- * 经营许可证发证机构
- */
- private String licensingAgency;
- /**
- * 经营许可证初次发证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date licenseTime;
- /**
- * 经营许可证有效期起
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date licenseStartTime;
- /**
- * 经营许可证有效期止
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date licenseEndTime;
- /**
- * 网络预约车经营许可证号
- */
- private String licenseNumber;
- /**
- * 注册网络预约车辆数
- */
- private Integer carNum;
- /**
- * 注册网络预约车驾驶员数量
- */
- private Integer driverNum;
- /**
- * 登录MAC地址（多个以逗号分隔）
- */
- private String mac;
- /**
- * 当前状态（0：正常，1：禁用）
- */
- private Integer state;
- /**
- * 操作标识（1：新增，2：修改，3：删除）
- */
- private String flag;
- /**
- * 上传标识（1：未上传，2：已上传）
- */
- private String upload;
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 具体地址
- */
- private String detailAddress;
- /**
- * 分公司代码
- */
- private String code;
- /**
- * 分公司区划代码
- */
- private String scopeCode;
- /**
- * 经营区域
- */
- private String serviceScope;
- //身份证正面
- private String idCardPositive;
- //身份证反面
- private String idCardReverse;
- private Integer superId;
-
- public String getIdCardPositive() {
- return idCardPositive;
- }
-
- public void setIdCardPositive(String idCardPositive) {
- this.idCardPositive = idCardPositive;
- }
-
- public String getIdCardReverse() {
- return idCardReverse;
- }
-
- public void setIdCardReverse(String idCardReverse) {
- this.idCardReverse = idCardReverse;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getScopeCode() {
- return scopeCode;
- }
-
- public void setScopeCode(String scopeCode) {
- this.scopeCode = scopeCode;
- }
-
- public String getServiceScope() {
- return serviceScope;
- }
-
- public void setServiceScope(String serviceScope) {
- this.serviceScope = serviceScope;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getIsSpe() {
- return isSpe;
- }
-
- public void setIsSpe(Integer isSpe) {
- this.isSpe = isSpe;
- }
-
- public Integer getIsTaxi() {
- return isTaxi;
- }
-
- public void setIsTaxi(Integer isTaxi) {
- this.isTaxi = isTaxi;
- }
-
- public Integer getIsCross() {
- return isCross;
- }
-
- public void setIsCross(Integer isCross) {
- this.isCross = isCross;
- }
-
- public Integer getIsCrossLogistics() {
- return isCrossLogistics;
- }
-
- public void setIsCrossLogistics(Integer isCrossLogistics) {
- this.isCrossLogistics = isCrossLogistics;
- }
-
- public Integer getIsSameLogistics() {
- return isSameLogistics;
- }
-
- public void setIsSameLogistics(Integer isSameLogistics) {
- this.isSameLogistics = isSameLogistics;
- }
-
- public Integer getIsCharter() {
- return isCharter;
- }
-
- public void setIsCharter(Integer isCharter) {
- this.isCharter = isCharter;
- }
-
- public Integer getIsSpeFixedOrProportional() {
- return isSpeFixedOrProportional;
- }
-
- public void setIsSpeFixedOrProportional(Integer isSpeFixedOrProportional) {
- this.isSpeFixedOrProportional = isSpeFixedOrProportional;
- }
-
- public Integer getIsTaxiFixedOrProportional() {
- return isTaxiFixedOrProportional;
- }
-
- public void setIsTaxiFixedOrProportional(Integer isTaxiFixedOrProportional) {
- this.isTaxiFixedOrProportional = isTaxiFixedOrProportional;
- }
-
- public Integer getIsCrossLogisticsFixedOrProportional() {
- return isCrossLogisticsFixedOrProportional;
- }
-
- public void setIsCrossLogisticsFixedOrProportional(Integer isCrossLogisticsFixedOrProportional) {
- this.isCrossLogisticsFixedOrProportional = isCrossLogisticsFixedOrProportional;
- }
-
- public Integer getIsSameLogisticsFixedOrProportional() {
- return isSameLogisticsFixedOrProportional;
- }
-
- public void setIsSameLogisticsFixedOrProportional(Integer isSameLogisticsFixedOrProportional) {
- this.isSameLogisticsFixedOrProportional = isSameLogisticsFixedOrProportional;
- }
-
- public Double getSpeMoney() {
- return speMoney;
- }
-
- public void setSpeMoney(Double speMoney) {
- this.speMoney = speMoney;
- }
-
- public Double getTaxiMoney() {
- return taxiMoney;
- }
-
- public void setTaxiMoney(Double taxiMoney) {
- this.taxiMoney = taxiMoney;
- }
-
- public Double getCrossLogisticsMoney() {
- return crossLogisticsMoney;
- }
-
- public void setCrossLogisticsMoney(Double crossLogisticsMoney) {
- this.crossLogisticsMoney = crossLogisticsMoney;
- }
-
- public Double getSameLogisticsMoney() {
- return sameLogisticsMoney;
- }
-
- public void setSameLogisticsMoney(Double sameLogisticsMoney) {
- this.sameLogisticsMoney = sameLogisticsMoney;
- }
-
- public Integer getIsNeedFerry() {
- return isNeedFerry;
- }
-
- public void setIsNeedFerry(Integer isNeedFerry) {
- this.isNeedFerry = isNeedFerry;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getSuperiorId() {
- return superiorId;
- }
-
- public void setSuperiorId(Integer superiorId) {
- this.superiorId = superiorId;
- }
-
- public String getPrincipalName() {
- return principalName;
- }
-
- public void setPrincipalName(String principalName) {
- this.principalName = principalName;
- }
-
- public String getPrincipalPhone() {
- return principalPhone;
- }
-
- public void setPrincipalPhone(String principalPhone) {
- this.principalPhone = principalPhone;
- }
-
- public String getAdminName() {
- return adminName;
- }
-
- public void setAdminName(String adminName) {
- this.adminName = adminName;
- }
-
- public String getAdminPhone() {
- return adminPhone;
- }
-
- public void setAdminPhone(String adminPhone) {
- this.adminPhone = adminPhone;
- }
-
- public String getUrgentPhoen() {
- return urgentPhoen;
- }
-
- public void setUrgentPhoen(String urgentPhoen) {
- this.urgentPhoen = urgentPhoen;
- }
-
- public Date getSetupTime() {
- return setupTime;
- }
-
- public void setSetupTime(Date setupTime) {
- this.setupTime = setupTime;
- }
-
- public String getIdentifier() {
- return identifier;
- }
-
- public void setIdentifier(String identifier) {
- this.identifier = identifier;
- }
-
- public String getAddressCode() {
- return addressCode;
- }
-
- public void setAddressCode(String addressCode) {
- this.addressCode = addressCode;
- }
-
- public String getBusinessScope() {
- return businessScope;
- }
-
- public void setBusinessScope(String businessScope) {
- this.businessScope = businessScope;
- }
-
- public String getContactAddress() {
- return contactAddress;
- }
-
- public void setContactAddress(String contactAddress) {
- this.contactAddress = contactAddress;
- }
-
- public String getDocumentAddress() {
- return documentAddress;
- }
-
- public void setDocumentAddress(String documentAddress) {
- this.documentAddress = documentAddress;
- }
-
- public String getEconomicType() {
- return economicType;
- }
-
- public void setEconomicType(String economicType) {
- this.economicType = economicType;
- }
-
- public String getRegCapital() {
- return regCapital;
- }
-
- public void setRegCapital(String regCapital) {
- this.regCapital = regCapital;
- }
-
- public String getLegalName() {
- return legalName;
- }
-
- public void setLegalName(String legalName) {
- this.legalName = legalName;
- }
-
- public String getLegalId() {
- return legalId;
- }
-
- public void setLegalId(String legalId) {
- this.legalId = legalId;
- }
-
- public String getLegalPhone() {
- return legalPhone;
- }
-
- public void setLegalPhone(String legalPhone) {
- this.legalPhone = legalPhone;
- }
-
- public String getLegalPhotoUrl() {
- return legalPhotoUrl;
- }
-
- public void setLegalPhotoUrl(String legalPhotoUrl) {
- this.legalPhotoUrl = legalPhotoUrl;
- }
-
- public String getLicensingAgency() {
- return licensingAgency;
- }
-
- public void setLicensingAgency(String licensingAgency) {
- this.licensingAgency = licensingAgency;
- }
-
- public Date getLicenseTime() {
- return licenseTime;
- }
-
- public void setLicenseTime(Date licenseTime) {
- this.licenseTime = licenseTime;
- }
-
- public Date getLicenseStartTime() {
- return licenseStartTime;
- }
-
- public void setLicenseStartTime(Date licenseStartTime) {
- this.licenseStartTime = licenseStartTime;
- }
-
- public Date getLicenseEndTime() {
- return licenseEndTime;
- }
-
- public void setLicenseEndTime(Date licenseEndTime) {
- this.licenseEndTime = licenseEndTime;
- }
-
- public String getLicenseNumber() {
- return licenseNumber;
- }
-
- public void setLicenseNumber(String licenseNumber) {
- this.licenseNumber = licenseNumber;
- }
-
- public Integer getCarNum() {
- return carNum;
- }
-
- public void setCarNum(Integer carNum) {
- this.carNum = carNum;
- }
-
- public Integer getDriverNum() {
- return driverNum;
- }
-
- public void setDriverNum(Integer driverNum) {
- this.driverNum = driverNum;
- }
-
- public String getMac() {
- return mac;
- }
-
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public String getUpload() {
- return upload;
- }
-
- public void setUpload(String upload) {
- this.upload = upload;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getDetailAddress() {
- return detailAddress;
- }
-
- public void setDetailAddress(String detailAddress) {
- this.detailAddress = detailAddress;
- }
-
- @Override
- public String toString() {
- return "TCompany{" +
- "id=" + id +
- ", isSpe=" + isSpe +
- ", isTaxi=" + isTaxi +
- ", isCross=" + isCross +
- ", isCrossLogistics=" + isCrossLogistics +
- ", isSameLogistics=" + isSameLogistics +
- ", isCharter=" + isCharter +
- ", isSpeFixedOrProportional=" + isSpeFixedOrProportional +
- ", isTaxiFixedOrProportional=" + isTaxiFixedOrProportional +
- ", isCrossLogisticsFixedOrProportional=" + isCrossLogisticsFixedOrProportional +
- ", isSameLogisticsFixedOrProportional=" + isSameLogisticsFixedOrProportional +
- ", speMoney=" + speMoney +
- ", taxiMoney=" + taxiMoney +
- ", crossLogisticsMoney=" + crossLogisticsMoney +
- ", sameLogisticsMoney=" + sameLogisticsMoney +
- ", isNeedFerry=" + isNeedFerry +
- ", name=" + name +
- ", type=" + type +
- ", superiorId=" + superiorId +
- ", principalName=" + principalName +
- ", principalPhone=" + principalPhone +
- ", adminName=" + adminName +
- ", adminPhone=" + adminPhone +
- ", urgentPhoen=" + urgentPhoen +
- ", setupTime=" + setupTime +
- ", identifier=" + identifier +
- ", addressCode=" + addressCode +
- ", businessScope=" + businessScope +
- ", contactAddress=" + contactAddress +
- ", documentAddress=" + documentAddress +
- ", economicType=" + economicType +
- ", regCapital=" + regCapital +
- ", legalName=" + legalName +
- ", legalId=" + legalId +
- ", legalPhone=" + legalPhone +
- ", legalPhotoUrl=" + legalPhotoUrl +
- ", licensingAgency=" + licensingAgency +
- ", licenseTime=" + licenseTime +
- ", licenseStartTime=" + licenseStartTime +
- ", licenseEndTime=" + licenseEndTime +
- ", licenseNumber=" + licenseNumber +
- ", carNum=" + carNum +
- ", driverNum=" + driverNum +
- ", mac=" + mac +
- ", state=" + state +
- ", flag=" + flag +
- ", upload=" + upload +
- ", insertTime=" + insertTime +
- ", detailAddress=" + detailAddress +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SelectCountReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SelectCountReq.java
deleted file mode 100644
index 6cf53a9..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/SelectCountReq.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SelectCountReq {
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date time;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date time1;
- private Integer flag;
- private Integer companyId;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TCompanyCityResp.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TCompanyCityResp.java
deleted file mode 100644
index 086c397..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TCompanyCityResp.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * <p>
- * 公司经营地区
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-06
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TCompanyCityResp {
-
- private Integer id;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 省Code
- */
- @Deprecated
- private Integer provinceCode;
- /**
- * 市Code
- */
- @Deprecated
- private Integer cityCode;
- /**
- * 区Code
- */
- @Deprecated
- private Integer areaCode;
- /**
- * 开通城市id
- */
- private Integer openCityId;
- /**
- * 1=正常，2=删除
- */
- private Integer state;
-
- @Deprecated
- private Integer cityId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getOpenCityId() {
- return openCityId;
- }
-
- public void setOpenCityId(Integer openCityId) {
- this.openCityId = openCityId;
- }
-
- public Integer getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(Integer provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public Integer getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(Integer cityCode) {
- this.cityCode = cityCode;
- }
-
- public Integer getAreaCode() {
- return areaCode;
- }
-
- public void setAreaCode(Integer areaCode) {
- this.areaCode = areaCode;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
-
- @Override
- public String toString() {
- return "TCompanyCity{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", provinceCode=" + provinceCode +
- ", cityCode=" + cityCode +
- ", areaCode=" + areaCode +
- ", state=" + state +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TDriverReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TDriverReq.java
deleted file mode 100644
index 190f3ff..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TDriverReq.java
+++ /dev/null
@@ -1,879 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 司机表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-04
- */
-@Data
-public class TDriverReq {
-
-
- private Integer id;
- /**
- * 登录账号
- */
- private String account;
- /**
- * 工号
- */
- private String jobNumber;
- /**
- * 手机号
- */
- private String phone;
- /**
- * 密码
- */
- private String password;
- /**
- * 姓名
- */
- private String name;
- /**
- * 性别(1=男，2=女)1:man 2:woman
- */
- private Integer sex;
- /**
- * 身份证号
- */
- private String idCard;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 加盟商ID
- */
- private Integer franchiseeId;
- /**
- * 头像照片
- */
- private String headImgUrl;
- /**
- * 人脸识别照片
- */
- private String faceImgUrl;
- /**
- * 身份证正面照片
- */
- private String idCardImgUrl1;
- /**
- * 身份证背面照片
- */
- private String idCardImgUrl2;
- /**
- * 网约车司机注册地行政区域
- */
- private String placeOfEmployment;
- /**
- * 生日
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date birthday;
- /**
- * 银行卡号
- */
- private String bankCardNumber;
- /**
- * 国籍
- */
- private String driverNationality;
- /**
- * 民族
- */
- private String driverNation;
- /**
- * 婚姻状况（1：未婚，2：已婚，3：离异）
- */
- private Integer driverMaritalStatus;
- /**
- * 外语能力
- */
- private String driverLanguageLevel;
- /**
- * 学历
- */
- private String driverEducation;
- /**
- * 户口登记机关名称
- */
- private String driverCensus;
- /**
- * 户口地址或常住地址
- */
- private String driverAddress;
- /**
- * 通信地址
- */
- private String driverContactAddress;
- /**
- * 驾龄
- */
- private Integer driverAge;
- /**
- * 驾驶证号
- */
- private String driveCard;
- /**
- * 驾驶证照片
- */
- private String driveCardImgUrl;
- /**
- * 准驾车型
- */
- private String driverType;
- /**
- * 初次领取驾驶证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date getDriverLicenseDate;
- /**
- * 驾驶证有效期限起
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date driverLicenseOn;
- /**
- * 驾驶证有效期限止
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date driverLicenseOff;
- /**
- * 是否巡游出租车驾驶员（0：否，1：是）0:N 1:Y
- */
- private Integer taxiDriver;
- /**
- * 出租车资格证号
- */
- private String taxiAptitudeCard;
- /**
- * 网约车资格证照片
- */
- private String networkCarlssueImg;
- /**
- * 网络预约出租车驾驶员证发证机构
- */
- private String networkCarlssueOrganization;
- /**
- * 资格证发证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarlssueDate;
- /**
- * 初次认领资格证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date getNetworkCarProofDate;
- /**
- * 资格证有效起始日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarProofOn;
- /**
- * 资格证有效截至日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarProofOff;
- /**
- * 报备日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date registerDate;
- /**
- * 是否专职驾驶员（0：否，1：是）0:N 1:Y
- */
- private Integer fullTimeDriver;
- /**
- * 是否在驾驶员黑名单内（0：否，1：是）0:N 1:Y
- */
- private Integer inDriverBlacklist;
- /**
- * 服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
- * Service types (1: Online reserved taxi, 2: Regular taxi, 3: Private carpooling).
- */
- private Integer commercialType;
- /**
- * 驾驶员合同签署公司
- */
- private String contractCompany;
- /**
- * 合同有效期起
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date contractOn;
- /**
- * 合同有效期止
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date contractOff;
- /**
- * 紧急联系人
- */
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- private String emergencyContactPhone;
- /**
- * 紧急联系地址
- */
- private String emergencyContactAddress;
- /**
- * 备注
- */
- private String remark;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- @TableField("isPlatCar")
- private Integer isPlatCar;
- /**
- * 司机管理车辆id
- */
- private Integer carId;
- /**
- * 状态(1=待审核，2=正常，3=冻结，4=拒绝)
- * 1=Pending review, 2=Normal, 3=Frozen, 4=Rejected
- */
- private Integer authState;
- /**
- * 司机状态(1=离线，2=空闲，3=服务中) 1:outline ,2:leisure 3:in service
- */
- private Integer state;
- /**
- * 1：创建，2：修改，3：删除
- */
- private String flag;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- private Integer insertUser;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
- private Integer updateUser;
- /**
- * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- */
- private Integer addType;
- /**
- * 余额
- */
- private BigDecimal balance;
- /**
- * 业务总收入
- * @return
- */
- @TableField("businessMoney")
- private Double businessMoney;
- /**
- * 剩余未提现业务总收入
- * @return
- */
- @TableField("laveBusinessMoney")
- private Double laveBusinessMoney;
- /**
- * 添加司机的分公司/加盟商ID
- */
- private Integer addObjectId;
-
- public BigDecimal getBalance() {
- return balance;
- }
-
- public void setBalance(BigDecimal balance) {
- this.balance = balance;
- }
-
- public Integer getAddObjectId() {
- return addObjectId;
- }
-
- public void setAddObjectId(Integer addObjectId) {
- this.addObjectId = addObjectId;
- }
-
- public Integer getFranchiseeId() {
- return franchiseeId;
- }
-
- public void setFranchiseeId(Integer franchiseeId) {
- this.franchiseeId = franchiseeId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getJobNumber() {
- return jobNumber;
- }
-
- public void setJobNumber(String jobNumber) {
- this.jobNumber = jobNumber;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getHeadImgUrl() {
- return headImgUrl;
- }
-
- public void setHeadImgUrl(String headImgUrl) {
- this.headImgUrl = headImgUrl;
- }
-
- public String getFaceImgUrl() {
- return faceImgUrl;
- }
-
- public void setFaceImgUrl(String faceImgUrl) {
- this.faceImgUrl = faceImgUrl;
- }
-
- public String getIdCardImgUrl1() {
- return idCardImgUrl1;
- }
-
- public void setIdCardImgUrl1(String idCardImgUrl1) {
- this.idCardImgUrl1 = idCardImgUrl1;
- }
-
- public String getIdCardImgUrl2() {
- return idCardImgUrl2;
- }
-
- public void setIdCardImgUrl2(String idCardImgUrl2) {
- this.idCardImgUrl2 = idCardImgUrl2;
- }
-
- public String getPlaceOfEmployment() {
- return placeOfEmployment;
- }
-
- public void setPlaceOfEmployment(String placeOfEmployment) {
- this.placeOfEmployment = placeOfEmployment;
- }
-
- public Date getBirthday() {
- return birthday;
- }
-
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
- }
-
- public String getBankCardNumber() {
- return bankCardNumber;
- }
-
- public void setBankCardNumber(String bankCardNumber) {
- this.bankCardNumber = bankCardNumber;
- }
-
- public String getDriverNationality() {
- return driverNationality;
- }
-
- public void setDriverNationality(String driverNationality) {
- this.driverNationality = driverNationality;
- }
-
- public String getDriverNation() {
- return driverNation;
- }
-
- public void setDriverNation(String driverNation) {
- this.driverNation = driverNation;
- }
-
- public Integer getDriverMaritalStatus() {
- return driverMaritalStatus;
- }
-
- public void setDriverMaritalStatus(Integer driverMaritalStatus) {
- this.driverMaritalStatus = driverMaritalStatus;
- }
-
- public String getDriverLanguageLevel() {
- return driverLanguageLevel;
- }
-
- public void setDriverLanguageLevel(String driverLanguageLevel) {
- this.driverLanguageLevel = driverLanguageLevel;
- }
-
- public String getDriverEducation() {
- return driverEducation;
- }
-
- public void setDriverEducation(String driverEducation) {
- this.driverEducation = driverEducation;
- }
-
- public String getDriverCensus() {
- return driverCensus;
- }
-
- public void setDriverCensus(String driverCensus) {
- this.driverCensus = driverCensus;
- }
-
- public String getDriverAddress() {
- return driverAddress;
- }
-
- public void setDriverAddress(String driverAddress) {
- this.driverAddress = driverAddress;
- }
-
- public String getDriverContactAddress() {
- return driverContactAddress;
- }
-
- public void setDriverContactAddress(String driverContactAddress) {
- this.driverContactAddress = driverContactAddress;
- }
-
- public Integer getDriverAge() {
- return driverAge;
- }
-
- public void setDriverAge(Integer driverAge) {
- this.driverAge = driverAge;
- }
-
- public String getDriveCard() {
- return driveCard;
- }
-
- public void setDriveCard(String driveCard) {
- this.driveCard = driveCard;
- }
-
- public String getDriveCardImgUrl() {
- return driveCardImgUrl;
- }
-
- public void setDriveCardImgUrl(String driveCardImgUrl) {
- this.driveCardImgUrl = driveCardImgUrl;
- }
-
- public String getDriverType() {
- return driverType;
- }
-
- public void setDriverType(String driverType) {
- this.driverType = driverType;
- }
-
- public Date getGetDriverLicenseDate() {
- return getDriverLicenseDate;
- }
-
- public void setGetDriverLicenseDate(Date getDriverLicenseDate) {
- this.getDriverLicenseDate = getDriverLicenseDate;
- }
-
- public Date getDriverLicenseOn() {
- return driverLicenseOn;
- }
-
- public void setDriverLicenseOn(Date driverLicenseOn) {
- this.driverLicenseOn = driverLicenseOn;
- }
-
- public Date getDriverLicenseOff() {
- return driverLicenseOff;
- }
-
- public void setDriverLicenseOff(Date driverLicenseOff) {
- this.driverLicenseOff = driverLicenseOff;
- }
-
- public Integer getTaxiDriver() {
- return taxiDriver;
- }
-
- public void setTaxiDriver(Integer taxiDriver) {
- this.taxiDriver = taxiDriver;
- }
-
- public String getTaxiAptitudeCard() {
- return taxiAptitudeCard;
- }
-
- public void setTaxiAptitudeCard(String taxiAptitudeCard) {
- this.taxiAptitudeCard = taxiAptitudeCard;
- }
-
- public String getNetworkCarlssueImg() {
- return networkCarlssueImg;
- }
-
- public void setNetworkCarlssueImg(String networkCarlssueImg) {
- this.networkCarlssueImg = networkCarlssueImg;
- }
-
- public String getNetworkCarlssueOrganization() {
- return networkCarlssueOrganization;
- }
-
- public void setNetworkCarlssueOrganization(String networkCarlssueOrganization) {
- this.networkCarlssueOrganization = networkCarlssueOrganization;
- }
-
- public Date getNetworkCarlssueDate() {
- return networkCarlssueDate;
- }
-
- public void setNetworkCarlssueDate(Date networkCarlssueDate) {
- this.networkCarlssueDate = networkCarlssueDate;
- }
-
- public Date getGetNetworkCarProofDate() {
- return getNetworkCarProofDate;
- }
-
- public void setGetNetworkCarProofDate(Date getNetworkCarProofDate) {
- this.getNetworkCarProofDate = getNetworkCarProofDate;
- }
-
- public Date getNetworkCarProofOn() {
- return networkCarProofOn;
- }
-
- public void setNetworkCarProofOn(Date networkCarProofOn) {
- this.networkCarProofOn = networkCarProofOn;
- }
-
- public Date getNetworkCarProofOff() {
- return networkCarProofOff;
- }
-
- public void setNetworkCarProofOff(Date networkCarProofOff) {
- this.networkCarProofOff = networkCarProofOff;
- }
-
- public Date getRegisterDate() {
- return registerDate;
- }
-
- public void setRegisterDate(Date registerDate) {
- this.registerDate = registerDate;
- }
-
- public Integer getFullTimeDriver() {
- return fullTimeDriver;
- }
-
- public void setFullTimeDriver(Integer fullTimeDriver) {
- this.fullTimeDriver = fullTimeDriver;
- }
-
- public Integer getInDriverBlacklist() {
- return inDriverBlacklist;
- }
-
- public void setInDriverBlacklist(Integer inDriverBlacklist) {
- this.inDriverBlacklist = inDriverBlacklist;
- }
-
- public Integer getCommercialType() {
- return commercialType;
- }
-
- public void setCommercialType(Integer commercialType) {
- this.commercialType = commercialType;
- }
-
- public String getContractCompany() {
- return contractCompany;
- }
-
- public void setContractCompany(String contractCompany) {
- this.contractCompany = contractCompany;
- }
-
- public Date getContractOn() {
- return contractOn;
- }
-
- public void setContractOn(Date contractOn) {
- this.contractOn = contractOn;
- }
-
- public Date getContractOff() {
- return contractOff;
- }
-
- public void setContractOff(Date contractOff) {
- this.contractOff = contractOff;
- }
-
- public String getEmergencyContact() {
- return emergencyContact;
- }
-
- public void setEmergencyContact(String emergencyContact) {
- this.emergencyContact = emergencyContact;
- }
-
- public String getEmergencyContactPhone() {
- return emergencyContactPhone;
- }
-
- public void setEmergencyContactPhone(String emergencyContactPhone) {
- this.emergencyContactPhone = emergencyContactPhone;
- }
-
- public String getEmergencyContactAddress() {
- return emergencyContactAddress;
- }
-
- public void setEmergencyContactAddress(String emergencyContactAddress) {
- this.emergencyContactAddress = emergencyContactAddress;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getIsPlatCar() {
- return isPlatCar;
- }
-
- public void setIsPlatCar(Integer isPlatCar) {
- this.isPlatCar = isPlatCar;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getAuthState() {
- return authState;
- }
-
- public void setAuthState(Integer authState) {
- this.authState = authState;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- public Integer getAddType() {
- return addType;
- }
-
- public void setAddType(Integer addType) {
- this.addType = addType;
- }
-
- public Double getLaveBusinessMoney() {
- return laveBusinessMoney;
- }
-
- public void setLaveBusinessMoney(Double laveBusinessMoney) {
- this.laveBusinessMoney = laveBusinessMoney;
- }
-
- public Double getBusinessMoney() {
- return businessMoney;
- }
-
- public void setBusinessMoney(Double businessMoney) {
- this.businessMoney = businessMoney;
- }
-
-
- @Override
- public String toString() {
- return "TDriver{" +
- "id=" + id +
- ", account=" + account +
- ", jobNumber=" + jobNumber +
- ", phone=" + phone +
- ", password=" + password +
- ", name=" + name +
- ", sex=" + sex +
- ", idCard=" + idCard +
- ", companyId=" + companyId +
- ", headImgUrl=" + headImgUrl +
- ", faceImgUrl=" + faceImgUrl +
- ", idCardImgUrl1=" + idCardImgUrl1 +
- ", idCardImgUrl2=" + idCardImgUrl2 +
- ", placeOfEmployment=" + placeOfEmployment +
- ", birthday=" + birthday +
- ", bankCardNumber=" + bankCardNumber +
- ", driverNationality=" + driverNationality +
- ", driverNation=" + driverNation +
- ", driverMaritalStatus=" + driverMaritalStatus +
- ", driverLanguageLevel=" + driverLanguageLevel +
- ", driverEducation=" + driverEducation +
- ", driverCensus=" + driverCensus +
- ", driverAddress=" + driverAddress +
- ", driverContactAddress=" + driverContactAddress +
- ", driverAge=" + driverAge +
- ", driveCard=" + driveCard +
- ", driveCardImgUrl=" + driveCardImgUrl +
- ", driverType=" + driverType +
- ", getDriverLicenseDate=" + getDriverLicenseDate +
- ", driverLicenseOn=" + driverLicenseOn +
- ", driverLicenseOff=" + driverLicenseOff +
- ", taxiDriver=" + taxiDriver +
- ", taxiAptitudeCard=" + taxiAptitudeCard +
- ", networkCarlssueImg=" + networkCarlssueImg +
- ", networkCarlssueOrganization=" + networkCarlssueOrganization +
- ", networkCarlssueDate=" + networkCarlssueDate +
- ", getNetworkCarProofDate=" + getNetworkCarProofDate +
- ", networkCarProofOn=" + networkCarProofOn +
- ", networkCarProofOff=" + networkCarProofOff +
- ", registerDate=" + registerDate +
- ", fullTimeDriver=" + fullTimeDriver +
- ", inDriverBlacklist=" + inDriverBlacklist +
- ", commercialType=" + commercialType +
- ", contractCompany=" + contractCompany +
- ", contractOn=" + contractOn +
- ", contractOff=" + contractOff +
- ", emergencyContact=" + emergencyContact +
- ", emergencyContactPhone=" + emergencyContactPhone +
- ", emergencyContactAddress=" + emergencyContactAddress +
- ", remark=" + remark +
- ", isPlatCar=" + isPlatCar +
- ", carId=" + carId +
- ", authState=" + authState +
- ", state=" + state +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- ", addType=" + addType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserOutUser.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserOutUser.java
deleted file mode 100644
index a0916d5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserOutUser.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TUserOutUser {
- private Integer roleType;
- private Integer nowUserId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserReq.java
deleted file mode 100644
index f00c5a1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TUserReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TUserReq {
- private String phone;
- private Integer flag;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateCompanyDriverReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateCompanyDriverReq.java
deleted file mode 100644
index 5c43568..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateCompanyDriverReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateCompanyDriverReq {
- private int i;
- private Integer id;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateUserRedPacketRecordReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateUserRedPacketRecordReq.java
deleted file mode 100644
index 334e427..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UpdateUserRedPacketRecordReq.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 用户红包记录
- */
-@Data
-public class UpdateUserRedPacketRecordReq {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 金额
- */
- private Double money;
- /**
- * 过期时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date expirationTime;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 状态（0=临时，1=未使用，2=已使用，3=已过期）
- */
- private Integer state;
- /**
- * 使用结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
- /**
- * 订单id(获取红包的订单)
- */
- private Long orderId;
- /**
- * 订单类型（1=专车，4=小件物流）
- */
- private Integer orderType;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 活动id
- * @return
- */
- private Integer redPacketActivityId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserActivityInsertOrUpdateReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserActivityInsertOrUpdateReq.java
deleted file mode 100644
index fe7ca56..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserActivityInsertOrUpdateReq.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserActivityInsertOrUpdateReq {
- private Integer id;
- private String name;
- private String startTime;
- private Integer registCouponId;
- private Integer registEnable;
- private Integer registNumber;
- private Integer registEffective;
- private Integer inviteCouponId;
- private Integer inviteEnable;
- private Integer inviteNumber;
- private Integer inviteEffective;
- private Integer balanceEnable;
- private String balanceInfo;
- private Integer discountEnable;
- private Double discountSpecial;
- private Double discountTaxi;
- private Double discountLogistics;
- private Integer redenvelopeId;
- private Integer redenvelopeEnable;
- private Double registerPrice;
- private Double invitationPrice;
- private Double redPrice;
- private Integer objectId;
- private Integer roleType;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordQueryReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordQueryReq.java
deleted file mode 100644
index ea941ba..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordQueryReq.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserCouponRecordQueryReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private String userName;
- private String userPhone;
- private Integer couponActivityId;
- private Integer activityType;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordRes.java
deleted file mode 100644
index dc2abf0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserCouponRecordRes.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class UserCouponRecordRes {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 金额
- */
- private Double money;
- /**
- * 满减的满金额
- */
- private Double fullMoney;
- /**
- * 过期时间
- */
- private Date expirationTime;
- /**
- * 添加时间
- */
- private Date insertTime;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 状态（1=未使用，2=已使用，3=已过期）
- */
- private Integer state;
- /**
- * 使用结束时间
- */
- private Date endTime;
- /**
- * 优惠券使用类型（0=通用，1=专车，4=小件物流）
- */
- private Integer couponUseType;
- /**
- * 优惠券类型（1=抵扣券，2=满减券）
- */
- private Integer couponType;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 优惠券id
- * @return
- */
- private Integer couponId;
- /**
- * 活动id
- * @return
- */
- private Integer couponActivityId;
- /**
- * 活动类型（1=赠送活动，2=注册，3=邀请，4=充值）
- * @return
- */
- private Integer activityType;
- /**
- * 充值记录id
- * @return
- */
- private Integer paymentRecordId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserLargeCouponReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserLargeCouponReq.java
deleted file mode 100644
index 0d68d23..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserLargeCouponReq.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserLargeCouponReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private String name;
- private Integer status;
- private Integer companyId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserRedPacketRecordRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserRedPacketRecordRes.java
deleted file mode 100644
index f2cdde3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/UserRedPacketRecordRes.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 用户红包记录
- */
-@Data
-public class UserRedPacketRecordRes {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 金额
- */
- private Double money;
- /**
- * 过期时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date expirationTime;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 状态（0=临时，1=未使用，2=已使用，3=已过期）
- */
- private Integer state;
- /**
- * 使用结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
- /**
- * 订单id(获取红包的订单)
- */
- private Long orderId;
- /**
- * 订单类型（1=专车，4=小件物流）
- */
- private Integer orderType;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 活动id
- * @return
- */
- private Integer redPacketActivityId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedReq.java
deleted file mode 100644
index 6a3daa7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedReq.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 实名认证记录
- */
-@Data
-public class VerifiedReq {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 认证姓名
- */
- private String name;
- /**
- * 身份证号码
- */
- private String idcode;
- /**
- * 身份证正面照
- */
- private String img1;
- /**
- * 身份证背面照
- */
- private String img2;
- /**
- * 认证结果(1=待认证，2=认证通过，3=认证失败)
- */
- private Integer state;
- /**
- * 请求时间
- */
- private Date insertTime;
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedSearchReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedSearchReq.java
deleted file mode 100644
index 622b6a3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/VerifiedSearchReq.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.feignClient.activity.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class VerifiedSearchReq {
- private Page<Map<String, Object>> page;
- private String beginTime;
- private String endTime;
- private String userName;
- private String userPhone;
- private String name;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/app/OpenCityClinet.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/app/OpenCityClinet.java
deleted file mode 100644
index fbdd20f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/app/OpenCityClinet.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.feignClient.app;
-
-import com.dsh.guns.modular.system.model.TOpenCity;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- * @author zhibing.pu
- * @date 2023/5/4 12:07
- */
-@FeignClient("mb-cloud-app")
-public interface OpenCityClinet {
-
-
- /**
- * 保存地理围栏到mongodb
- * @param tOpenCity
- */
- @PostMapping("/base/openCity/saveMongodb")
- void saveMongodb(TOpenCity tOpenCity);
-
-
- /**
- * 删除数据
- * @param openCityId
- */
- @PostMapping("/base/openCity/delMongodb")
- void delMongodb(Integer openCityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/UserClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/UserClient.java
deleted file mode 100644
index e56c3b2..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/UserClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.course.feignClient.auth;
-
-import com.dsh.course.feignClient.auth.model.GetTokenRequest;
-import com.dsh.course.feignClient.auth.model.RefreshTokenRequest;
-import com.dsh.course.feignClient.auth.model.TokenResponse;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient("mb-cloud-auth")
-public interface UserClient {
-
- /**
- * 获取登录token
- * @param request
- * @return
- */
- @PostMapping("/oauth/getToken")
- TokenResponse getToken(GetTokenRequest request);
-
-
- /**
- * 刷新登录token
- * @param request
- * @return
- */
- @PostMapping("/oauth/refreshToken")
- TokenResponse refreshToken(RefreshTokenRequest request);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/GetTokenRequest.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/GetTokenRequest.java
deleted file mode 100644
index af041e3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/GetTokenRequest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.feignClient.auth.model;
-
-import lombok.Data;
-
-@Data
-public class GetTokenRequest {
- /**
- * 用户名
- */
- private String username;
- /**
- * 密码
- */
- private String password;
- /**
- * 存储对象
- */
- private Object object;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/RefreshTokenRequest.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/RefreshTokenRequest.java
deleted file mode 100644
index 3d2ef52..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/RefreshTokenRequest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.auth.model;
-
-import lombok.Data;
-
-@Data
-public class RefreshTokenRequest {
- /**
- * 原始token
- */
- private String token;
- /**
- * 刷新令牌凭证
- */
- private String refresh_token;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/TokenResponse.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/TokenResponse.java
deleted file mode 100644
index a785aef..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/auth/model/TokenResponse.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.feignClient.auth.model;
-
-import lombok.Data;
-
-@Data
-public class TokenResponse {
- /**
- * token
- */
- private String token;
- /**
- * 刷新token的凭证
- */
- private String refresh_token;
- /**
- * 过期时间
- */
- private Long expiration_time;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverClient.java
deleted file mode 100644
index a89b01a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverClient.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.course.feignClient.driver;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.model.GetUserInfoByNameOrPhone;
-import com.dsh.course.feignClient.activity.model.DriverNameReq;
-import com.dsh.course.feignClient.activity.model.DriverNameRes;
-import com.dsh.course.feignClient.activity.model.QueryOnlineDriverReq;
-import com.dsh.course.feignClient.activity.model.SelectCountReq;
-import com.dsh.course.feignClient.driver.model.*;
-import com.dsh.guns.modular.system.model.Driver;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-driver")
-public interface DriverClient {
-
- /**
- * 获取司机详情
- * @param id
- * @return
- */
- @PostMapping("/driver/getDriver")
- DriverInfoRes getDriver(Integer id);
-
-
- /**
- * 修改司机数据
- * @param req
- */
- @PostMapping("/driver/updateDriver")
- void updateDriver(DriverInfoReq req);
-
- @PostMapping("/driver/selectList")
- List<Driver> selectList(QueryWrapper<Driver> ne1);
-
-
- @PostMapping("/driver/selectCount")
- int selectCount(DriverSelectCountReq ne4);
-
-
- @PostMapping("/driver/getAuthDriverList")
- Page<Map<String, Object>> getAuthDriverList(QueryAuthDriverReq req);
-
- @PostMapping("/driver/getDriverList")
- Page<Map<String, Object>> getDriverList(QueryDriverListReq req);
-
-
- @PostMapping("/driver/getDriverListNoPage")
- List<Map<String, Object>> getDriverListNoPage( QueryDriverNoPageReq req);
-
-
- @PostMapping("/driver/insert")
- Integer insert(Driver driver);
-
-
- @PostMapping("/driver/getCanSelectCarList")
- List<Map<String, Object>> getCanSelectCarList(QueryCanselectCarReq req);
-
-
- @PostMapping("/driver/getDriverName")
- List<DriverNameRes> getDriverName(DriverNameReq req);
-
- @PostMapping("/driver/getdriverFromName")
- List<Driver> getdriverFromName(String driverName);
-
- @PostMapping("/driver/getDriverInfoByNameOrPhone")
- List<Map<String, Object>> getDriverInfoByNameOrPhone(GetUserInfoByNameOrPhone phone);
-
- @PostMapping("/driver/getDriverService")
- List<DriverService> getDriverService(Integer tDriverId);
-
- @PostMapping("/driver/queryOnlineDriverCount")
- int queryOnlineDriverCount(SelectCountReq req);
-
-
- @PostMapping("/driver/queryOnlineDriver")
- Map<String, Object> queryOnlineDriver( QueryOnlineDriverReq req);
-
-
-
- @PostMapping("/driver/getStateList")
- List<Driver> getStateList();
-
-
- @PostMapping("/driver/selectList1")
- List<Driver> selectList1(Integer companyId);
- @PostMapping("/driver/withholding")
- void withholding(WithholdingDto withholdingDto);
- @PostMapping("/driver/getWithholding")
- BigDecimal getWithholding();
-
- @PostMapping("/driver/getWithoutList")
- Page<WithoutListVo> getWithoutList(WithoutListReq withoutListReq);
-
- @PostMapping("/driver/getGroupConcat")
- String getGroupConcat(Integer nowUserId);
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverOrdersClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverOrdersClient.java
deleted file mode 100644
index 536086b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverOrdersClient.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.course.feignClient.driver;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import com.dsh.guns.modular.system.util.ResultUtil;
-
-import java.util.List;
-
-@FeignClient("mb-cloud-driver")
-public interface DriverOrdersClient {
-
-
- @PostMapping("/driverOrders/queryOrders")
- ResultUtil<List<Integer>> queryOrders(Integer uid);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverServiceClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverServiceClient.java
deleted file mode 100644
index bc6b69b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverServiceClient.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dsh.course.feignClient.driver;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.feignClient.driver.model.DriverService;
-import com.dsh.course.model.vo.BaseListWarpper;
-import com.dsh.guns.modular.system.model.TDriverService;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.List;
-
-@FeignClient("mb-cloud-driver")
-public interface DriverServiceClient {
-
-
- @PostMapping("/driverService/queryMyBusiness")
- BaseListWarpper queryMyBusiness(Integer uid);
-
- @RequestMapping("/driverService/insert")
- void insert(TDriverService service);
-
- @RequestMapping("/driverService/getListByDriverId")
- List<TDriverService> getListByDriverId(Integer tDriverId);
-
-
- @RequestMapping("/driverService/delete")
- void delete(QueryWrapper<DriverService> driverId);
-
-
- @RequestMapping("/driverService/deleteById")
- void deleteById(Integer id);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverTrainClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverTrainClient.java
deleted file mode 100644
index 62df297..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/DriverTrainClient.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.driver;
-
-import com.dsh.guns.modular.system.model.DriverTrain;
-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(value = "mb-cloud-driver",path = "driverTrain")
-public interface DriverTrainClient {
-
- @PostMapping("/queryDriverTrainById")
- DriverTrain queryDriverTrainById(Integer driverTrainId);
- @PostMapping("/queryAllTrain")
- List<DriverTrain> queryAllTrain(Integer driverId);
-
- @PostMapping("/deleteById")
- void deleteById( Integer id);
-
- @PostMapping("/updateById")
- void updateById(@RequestBody DriverTrain driverTrain);
-
- @PostMapping("/updateById")
- void insert(@RequestBody DriverTrain driverTrain);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoReq.java
deleted file mode 100644
index cc9c202..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoReq.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import com.dsh.course.entity.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class DriverInfoReq extends BaseBean {
- private Integer id;
- /**
- * 账号
- */
- private String account;
- /**
- * 工号
- */
- private String jobNumber;
- /**
- * 电话
- */
- private String phone;
- /**
- * 登录密码
- */
- private String password;
- /**
- * 提现密码
- */
- private String withdrawPassword;
- /**
- * 姓名
- */
- private String name;
- /**
- * 性别（1=男，2=女）1:man 2:woman
- */
- private Integer sex;
- /**
- * 身份证号码
- */
- private String idCard;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 加盟商id
- */
- private Integer franchiseeId;
- /**
- * 头像图片
- */
- private String headImgUrl;
- /**
- * 人脸识别照片
- */
- private String faceImgUrl;
- /**
- * 身份证正面照片
- */
- private String idCardImgUrl1;
- /**
- * 身份证背面照片
- */
- private String idCardImgUrl2;
- /**
- * 网约车注册地
- */
- private String placeOfEmployment;
- /**
- * 生日
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date birthday;
- /**
- * 银行卡号
- */
- private String bankCardNumber;
- /**
- * 国籍
- */
- private String driverNationality;
- /**
- * 民族
- */
- private String driverNation;
- /**
- * 婚姻状况（1：未婚，2：已婚，3：离异）1:unmarried 2:married 3:devorce
- */
- private Integer driverMaritalStatus;
- /**
- * 外语能力
- */
- private String driverLanguageLevel;
- /**
- * 学历
- */
- private String driverEducation;
- /**
- * 户口登记机关名称
- */
- private String driverCensus;
- /**
- * 户口地址或常住地址
- */
- private String driverAddress;
- /**
- * 通信地址
- */
- private String driverContactAddress;
- /**
- * 通信地址（带分隔符）
- */
- private String driverContactAddress_;
- /**
- * 驾龄
- */
- private Integer driverAge;
- /**
- * 驾驶证号码
- */
- private String driveCard;
- /**
- * 驾驶证照片
- */
- private String driveCardImgUrl;
- /**
- * 准驾车型
- */
- private String driverType;
- /**
- * 初次领取驾驶证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date getDriverLicenseDate;
- /**
- * 驾驶证有效期限起
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date driverLicenseOn;
- /**
- * 驾驶证有效期限止
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date driverLicenseOff;
- /**
- * 是否巡游出租车驾驶员（0：否，1：是）0:N 1:Y
- */
- private Integer taxiDriver;
- /**
- * 出租车资格证号
- */
- private String taxiAptitudeCard;
- /**
- * 网约车资格证照片
- */
- private String networkCarlssueImg;
- /**
- * 网络预约出租车驾驶员证发证机构
- */
- private String networkCarlssueOrganization;
- /**
- * 资格证发证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarlssueDate;
- /**
- * 初次认领资格证日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date getNetworkCarProofDate;
- /**
- * 资格证有效起始日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarProofOn;
- /**
- * 资格证有效截至日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarProofOff;
- /**
- * 报备日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date registerDate;
- /**
- * 是否专职驾驶员（0：否，1：是）0:N 1:Y
- */
- private Integer fullTimeDriver;
- /**
- * 是否在驾驶员黑名单内（0：否，1：是）0:N 1:Y
- */
- private Integer inDriverBlacklist;
- /**
- * 服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
- * Service types (1: Online reserved taxi, 2: Regular taxi, 3: Private carpooling).
- */
- private Integer commercialType;
- /**
- * 驾驶员合同签署公司
- */
- private String contractCompany;
- /**
- * 合同有效期起
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date contractOn;
- /**
- * 合同有效期止
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date contractOff;
- /**
- * 紧急联系人
- */
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- private String emergencyContactPhone;
- /**
- * 紧急联系地址
- */
- private String emergencyContactAddress;
- /**
- * 从业地（带分隔符）
- */
- private String placeOfPractice;
- /**
- * 备注
- */
- private String remark;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- private Integer isPlatCar;
- /**
- * 司机管理车辆id
- */
- private Integer carId;
- /**
- * 审核状态(1=待审核，2=正常，3=冻结，4=拒绝)
- * 1=Pending review, 2=Normal, 3=Frozen, 4=Rejected
- */
- private Integer authState;
- /**
- * 司机状态(1=离线，2=空闲，3=服务中) 1:outline ,2:leisure 3:in service
- */
- private Integer state;
- /**
- * 添加方式（1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加）
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- * @return
- */
- private Integer addType;
- /**
- * 账户余额
- * @return
- */
- private Double balance;
- /**
- * 活动总收入
- * @return
- */
- private Double activityMoney;
- /**
- * 剩余未提现活动总收入
- * @return
- */
- private Double laveActivityMoney;
- /**
- * 业务总收入
- * @return
- */
- private Double businessMoney;
- /**
- * 剩余未提现业务总收入
- * @return
- */
- private Double laveBusinessMoney;
- /**
- * 小程序openid
- */
- private String appletsOpenId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoRes.java
deleted file mode 100644
index d3290f5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverInfoRes.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import com.dsh.course.entity.BaseBean;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class DriverInfoRes extends BaseBean {
- private Integer id;
- /**
- * 账号
- */
- private String account;
- /**
- * 工号
- */
- private String jobNumber;
- /**
- * 电话
- */
- private String phone;
- /**
- * 登录密码
- */
- private String password;
- /**
- * 提现密码
- */
- private String withdrawPassword;
- /**
- * 姓名
- */
- private String name;
- /**
- * 性别（1=男，2=女）1:man 2:woman
- */
- private Integer sex;
- /**
- * 身份证号码
- */
- private String idCard;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 加盟商id
- */
- private Integer franchiseeId;
- /**
- * 头像图片
- */
- private String headImgUrl;
- /**
- * 人脸识别照片
- */
- private String faceImgUrl;
- /**
- * 身份证正面照片
- */
- private String idCardImgUrl1;
- /**
- * 身份证背面照片
- */
- private String idCardImgUrl2;
- /**
- * 网约车注册地
- */
- private String placeOfEmployment;
- /**
- * 生日
- */
- private Date birthday;
- /**
- * 银行卡号
- */
- private String bankCardNumber;
- /**
- * 国籍
- */
- private String driverNationality;
- /**
- * 民族
- */
- private String driverNation;
- /**
- * 婚姻状况（1：未婚，2：已婚，3：离异）1:unmarried 2:married 3:devorce
- */
- private Integer driverMaritalStatus;
- /**
- * 外语能力
- */
- private String driverLanguageLevel;
- /**
- * 学历
- */
- private String driverEducation;
- /**
- * 户口登记机关名称
- */
- private String driverCensus;
- /**
- * 户口地址或常住地址
- */
- private String driverAddress;
- /**
- * 通信地址
- */
- private String driverContactAddress;
- /**
- * 通信地址（带分隔符）
- */
- private String driverContactAddress_;
- /**
- * 驾龄
- */
- private Integer driverAge;
- /**
- * 驾驶证号码
- */
- private String driveCard;
- /**
- * 驾驶证照片
- */
- private String driveCardImgUrl;
- /**
- * 准驾车型
- */
- private String driverType;
- /**
- * 初次领取驾驶证日期
- */
- private Date getDriverLicenseDate;
- /**
- * 驾驶证有效期限起
- */
- private Date driverLicenseOn;
- /**
- * 驾驶证有效期限止
- */
- private Date driverLicenseOff;
- /**
- * 是否巡游出租车驾驶员（0：否，1：是）0:N 1:Y
- */
- private Integer taxiDriver;
- /**
- * 出租车资格证号
- */
- private String taxiAptitudeCard;
- /**
- * 网约车资格证照片
- */
- private String networkCarlssueImg;
- /**
- * 网络预约出租车驾驶员证发证机构
- */
- private String networkCarlssueOrganization;
- /**
- * 资格证发证日期
- */
- private Date networkCarlssueDate;
- /**
- * 初次认领资格证日期
- */
- private Date getNetworkCarProofDate;
- /**
- * 资格证有效起始日期
- */
- private Date networkCarProofOn;
- /**
- * 资格证有效截至日期
- */
- private Date networkCarProofOff;
- /**
- * 报备日期
- */
- private Date registerDate;
- /**
- * 是否专职驾驶员（0：否，1：是） 0:N 1:Y
- */
- private Integer fullTimeDriver;
- /**
- * 是否在驾驶员黑名单内（0：否，1：是）0:N 1:Y
- */
- private Integer inDriverBlacklist;
- /**
- * 服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
- * Service types (1: Online reserved taxi, 2: Regular taxi, 3: Private carpooling).
- */
- private Integer commercialType;
- /**
- * 驾驶员合同签署公司
- */
- private String contractCompany;
- /**
- * 合同有效期起
- */
- private Date contractOn;
- /**
- * 合同有效期止
- */
- private Date contractOff;
- /**
- * 紧急联系人
- */
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- private String emergencyContactPhone;
- /**
- * 紧急联系地址
- */
- private String emergencyContactAddress;
- /**
- * 从业地（带分隔符）
- */
- private String placeOfPractice;
- /**
- * 备注
- */
- private String remark;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- private Integer isPlatCar;
- /**
- * 司机管理车辆id
- */
- private Integer carId;
- /**
- * 审核状态(1=待审核，2=正常，3=冻结，4=拒绝)
- 1=Pending review, 2=Normal, 3=Frozen, 4=Rejected
- */
- private Integer authState;
- /**
- * 司机状态(1=离线，2=空闲，3=服务中) 1:outline ,2:leisure 3:in service
- */
- private Integer state;
- /**
- * 添加方式（1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加）
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- * @return
- */
- private Integer addType;
- /**
- * 账户余额
- * @return
- */
- private Double balance;
- /**
- * 活动总收入
- * @return
- */
- private Double activityMoney;
- /**
- * 剩余未提现活动总收入
- * @return
- */
- private Double laveActivityMoney;
- /**
- * 业务总收入
- * @return
- */
- private Double businessMoney;
- /**
- * 剩余未提现业务总收入
- * @return
- */
- private Double laveBusinessMoney;
- /**
- * 小程序openid
- */
- private String appletsOpenId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverSelectCountReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverSelectCountReq.java
deleted file mode 100644
index 3602707..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverSelectCountReq.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverSelectCountReq {
- private String phone;
- private Integer[] integers;
- private Integer i;
- private Integer companyId;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date sTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date eTime;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverService.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverService.java
deleted file mode 100644
index ded0c9b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/DriverService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 司机可经营的业务类型
- */
-@Data
-@TableName("t_driver_service")
-public class DriverService {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 业务类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- @TableField("type")
- private Integer type;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryAuthDriverReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryAuthDriverReq.java
deleted file mode 100644
index 9a4ed1c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryAuthDriverReq.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryAuthDriverReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private String companyName;
- private String phone;
- private String account;
- private Integer addType;
- private Integer authState;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryCanselectCarReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryCanselectCarReq.java
deleted file mode 100644
index e145c88..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryCanselectCarReq.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryCanselectCarReq {
- private Page<Map<String, Object>> page;
- private Integer roleType;
- private Integer nowUserId;
- private String carIdStr;
- private String carLicensePlate;
- private String brandName;
- private String modelName;
- private String color;
- private String serverStr;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverListReq.java
deleted file mode 100644
index a5f6906..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverListReq.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryDriverListReq {
- private Integer limit;
- private Integer offset;
- private Integer roleType;
- private Integer nowUserId;
- private String beginTime;
- private String endTime;
- private String companyName;
- private String phone;
- private String name;
- private Integer addType;
- private Integer authState;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverNoPageReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverNoPageReq.java
deleted file mode 100644
index 636e8f5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/QueryDriverNoPageReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryDriverNoPageReq {
- private Integer roleType;
- private Integer objectId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithholdingDto.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithholdingDto.java
deleted file mode 100644
index b6fe60c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithholdingDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class WithholdingDto {
- private Double money;
-
- private Integer id;
-
- private String time;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListReq.java
deleted file mode 100644
index d4eee01..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListReq.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class WithoutListReq {
- private Integer limit;
- private Integer offset;
- private String name;
-
- private String phone;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListVo.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListVo.java
deleted file mode 100644
index 9f4d17a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/driver/model/WithoutListVo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.feignClient.driver.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class WithoutListVo {
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insetTime;
-
- private String name;
-
- private String phone;
-
- private BigDecimal money;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/EvaluationClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/EvaluationClient.java
deleted file mode 100644
index 4cad1f2..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/EvaluationClient.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.feignClient.evaluation;
-
-import com.dsh.course.feignClient.evaluation.model.GetOrderEvaluateListReq;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-evaluation")
-public interface EvaluationClient {
-
- @PostMapping("/orderEvaluate/getOrderEvaluateList")
- List<Map<String,Object>> getOrderEvaluateList(GetOrderEvaluateListReq req);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/model/GetOrderEvaluateListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/model/GetOrderEvaluateListReq.java
deleted file mode 100644
index c549b5c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/evaluation/model/GetOrderEvaluateListReq.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dsh.course.feignClient.evaluation.model;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetOrderEvaluateListReq {
- private Page<Map<String, Object>> page;
- private Integer roleType;
- private Integer nowUserId;
- private String beginTime;
- private String endTime;
- private String userName;
- private String driverName;
- private String fraction;
- private Integer orderType;
- private String orderNum;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/OrderPositionClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/OrderPositionClient.java
deleted file mode 100644
index cf71d63..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/OrderPositionClient.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.course.feignClient.nearDriver;
-
-import com.dsh.course.feignClient.nearDriver.model.DriverPositionReq;
-import com.dsh.course.feignClient.nearDriver.model.OrderPosition;
-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("mb-cloud-nearDriver")
-public interface OrderPositionClient {
-
-
- /**
- * 获取订单轨迹
- * @param req
- * @return
- */
- @PostMapping("/driverPosition/queryOrderPosition")
- List<OrderPosition> queryOrderPosition(@RequestBody DriverPositionReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/DriverPositionReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/DriverPositionReq.java
deleted file mode 100644
index e3c4dd5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/DriverPositionReq.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.feignClient.nearDriver.model;
-
-import lombok.Data;
-
-@Data
-public class DriverPositionReq {
- private Integer driverId;
-
- private Long orderId;
-
- private Integer orderType;
-
- private Double lat;
-
- private Double lon;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/OrderPosition.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/OrderPosition.java
deleted file mode 100644
index d8eb0c1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/nearDriver/model/OrderPosition.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.dsh.course.feignClient.nearDriver.model;
-
-import lombok.Data;
-
-import java.util.Date;
-
-
-/**
- * 订单坐标信息表
- */
-@Data
-public class OrderPosition {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 订单类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- private Integer orderType;
- /**
- * 订单id
- */
- private Long orderId;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 经度
- */
- private Double lon;
- /**
- * 纬度
- */
- private Double lat;
- /**
- * 方向角
- */
- private String directionAngle;
- /**
- * 海拔
- */
- private String altitude;
-
- private Date insertTime;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ComplaintClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ComplaintClient.java
deleted file mode 100644
index e265407..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ComplaintClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dsh.course.feignClient.order;
-
-import com.dsh.course.feignClient.order.model.QueryComplaintListReq;
-import com.dsh.guns.modular.system.model.TComplaint;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-orderServer", path = "/tComplaint")
-public interface ComplaintClient {
-
- @PostMapping(value = "/queryTComplaintId")
- TComplaint queryTComplaintId (Integer tComplaintId);
-
- @PostMapping(value = "/update")
- Object update(TComplaint tComplaint);
-
- @PostMapping(value = "/delete")
- Object delete(Integer tComplaintId);
- @PostMapping(value = "/getComplaintList")
- List<Map<String, Object>> getComplaintList(QueryComplaintListReq req);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderLogisticsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderLogisticsClient.java
deleted file mode 100644
index 64acd41..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderLogisticsClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dsh.course.feignClient.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.order.model.*;
-import com.dsh.guns.modular.system.model.TOrderLogistics;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-orderServer")
-public interface OrderLogisticsClient {
- @PostMapping("/orderLogistics/queryOrderLogisticsInfo")
- OrderLogisticsInfoRes queryOrderLogisticsInfo(Long id);
-
- @PostMapping("/orderLogistics/updateOrderLogistics")
- void updateOrderLogistics(OrderLogisticsInfoReq req);
-
- @PostMapping("/orderLogistics/getLogisticsOrderList")
- Page<Map<String, Object>> getLogisticsOrderList(QueryLoginsicsListReq req);
-
-
- @PostMapping("/orderLogistics/getLogisticsOrderDetailById")
- Map<String, Object> getLogisticsOrderDetailById(Long tOrderLogisticsId);
-
- @PostMapping("/orderLogistics/queryByOrderId")
- TOrderLogistics queryByOrderId(Long orderId);
-
- @PostMapping("/orderLogistics/selectCount")
- int selectCount(OrderLogisticsSelectCountReq tcxTodayTme);
-
- @PostMapping("/orderLogistics/getAllOrderNum")
- Map<String,Object> getAllOrderNum(Integer companyId);
-
- @PostMapping("/orderLogistics/getAllTradeMoney")
- Double getAllTradeMoney(GetAllTradeMoneyReq req);
-
-
- @PostMapping("/orderLogistics/getLogisticsOrderList1")
- List<Map<String, Object>> getLogisticsOrderList1(Integer companyId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderPrivateCarClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderPrivateCarClient.java
deleted file mode 100644
index bc71dc1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/OrderPrivateCarClient.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dsh.course.feignClient.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.order.model.*;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-orderServer")
-public interface OrderPrivateCarClient {
-
- @PostMapping("/tOrderPrivateCar/selectCount")
- int selectCount(OrderPrivateCarSelectCountReq zcTodayTme);
-
- @PostMapping("/tOrderPrivateCar/getPrivateCarOrderDetailById")
- Map<String, Object> getPrivateCarOrderDetailById(GetPrivateCarOrderDetailById getPrivateCarOrderDetailById);
-
- @PostMapping("/tOrderPrivateCar/getPrivateCarOrderList")
- Page<Map<String, Object>> getPrivateCarOrderList(QueryPrivateCarOrderReq req);
-
- @PostMapping("/tOrderPrivateCar/selectById")
- OrderPrivateCar selectById(Long tOrderPrivateCarId);
-
-
- @PostMapping("/tOrderPrivateCar/updateByIds")
- void updateByIds( UpdateStateReq updateStateReq);
-
-
- @PostMapping("/tOrderPrivateCar/updateById1s")
- void updateById1s(UpdateStateReq updateStateReq);
-
-
- @PostMapping("/tOrderPrivateCar/updateById2s")
- void updateById2s(OrderPrivateCar tOrderPrivateCar);
-
- @PostMapping("/tOrderPrivateCar/getPrivateCarOrderList1")
- List<Map<String, Object>> getPrivateCarOrderList1(Integer companyId);
-
- @PostMapping("/tOrderPrivateCar/tUserLargeAll")
- Map<String, Object> tUserLargeAll(LargerAllReq largerAllReq);
-
- @PostMapping("/tOrderPrivateCar/largeList")
- Page<Map<String, Object>> largeList(LargeListReq largeListReq);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ReassignClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ReassignClient.java
deleted file mode 100644
index fc23f0b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/ReassignClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.feignClient.order;
-
-import com.dsh.course.feignClient.order.model.PrivateCarReassignReq;
-import com.dsh.course.feignClient.order.model.QueryCanSelectPrivateCarDriverReq;
-import com.dsh.course.feignClient.order.model.QueryCanSelectSmallDriverReq;
-import com.dsh.guns.modular.system.model.TReassign;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(value = "mb-cloud-orderServer", path = "/tReassign")
-public interface ReassignClient {
- @PostMapping("queryReassignById")
- TReassign queryReassignById(Long reassignId);
-
- @PostMapping("getPrivateCarReassignOrderList")
- List<Map<String, Object>> getPrivateCarReassignOrderList(PrivateCarReassignReq req);
-
- @PostMapping("getCanSelectPrivateCarDriverList")
- List<Map<String, Object>> getCanSelectPrivateCarDriverList( QueryCanSelectPrivateCarDriverReq req);
-
- @PostMapping("getCanSelectSmallDriverList")
- List<Map<String, Object>> getCanSelectSmallDriverList(QueryCanSelectSmallDriverReq req);
-
- @PostMapping("updateById")
- void updateById( TReassign tReassign);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/TransactionDetailsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/TransactionDetailsClient.java
deleted file mode 100644
index 5936fd0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/TransactionDetailsClient.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dsh.course.feignClient.order;
-
-import com.dsh.course.feignClient.order.model.TransactionDetailsReq;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-orderServer", path = "/transactionDetails")
-public interface TransactionDetailsClient {
- @PostMapping("/addTransactionDetails")
- void addTransactionDetails(TransactionDetailsReq req);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetAllTradeMoneyReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetAllTradeMoneyReq.java
deleted file mode 100644
index d7ada4a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetAllTradeMoneyReq.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetAllTradeMoneyReq {
- private Integer companyId;
- private String startTime;
- private String endTime;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetPrivateCarOrderDetailById.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetPrivateCarOrderDetailById.java
deleted file mode 100644
index fd8b90e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/GetPrivateCarOrderDetailById.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GetPrivateCarOrderDetailById {
- private Long id;
- private Integer language;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargeListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargeListReq.java
deleted file mode 100644
index 11c248f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargeListReq.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LargeListReq {
- private Integer limit;
-
- private Integer offset;
-
- private String sTime;
-
- private String eTime;
-
- private String user;
-
- private String phone;
-
- private String number;
-
- private List<Integer> ids;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargerAllReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargerAllReq.java
deleted file mode 100644
index 16488f8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/LargerAllReq.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LargerAllReq {
- private List<Integer> ids;
-
- private String sTime;
-
- private String eTime;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoReq.java
deleted file mode 100644
index 5fab776..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoReq.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 小件物流订单
- */
-@Data
-public class OrderLogisticsInfoReq {
- /**
- * 主键
- */
- private Long id;
- /**
- * 订单类型（4=同城物流，5=跨城物流）
- */
- private Integer type;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 车辆id
- */
- private Integer carId;
- /**
- * 订单号
- */
- private String orderNum;
- /**
- * 货物类型（1=普通货物，2=贵重货物）1=Regular goods, 2=Valuable goods.
- */
- private Integer cargoType;
- /**
- * 是否加急（1=否，2=是）1:N,2:Y
- */
- private Integer urgent;
- /**
- * 货物数量
- */
- private Integer cargoNumber;
- /**
- * 备注信息
- */
- private String remark;
- /**
- * 下单地点经度
- */
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- private Double placementLat;
- /**
- * 下单地点
- */
- private String placementAddress;
- /**
- * 起点经度
- */
- private Double startLon;
- /**
- * 起点纬度
- */
- private Double startLat;
- /**
- * 起点
- */
- private String startAddress;
- /**
- * 目的地经度
- */
- private Double endLon;
- /**
- * 目的地纬度
- */
- private Double endLat;
- /**
- * 目的地
- */
- private String endAddress;
- /**
- * 收件人姓名
- */
- private String recipient;
- /**
- * 收件人电话
- */
- private String recipientPhone;
- /**
- * 上车点经度
- */
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- private Double boardingLat;
- /**
- * 上车地点
- */
- private String boardingAddress;
- /**
- * 上车时间
- */
- private Date boardingTime;
- /**
- * 下车点经度
- */
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- private Double getoffLat;
- /**
- * 下车点
- */
- private String getoffAddress;
- /**
- * 下车时间
- */
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- */
- private Integer payManner;
- /**
- * 支付方式（1=微信，2=支付宝，3=余额）
- * 1:wechat 2:alipay 3:balance
- */
- private Integer payType;
- /**
- * 订单金额
- */
- private Double orderMoney;
- /**
- * 小费
- */
- private Double tipMoney;
- /**
- * 红包抵扣金额
- */
- private Double redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- private Double couponMoney;
- /**
- * 红包id
- */
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 折扣
- */
- private Double discount;
- /**
- * 折扣优惠金额
- */
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- private Integer activityId;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 支付金额
- */
- private Double payMoney;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- private Integer state;
- /**
- * 下单时间
- */
- private Date insertTime;
- /**
- * 预约取货时间
- */
- private Date travelTime;
- /**
- * 抢单时间
- */
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- private Date endServiceTime;
- /**
- * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)
- */
- private Integer orderSource;
- /**
- * 发票id
- */
- private Integer invoiceId;
- /**
- * 高德猎鹰轨迹id
- * @return
- */
- private String trackId;
- /**
- * 是否删除（1=否，2=是）1:N,2:Y
- */
- private Integer isDelete;
- /**
- * 移动小号
- * @return
- */
- private String telX;
- /**
- * 绑定小号关系id
- * @return
- */
- private String bindId;
- /**
- * 取件码
- * @return
- */
- private String pickUpCode;
- /**
- * 是否是改派单（1=否，=是）
- * @return
- */
- private Integer isReassign;
- /**
- * 改派通知标识（0=没有改派，1=改派中，2=已改派）用于通知前端获取新司机数据
- * The reassignment notification flag (0=no reassignment, 1=reassignment in progress, 2=reassignment completed) is used to notify the frontend to fetch new driver data.
- */
- private Integer reassignNotice;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoRes.java
deleted file mode 100644
index f618e84..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsInfoRes.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 小件物流订单
- */
-@Data
-public class OrderLogisticsInfoRes {
- /**
- * 主键
- */
- private Long id;
- /**
- * 订单类型（4=同城物流，5=跨城物流）
- */
- private Integer type;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 车辆id
- */
- private Integer carId;
- /**
- * 订单号
- */
- private String orderNum;
- /**
- * 货物类型（1=普通货物，2=贵重货物）1=Regular goods, 2=Valuable goods.
- */
- private Integer cargoType;
- /**
- * 是否加急（1=否，2=是）1:N,2:Y
- */
- private Integer urgent;
- /**
- * 货物数量
- */
- private Integer cargoNumber;
- /**
- * 备注信息
- */
- private String remark;
- /**
- * 下单地点经度
- */
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- private Double placementLat;
- /**
- * 下单地点
- */
- private String placementAddress;
- /**
- * 起点经度
- */
- private Double startLon;
- /**
- * 起点纬度
- */
- private Double startLat;
- /**
- * 起点
- */
- private String startAddress;
- /**
- * 目的地经度
- */
- private Double endLon;
- /**
- * 目的地纬度
- */
- private Double endLat;
- /**
- * 目的地
- */
- private String endAddress;
- /**
- * 收件人姓名
- */
- private String recipient;
- /**
- * 收件人电话
- */
- private String recipientPhone;
- /**
- * 上车点经度
- */
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- private Double boardingLat;
- /**
- * 上车地点
- */
- private String boardingAddress;
- /**
- * 上车时间
- */
- private Date boardingTime;
- /**
- * 下车点经度
- */
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- private Double getoffLat;
- /**
- * 下车点
- */
- private String getoffAddress;
- /**
- * 下车时间
- */
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- */
- private Integer payManner;
- /**
- * 支付方式（1=微信，2=支付宝，3=余额）
- * 1:wechat 2:alipay 3:balance
- */
- private Integer payType;
- /**
- * 订单金额
- */
- private Double orderMoney;
- /**
- * 行程费
- */
- private Double travelMoney;
- /**
- * 小费
- */
- private Double tipMoney;
- /**
- * 红包抵扣金额
- */
- private Double redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- private Double couponMoney;
- /**
- * 红包id
- */
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 折扣
- */
- private Double discount;
- /**
- * 折扣优惠金额
- */
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- private Integer activityId;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 支付金额
- */
- private Double payMoney;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- private Integer state;
- /**
- * 下单时间
- */
- private Date insertTime;
- /**
- * 预约取货时间
- */
- private Date travelTime;
- /**
- * 抢单时间
- */
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- private Date endServiceTime;
- /**
- * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)
- */
- private Integer orderSource;
- /**
- * 发票id
- */
- private Integer invoiceId;
- /**
- * 高德猎鹰轨迹id
- * @return
- */
- private String trackId;
- /**
- * 是否删除（1=否，2=是）1:N,2:Y
- */
- private Integer isDelete;
- /**
- * 移动小号
- * @return
- */
- private String telX;
- /**
- * 绑定小号关系id
- * @return
- */
- private String bindId;
- /**
- * 取件码
- * @return
- */
- private String pickUpCode;
- /**
- * 是否是改派单（1=否，=是）
- * @return
- */
- private Integer isReassign;
- /**
- * 改派通知标识（0=没有改派，1=改派中，2=已改派）用于通知前端获取新司机数据
- * The reassignment notification flag (0=no reassignment, 1=reassignment in progress, 2=reassignment completed) is used to notify the frontend to fetch new driver data.
- */
- private Integer reassignNotice;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsSelectCountReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsSelectCountReq.java
deleted file mode 100644
index 82a560d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderLogisticsSelectCountReq.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderLogisticsSelectCountReq {
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date time;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date time1;
- private Integer companyId;
- private Integer i;
- private Integer[] states;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCar.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCar.java
deleted file mode 100644
index aa17f3e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCar.java
+++ /dev/null
@@ -1,389 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 专车车订单
- */
-@Data
-@TableName("t_order_private_car")
-public class OrderPrivateCar {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Long id;
- /**
- * 订单类型（1=普通订单，2=摆渡订单）1=Regular order, 2=Shuttle order.
- */
- @TableField("type")
- private Integer type;
- /**
- * 跨城订单id(摆渡车专用)
- */
- @TableField("crossCityOrderId")
- private Integer crossCityOrderId;
- /**
- * 摆渡方位（1=跨城起点，2=跨城终点）1=Origin of inter-city travel, 2=Destination of inter-city travel.
- */
- @TableField("place")
- private Integer place;
- /**
- * 用户id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 服务车型id
- */
- @TableField("serverCarModelId")
- private Integer serverCarModelId;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 订单号
- */
- @TableField("orderNum")
- private String orderNum;
- /**
- * 下单地点经度
- */
- @TableField("placementLon")
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- @TableField("placementLat")
- private Double placementLat;
- /**
- * 下单地点
- */
- @TableField("placementAddress")
- private String placementAddress;
- /**
- * 起点经度
- */
- @TableField("startLon")
- private Double startLon;
- /**
- * 起点纬度
- */
- @TableField("startLat")
- private Double startLat;
- /**
- * 起点
- */
- @TableField("startAddress")
- private String startAddress;
- /**
- * 目的地经度
- */
- @TableField("endLon")
- private Double endLon;
- /**
- * 目的地纬度
- */
- @TableField("endLat")
- private Double endLat;
- /**
- * 目的地
- */
- @TableField("endAddress")
- private String endAddress;
- /**
- * 上车点经度
- */
- @TableField("boardingLon")
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- @TableField("boardingLat")
- private Double boardingLat;
- /**
- * 上车地点
- */
- @TableField("boardingAddress")
- private String boardingAddress;
- /**
- * 上车时间
- */
- @TableField("boardingTime")
- private Date boardingTime;
- /**
- * 下车点经度
- */
- @TableField("getoffLon")
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- @TableField("getoffLat")
- private Double getoffLat;
- /**
- * 下车点
- */
- @TableField("getoffAddress")
- private String getoffAddress;
- /**
- * 下车时间
- */
- @TableField("getoffTime")
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- @TableField("mileage")
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- */
- @TableField("payManner")
- private Integer payManner;
- /**
- * 支付方式（1=微信，2=支付宝，3=余额）
- * 1:wechat 2:alipay 3:balance
- */
- @TableField("payType")
- private Integer payType;
- /**
- * 订单金额
- */
- @TableField("orderMoney")
- private Double orderMoney;
- /**
- * 起步里程
- */
- @TableField("startMileage")
- private Double startMileage;
- /**
- * 起步价
- */
- @TableField("startMoney")
- private Double startMoney;
- /**
- * 里程公里
- */
- @TableField("mileageKilometers")
- private Double mileageKilometers;
- /**
- * 里程费
- */
- @TableField("mileageMoney")
- private Double mileageMoney;
- /**
- * 时长分钟
- */
- @TableField("duration")
- private Double duration;
- /**
- * 时长费
- */
- @TableField("durationMoney")
- private Double durationMoney;
- /**
- * 等待分钟
- */
- @TableField("wait")
- private Double wait;
- /**
- * 等待费
- */
- @TableField("waitMoney")
- private Double waitMoney;
- /**
- * 远途公里
- */
- @TableField("longDistance")
- private Double longDistance;
- /**
- * 远途费
- */
- @TableField("longDistanceMoney")
- private Double longDistanceMoney;
- /**
- * 红包抵扣金额
- */
- @TableField("redPacketMoney")
- private Double redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- @TableField("couponMoney")
- private Double couponMoney;
- /**
- * 红包id
- */
- @TableField("redPacketId")
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- @TableField("couponId")
- private Integer couponId;
- /**
- * 折扣
- */
- @TableField("discount")
- private Double discount;
- /**
- * 折扣优惠金额
- */
- @TableField("discountMoney")
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- @TableField("activityId")
- private Integer activityId;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 支付金额
- */
- @TableField("payMoney")
- private Double payMoney;
- /**
- * 是否是代下单（0：否，1：是）0:N 1:Y
- */
- @TableField("substitute")
- private Integer substitute;
- /**
- * 乘车人姓名
- */
- @TableField("passengers")
- private String passengers;
- /**
- * 乘车人电话
- */
- @TableField("passengersPhone")
- private String passengersPhone;
- /**
- * 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- @TableField("state")
- private Integer state;
- /**
- * 下单时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 出行时间
- */
- @TableField("travelTime")
- private Date travelTime;
- /**
- * 抢单时间
- */
- @TableField("snatchOrderTime")
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- @TableField("setOutTime")
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- @TableField("arriveTime")
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- @TableField("startServiceTime")
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- @TableField("endServiceTime")
- private Date endServiceTime;
- /**
- * 订单类型（1=普通，2=预约）1:normal ,2:booking
- */
- @TableField("orderType")
- private Integer orderType;
- /**
- * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)
- * 1:app 2:scan 3:mini program 4:driver 5:dispatch
- */
- @TableField("orderSource")
- private Integer orderSource;
- /**
- * 设备号
- */
- @TableField("deviceCode")
- private String deviceCode;
- /**
- * 发票id
- */
- @TableField("invoiceId")
- private Integer invoiceId;
- /**
- * 是否是改派单（1=否，=是）
- * @return
- */
- @TableField("isReassign")
- private Integer isReassign;
- /**
- * 改派通知标识（0=没有改派，1=改派中，2=已改派）用于通知前端获取新司机数据
- * The reassignment notification flag (0=no reassignment, 1=reassignment in progress, 2=reassignment completed) is used to notify the frontend to fetch new driver data.
- */
- @TableField("reassignNotice")
- private Integer reassignNotice;
- /**
- * 高德猎鹰轨迹id
- * @return
- */
- @TableField("trackId")
- private String trackId;
- /**
- * 是否删除（1=否，2=是）1:N,2:Y
- */
- @TableField("isDelete")
- private Integer isDelete;
- /**
- * 该派前的订单状态
- * @return
- */
- @TableField("oldState")
- private Integer oldState;
- /**
- * 移动小号
- * @return
- */
- @TableField("telX")
- private String telX;
- /**
- * 绑定小号关系id
- * @return
- */
- @TableField("bindId")
- private String bindId;
- /**
- * 抢单状态（1=正常抢单，2=订单大厅）
- * 1:normal 2:grab hall
- */
- @TableField("orderHall")
- private Integer orderHall;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCarSelectCountReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCarSelectCountReq.java
deleted file mode 100644
index c15f648..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/OrderPrivateCarSelectCountReq.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderPrivateCarSelectCountReq {
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- Date time;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- Date time1;
- Integer companyId;
- Integer[] states;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/PrivateCarReassignReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/PrivateCarReassignReq.java
deleted file mode 100644
index a94bf63..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/PrivateCarReassignReq.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class PrivateCarReassignReq {
- private Page<Map<String, Object>> page;
- private Integer roleType;
- private Integer nowUserId;
- private String beginTime;
- private String endTime;
- private String originalDriverName;
- private String originalDriverPhone;
- private String orderNum;
- private String nowDriverName;
- private String nowDriverPhone;
- private Integer orderState;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectPrivateCarDriverReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectPrivateCarDriverReq.java
deleted file mode 100644
index 72c58cb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectPrivateCarDriverReq.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryCanSelectPrivateCarDriverReq {
- private Page<Map<String, Object>> page;
- private Integer companyId;
- private String name;
- private String phone;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectSmallDriverReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectSmallDriverReq.java
deleted file mode 100644
index 57bd25b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryCanSelectSmallDriverReq.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryCanSelectSmallDriverReq {
- private Page<Map<String, Object>> page;
- private Integer companyId;
- private Integer type;
- private String name;
- private String phone;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryComplaintListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryComplaintListReq.java
deleted file mode 100644
index 2d7d347..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryComplaintListReq.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryComplaintListReq {
- private Page<Map<String, Object>> page;
- private Integer roleType;
- private Integer objectId;
- private String beginTime;
- private String endTime;
- private String userName;
- private String userPhone;
- private String driverPhone;
- private Integer isHandle;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryLoginsicsListReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryLoginsicsListReq.java
deleted file mode 100644
index 8f9a25d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryLoginsicsListReq.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryLoginsicsListReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private Integer roleType;
- private Integer objectId;
- private String orderNum;
- private Integer orderSource;
- private Integer type;
- private String userName;
- private String userPhone;
- private String recipient;
- private String recipientPhone;
- private String driver;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryPrivateCarOrderReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryPrivateCarOrderReq.java
deleted file mode 100644
index 2a18996..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/QueryPrivateCarOrderReq.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryPrivateCarOrderReq {
- private Integer limit;
- private Integer offset;
- private String beginTime;
- private String endTime;
- private Integer roleType;
- private Integer objectId;
- private String orderNum;
- private Integer orderSource;
- private String userName;
- private String userPhone;
- private String passengers;
- private String passengersPhone;
- private Integer serverCarModelId;
- private String driver;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/TransactionDetailsReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/TransactionDetailsReq.java
deleted file mode 100644
index c2c3f86..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/TransactionDetailsReq.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TransactionDetailsReq {
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 备注
- */
- private String remark;
- /**
- * 金额/积分
- */
- private Double money;
- /**
- * 状态（1=增加，2=减少）
- */
- private Integer state;
- /**
- * 类型（1=金额，2：积分）
- */
- private Integer type;
- /**
- * 类型（1=用户，2=司机）
- */
- private Integer userType;
- /**
- * 订单类型（1=专车，4=小件物流，5=余额充值，6=余额提现，7=积分兑换）
- */
- private Integer orderType;
- /**
- * 订单id
- */
- private Long orderId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/UpdateStateReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/UpdateStateReq.java
deleted file mode 100644
index 6af01bd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/order/model/UpdateStateReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.course.feignClient.order.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateStateReq {
- private Long id;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/OrderCancelClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/OrderCancelClient.java
deleted file mode 100644
index e362157..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/OrderCancelClient.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dsh.course.feignClient.orderCancel;
-
-import com.dsh.course.feignClient.orderCancel.model.OrderCancelRes;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(value = "mb-cloud-cancelOrder", path = "/orderCancel")
-public interface OrderCancelClient {
-
- @PostMapping("/saveOrderCancel")
- void saveOrderCancel(OrderCancelRes res);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/model/OrderCancelRes.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/model/OrderCancelRes.java
deleted file mode 100644
index 2fccf74..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/orderCancel/model/OrderCancelRes.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.dsh.course.feignClient.orderCancel.model;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 取消订单
- */
-@Data
-public class OrderCancelRes {
- /**
- * 主键
- */
- private Integer id;
- /**
- * 订单id
- */
- private Long orderId;
- /**
- * 订单类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- private Integer orderType;
- /**
- * 取消原因
- */
- private String reason;
- /**
- * 备注
- */
- private String remark;
- /**
- * 支付方式(1=微信，2=支付宝，3=余额)
- * 1:wechat 2:alipay 3:balance
- */
- private Integer payType;
- /**
- * 支付金额
- */
- private Double money;
- /**
- * 状态(1=临时，2=正式)
- * 1=Temporary, 2=Formal
- */
- private Integer state;
- /**
- * 添加时间
- * @return
- */
- private Date insertTime;
- /**
- * 取消人员类型（1=用户，2=后台）
- * @return
- */
- private Integer userType;
- /**
- * 取消人id
- * @return
- */
- private Integer userId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/PaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/PaymentClient.java
deleted file mode 100644
index 1f11199..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/PaymentClient.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dsh.course.feignClient.payment;
-
-import com.dsh.course.feignClient.payment.model.QueryPaymentRecordReq;
-import com.dsh.guns.modular.system.model.PaymentRecord;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-@FeignClient(value = "mb-cloud-payment", path = "/paymentRecord")
-public interface PaymentClient {
- @PostMapping("/queryPaymentRecordList")
- List<PaymentRecord> queryPaymentRecordList(QueryPaymentRecordReq req);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/model/QueryPaymentRecordReq.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/model/QueryPaymentRecordReq.java
deleted file mode 100644
index 66ebba7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/payment/model/QueryPaymentRecordReq.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.feignClient.payment.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryPaymentRecordReq {
- private Integer category;
- private Integer userId;
- private Integer type;
- private Long orderId;
- private Integer orderType;
- private Integer payType;
- private Integer state;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/DriverPunishMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/DriverPunishMapper.java
deleted file mode 100644
index 771c47c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/DriverPunishMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.DriverPunish;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface DriverPunishMapper extends BaseMapper<DriverPunish> {
-
-
- List<DriverPunish> queryAllPunish(@Param("driverId") Integer driverId);
-
- List<Map<String, Object>> getCanSelectCarList(@Param("page") Page<Map<String, Object>> page, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("carIdStr") Object o, @Param("carLicensePlate") String carLicensePlate, @Param("brandName") String brandName, @Param("modelName") String modelName, @Param("color") String color, @Param("serverStr") String serverStr,@Param("ids")String ids);
-
-
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/DriverVerifyMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/DriverVerifyMapper.java
deleted file mode 100644
index e54147d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/DriverVerifyMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.DriverVerify;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface DriverVerifyMapper extends BaseMapper<DriverVerify> {
- List<Map<String,Object>> getList(@Param("page")Page<Map<String, Object>> page,@Param("sTime") String sTime, @Param("eTime") String eTime, @Param("companyName") String companyName, @Param("phone") String phone, @Param("account") String account, @Param("state") Integer state);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/HotAddressMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/HotAddressMapper.java
deleted file mode 100644
index 08d343f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/HotAddressMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.course.entity.HotAddress;
-
-public interface HotAddressMapper extends BaseMapper<HotAddress> {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/RegionMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/RegionMapper.java
deleted file mode 100644
index 6db1663..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/RegionMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.Region;
-
-/**
- * <p>
- * 省市区三级联动 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2019-12-30
- */
-public interface RegionMapper extends BaseMapper<Region> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponActivityMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponActivityMapper.java
deleted file mode 100644
index 51ad60c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponActivityMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.SysCouponActivity;
-
-/**
- * <p>
- * 系统设置-优惠券活动 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-public interface SysCouponActivityMapper extends BaseMapper<SysCouponActivity> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponRecordMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponRecordMapper.java
deleted file mode 100644
index 804941b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/SysCouponRecordMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.SysCouponRecord;
-
-/**
- * <p>
- * 系统设置-优惠券记录 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-15
- */
-public interface SysCouponRecordMapper extends BaseMapper<SysCouponRecord> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/SysRedPacketRecordMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/SysRedPacketRecordMapper.java
deleted file mode 100644
index b72a120..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/SysRedPacketRecordMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.SysRedPacketRecord;
-
-/**
- * <p>
- * 系统设置-红包记录 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-13
- */
-public interface SysRedPacketRecordMapper extends BaseMapper<SysRedPacketRecord> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/SystemPriceMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/SystemPriceMapper.java
deleted file mode 100644
index 997006c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/SystemPriceMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.course.entity.SystemPrice;
-import org.apache.ibatis.annotations.Param;
-
-public interface SystemPriceMapper extends BaseMapper<SystemPrice> {
-
-
- /**
- * 获取价格
- * @param companyId
- * @param type
- * @return
- */
- SystemPrice query(@Param("companyId") Integer companyId, @Param("type") Integer type,
- @Param("serverCarModelId") Integer serverCarModelId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TAgreementMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TAgreementMapper.java
deleted file mode 100644
index 0364805..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TAgreementMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TAgreement;
-
-/**
- * <p>
- * 平台协议 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-01
- */
-public interface TAgreementMapper extends BaseMapper<TAgreement> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TAuditRecordMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TAuditRecordMapper.java
deleted file mode 100644
index f63dbce..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TAuditRecordMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TAuditRecord;
-
-/**
- * <p>
- * 审核记录表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-25
- */
-public interface TAuditRecordMapper extends BaseMapper<TAuditRecord> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarBrandMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarBrandMapper.java
deleted file mode 100644
index 400fcd5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarBrandMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TCarBrand;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆品牌 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface TCarBrandMapper extends BaseMapper<TCarBrand> {
-
- /**
- * 根据条件查询车辆品牌列表
- * @return
- */
- List<Map<String,Object>> getCarBrandList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name, @Param("yy") Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarMapper.java
deleted file mode 100644
index d475314..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarMapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TCar;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public interface TCarMapper extends BaseMapper<TCar> {
- List<Map<String,Object>> getCarList(@Param("page") Page<Map<String, Object>> page,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("id") String id,
- @Param("brandName") String brandName,
- @Param("modelName") String modelName,
- @Param("carColor") String carColor,
- @Param("serverStr") String serverStr,
- @Param("carLicensePlate") String carLicensePlate,
- @Param("driverName") String driverName,
- @Param("companyName") String companyName,
- @Param("franchiseeName") String franchiseeName,
- @Param("language") Integer language,@Param("ids")String ids);
-
- List<Map<String,Object>> getCarListNoPage(@Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId);
-
-
- /**
- * 获取车辆详情
- * @param id
- * @return
- */
-
- List<Map<String, Object>> getCarList1(@Param("page") Page<Map<String, Object>> page, @Param("roleType") Integer roleType, @Param("nowUserId") Integer nowUserId, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("id") String id, @Param("brandName") String brandName, @Param("modelName") String modelName, @Param("carColor") String carColor, @Param("serverStr") String serverStr, @Param("carLicensePlate") String carLicensePlate, @Param("driverName") String driverName, @Param("companyName") String companyName, @Param("franchiseeName") String franchiseeName, @Param("integers") ArrayList<Integer> integers,@Param("ids")String ids);
-
- TCar getById1(@Param("carId1") Integer carId1);
-
- TCar getCarID(@Param("newCarId") String newCarId);
-
-}
-
-
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarModelMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarModelMapper.java
deleted file mode 100644
index 88a82c6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarModelMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TCarModel;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆车型 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface TCarModelMapper extends BaseMapper<TCarModel> {
-
- /**
- * 根据条件查询车辆车型列表
- * @return
- */
- List<Map<String,Object>> getCarModelList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,@Param("yy") Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarServiceMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarServiceMapper.java
deleted file mode 100644
index c9e4dd4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TCarServiceMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TCarService;
-
-/**
- * <p>
- * 车辆经营业务 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface TCarServiceMapper extends BaseMapper<TCarService> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeFoundationMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeFoundationMapper.java
deleted file mode 100644
index c65384c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeFoundationMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeFoundation;
-
-/**
- * <p>
- * 保证收入基础时间段配置 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface TEnsureIncomeFoundationMapper extends BaseMapper<TEnsureIncomeFoundation> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeRuleMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeRuleMapper.java
deleted file mode 100644
index 40a60d7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeRuleMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeRule;
-
-/**
- * <p>
- * 保证收入 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface TEnsureIncomeRuleMapper extends BaseMapper<TEnsureIncomeRule> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialMapper.java
deleted file mode 100644
index 02c1795..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecial;
-
-/**
- * <p>
- * 特殊时间段基础规则配置 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface TEnsureIncomeSpecialMapper extends BaseMapper<TEnsureIncomeSpecial> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialTimeSoltMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialTimeSoltMapper.java
deleted file mode 100644
index 99cb9f9..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TEnsureIncomeSpecialTimeSoltMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecialTimeSolt;
-
-/**
- * <p>
- * 特殊时间段配置时间配置 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface TEnsureIncomeSpecialTimeSoltMapper extends BaseMapper<TEnsureIncomeSpecialTimeSolt> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TFeedbackMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TFeedbackMapper.java
deleted file mode 100644
index c39a4ef..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TFeedbackMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TFeedback;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 反馈管理 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface TFeedbackMapper extends BaseMapper<TFeedback> {
-
- /**
- * 根据条件查询用反馈记录列表
- * @return
- */
- List<Map<String,Object>> getFeedbackList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("type") Integer type,
- @Param("ids") List<Integer> integers,
- @Param("state") Integer state);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityBusinessMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityBusinessMapper.java
deleted file mode 100644
index 708e416..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityBusinessMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TOpenCityBusiness;
-
-/**
- * <p>
- * 开通城市经营业务 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-public interface TOpenCityBusinessMapper extends BaseMapper<TOpenCityBusiness> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityMapper.java
deleted file mode 100644
index 4c8b4dd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOpenCityMapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TOpenCity;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 开通城市表 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-public interface TOpenCityMapper extends BaseMapper<TOpenCity> {
-
- /**
- * 根据条件查询开通城市列表
- * @param page 分页
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @param condition 省/市/区
- * @return
- */
- List<Map<String,Object>> getOpenCityList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,
- @Param("language") Integer language);
-
- /**
- * 根据城市ID获取经营业务
- * @param openCityId
- * @return
- */
- List<Map<String,Object>> getBusinessByCityId(@Param("openCityId") Integer openCityId);
-
- List<Map<String, Object>> getBusinessListByCityId(@Param("openCityId")Integer openCityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOrderEvaluateMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TOrderEvaluateMapper.java
deleted file mode 100644
index 8d76635..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TOrderEvaluateMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TOrderEvaluate;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 订单评价 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TOrderEvaluateMapper extends BaseMapper<TOrderEvaluate> {
-
- /**
- * 根据条件查询评价列表
- * @return
- */
- List<Map<String,Object>> getOrderEvaluateList(@Param("page") Page<Map<String, Object>> page,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("userName") String userName,
- @Param("userPhone") String userPhone,
- @Param("driverName") String driverName,
- @Param("driverPhone") String driverPhone,
- @Param("fraction") String fraction,
- @Param("orderType") Integer orderType);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TPhoneMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TPhoneMapper.java
deleted file mode 100644
index e79e950..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TPhoneMapper.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TPhone;
-import com.dsh.guns.modular.system.model.TSysSet;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 系统电话设置 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TPhoneMapper extends BaseMapper<TPhone> {
-
- TSysSet getWaitOver(@Param("companyId") Integer companyId);
-
-
- TSysSet getRegister(@Param("companyId") Integer companyId);
-
-
- TSysSet getUserLevel(@Param("companyId") Integer companyId);
-
-
- void updateWait(@Param("json1") String json1,@Param("companyId") Integer companyId);
-
- void updateRegister(@Param("json2") String json2,@Param("companyId") Integer companyId);
-
- void updateUserLevel(@Param("json3") String json3,@Param("companyId") Integer companyId);
-
- void updateMotorPushOrder(@Param("json4") String json4,@Param("companyId") Integer companyId);
-
- void updateSendOrder(@Param("json5") String json5,@Param("companyId") Integer companyId);
-
- void updateCancel(@Param("ptCancel1") Integer ptCancel1, @Param("ptCancel2") BigDecimal ptCancel2,@Param("companyId") Integer companyId);
-
- void updateYyCancel(@Param("yyCancel1") Integer yyCancel1, @Param("yyCancel2") BigDecimal yyCancel2,@Param("companyId") Integer companyId);
-
- void updatePolice(@Param("phone1") String phone1,@Param("companyId") Integer companyId);
-
- void updateTalk(@Param("phone2") String phone2,@Param("companyId") Integer companyId);
-
- TSysSet getMin(@Param("companyId") Integer companyId);
-
-
- void updateMin(@Param("min") BigDecimal min,@Param("companyId") Integer companyId);
-
- TSysSet getIntegral(@Param("companyId") Integer companyId);
-
-
- void updateIntegral(@Param("json0") String json0,@Param("companyId") Integer companyId);
-
- void addIntegral(@Param("json0") String json0, @Param("companyId") Integer companyId);
-
- void addWait(@Param("json1") String json1, @Param("companyId") Integer companyId);
-
- void addRegister(@Param("json2") String json2, @Param("companyId") Integer companyId);
-
- void addUserLevel(@Param("json3") String json3, @Param("companyId") Integer companyId);
-
- void addMotorPushOrder(@Param("json4") String json4, @Param("companyId") Integer companyId);
-
- void addSendOrder(@Param("json5") String json5, @Param("companyId") Integer companyId);
-
- void addCancel(@Param("companyId") Integer companyId);
-
- void addYyCancel(@Param("companyId") Integer companyId);
-
- void addPolice(@Param("companyId") Integer companyId);
-
- void addTalk(@Param("companyId") Integer companyId);
-
- void addMin(@Param("companyId") Integer companyId);
-
- BigDecimal getMinMoney();
-
-
- void updateMinMoney(@Param("minMoney") Double minMoney);
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TPopularizeCodeMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TPopularizeCodeMapper.java
deleted file mode 100644
index e5f1ba2..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TPopularizeCodeMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TPopularizeCode;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author administrator
- * @since 2023-04-17
- */
-public interface TPopularizeCodeMapper extends BaseMapper<TPopularizeCode> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TProblemMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TProblemMapper.java
deleted file mode 100644
index 44b658c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TProblemMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TProblem;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 在线客服 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-24
- */
-public interface TProblemMapper extends BaseMapper<TProblem> {
-
- /**
- * 根据条件查询用户留言列表
- * @return
- */
- List<Map<String,Object>> getProblemList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("userIds") List<Integer> userIds,
- @Param("state") Integer state);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TRegionMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TRegionMapper.java
deleted file mode 100644
index 21ea825..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TRegionMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TRegion;
-
-/**
- * <p>
- * 省市区三级联动 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-public interface TRegionMapper extends BaseMapper<TRegion> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TServerCarmodelMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TServerCarmodelMapper.java
deleted file mode 100644
index eb99665..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TServerCarmodelMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TServerCarmodel;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务车型设置 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-public interface TServerCarmodelMapper extends BaseMapper<TServerCarmodel> {
-
- /**
- * 根据条件查询服务车型列表
- */
- List<Map<String,Object>> getServerCarModelList(@Param("page") Page<Map<String, Object>> page,
- @Param("type") Integer type,
- @Param("name") String name,
- @Param("state") Integer state);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysCancleOrderMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysCancleOrderMapper.java
deleted file mode 100644
index ff34e91..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysCancleOrderMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TSysCancleOrder;
-
-/**
- * <p>
- * 系统设置-取消订单 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TSysCancleOrderMapper extends BaseMapper<TSysCancleOrder> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysFaceDistinguishMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysFaceDistinguishMapper.java
deleted file mode 100644
index 485e2aa..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysFaceDistinguishMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TSysFaceDistinguish;
-
-/**
- * <p>
- * 系统设置-人脸识别 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TSysFaceDistinguishMapper extends BaseMapper<TSysFaceDistinguish> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysPushOrderMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysPushOrderMapper.java
deleted file mode 100644
index 0a63f2c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysPushOrderMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TSysPushOrder;
-
-/**
- * <p>
- * 系统设置-推单 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TSysPushOrderMapper extends BaseMapper<TSysPushOrder> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysReformistMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysReformistMapper.java
deleted file mode 100644
index 7f214d1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysReformistMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.course.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TSysReformist;
-
-/**
- * <p>
- * 系统设置-改派 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TSysReformistMapper extends BaseMapper<TSysReformist> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysSensitiveWordsMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysSensitiveWordsMapper.java
deleted file mode 100644
index cfb35ba..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSysSensitiveWordsMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TSysSensitiveWords;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 系统设置-敏感词 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface TSysSensitiveWordsMapper extends BaseMapper<TSysSensitiveWords> {
-
- /**
- * 根据条件查询敏感词列表
- * @return
- */
- List<Map<String,Object>> getSensitiveWordList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("content") String content,@Param("yy")Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemNoticeMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemNoticeMapper.java
deleted file mode 100644
index 72ed5fb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemNoticeMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 系统通知 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface TSystemNoticeMapper extends BaseMapper<TSystemNotice> {
-
- void save1(@Param("notice") TSystemNotice notice);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceMapper.java
deleted file mode 100644
index 7f4c89a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceMapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TSystemPrice;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务价格规则 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-public interface TSystemPriceMapper extends BaseMapper<TSystemPrice> {
-
- /**
- * 查询专车价格设置
- */
- List<Map<String,Object>> getSpecialPriceList(@Param("page") Page<Map<String, Object>> page,
- @Param("companyId") Integer companyId,
- @Param("name") String name,
- @Param("state") Integer state,
- @Param("language") Integer language);
-
- void saveService(@Param("type") Integer type, @Param("openCityId") Integer openCityId,@Param("type1") Integer type1, @Param("json2") String json2, @Param("code") String code, @Param("userId") Integer userId,@Param("remark") String remark,@Param("c") Integer c);
-
- List<Map<String, Object>> getServicePriceList(@Param("page") Page<Map<String, Object>> page ,@Param("sTime") String sTime, @Param("eTime") String eTime, @Param("company") String company, @Param("phone") String phone, @Param("account") String account, @Param("state") Integer state);
-
-
- List<TSystemPriceService> getService(@Param("tSystemPriceId") String tSystemPriceId);
-
-
- void updateCheck(@Param("id") String id, @Param("check") Integer check);
-
-
- void saveMotoService(@Param("openCityId") Integer openCityId, @Param("serverCarModelId") Integer serverCarModelId,
- @Param("type") Integer type, @Param("json1") String json1, @Param("i") Integer i,
- @Param("code")String code,@Param("userId")Integer userId,@Param("c")Integer c);
-
- List<Map<String, Object>> getServicePriceList1(@Param("page") Page<Map<String, Object>> page ,@Param("sTime") String sTime, @Param("eTime") String eTime, @Param("company") String company, @Param("phone") String phone, @Param("account") String account, @Param("state") Integer state, @Param("cid") List<Integer> cid);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceServiceMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceServiceMapper.java
deleted file mode 100644
index fbbe71f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TSystemPriceServiceMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-
-/**
- * @author zhibing.pu
- * @date 2023/3/25 18:12
- */
-public interface TSystemPriceServiceMapper extends BaseMapper<TSystemPriceService> {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TUserLargeCouponMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TUserLargeCouponMapper.java
deleted file mode 100644
index 3e8497e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TUserLargeCouponMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TUserLargeCoupon;
-
-/**
- * <p>
- * 车辆车型 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface TUserLargeCouponMapper extends BaseMapper<TUserLargeCoupon> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TVersionManagementMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TVersionManagementMapper.java
deleted file mode 100644
index 78fa18a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TVersionManagementMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.modular.system.model.TVersionManagement;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 版本管理 Mapper 接口
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface TVersionManagementMapper extends BaseMapper<TVersionManagement> {
-
- /**
- * 根据条件查询版本列表
- * @return
- */
- List<Map<String,Object>> getVersionList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("version") String version);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbBannerMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbBannerMapper.java
deleted file mode 100644
index f35b148..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbBannerMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbBanner;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbBannerMapper extends BaseMapper<TbBanner> {
-
- List<TbBanner> selectAll(@Param("s") String s, @Param("s1") String s1);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbChatSetMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbChatSetMapper.java
deleted file mode 100644
index 587f8a6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbChatSetMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbChatSet;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbChatSetMapper extends BaseMapper<TbChatSet> {
-
- List<TbChatSet> getList(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") Integer type,@Param("yy")Integer yy);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbGuidePageMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbGuidePageMapper.java
deleted file mode 100644
index cd6d070..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbGuidePageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbGuidePage;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbGuidePageMapper extends BaseMapper<TbGuidePage> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbHotAddressMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbHotAddressMapper.java
deleted file mode 100644
index edaf207..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbHotAddressMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbHotAddress;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbHotAddressMapper extends BaseMapper<TbHotAddress> {
-
- List<TbHotAddress> getList(@Param("sTime") String sTime, @Param("eTime") String eTime, @Param("name") String name, @Param("language") Integer language);
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbStartPageMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbStartPageMapper.java
deleted file mode 100644
index 78d8b74..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbStartPageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbStartPage;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbStartPageMapper extends BaseMapper<TbStartPage> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbUserExitMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbUserExitMapper.java
deleted file mode 100644
index a6602d2..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbUserExitMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbUserExit;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbUserExitMapper extends BaseMapper<TbUserExit> {
-
-
- List<TbUserExit> getList(@Param("sTime") String sTime, @Param("eTime") String eTime, @Param("name") String name, @Param("state") Integer state);
-
- List<TbUserExit> getList1(@Param("sTime") String sTime, @Param("eTime") String eTime, @Param("state") Integer state);
-
- List<TbUserExit> getSevenDay();
-
-
- void updatestate(@Param("id") Integer id);
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbVoiceMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/TbVoiceMapper.java
deleted file mode 100644
index c96db8d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/TbVoiceMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.course.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsh.guns.modular.system.model.TbVoice;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 Mapper 接口
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface TbVoiceMapper extends BaseMapper<TbVoice> {
-
- List<TbVoice> getList(@Param("name") String name, @Param("state") Integer state);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceImpl.java
deleted file mode 100644
index 9b1cc1c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.dsh.course.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.Car;
-import com.dsh.course.entity.CarModel;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.mapper.CarBrandMapper;
-import com.dsh.course.mapper.CarMapper;
-import com.dsh.course.mapper.CarModelMapper;
-import com.dsh.course.model.dto.CarServerRes;
-import com.dsh.course.model.vo.BaseWarpper;
-import com.dsh.course.model.vo.CarInfoRes;
-import com.dsh.course.service.ICarService;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarService {
-
- @Resource
- private DriverClient driverClient;
-
- @Resource
- private CarBrandMapper carBrandMapper;
-
- @Resource
- private CarModelMapper carModelMapper;
-
- @Resource
- private CompanyClient companyClient;
-
-
-
- @Override
- public CarInfoRes queryCarById(Integer id) {
- return this.baseMapper.queryCarById(id);
- }
-
-
- /**
- * 获取自己的车辆数据及空闲车辆
- * @param uid
- * @return
- * @throws Exception
- */
- @Override
- public Map<String, Object> queryCars(Integer uid) throws Exception {
- DriverInfoRes driver = driverClient.getDriver(uid);
- List<BaseWarpper> list = this.baseMapper.queryIdleData(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
- Map<String, Object> map = new HashMap<>();
- map.put("list", list);
- if(null != driver.getId()){
- CarInfoRes carInfoRes = queryCarById(driver.getId());
- map.put("car", carInfoRes.getCarLicensePlate() + "-" + carInfoRes.getCarBrandName() + " " + carInfoRes.getCarColor());
- }else{
- map.put("car", "");
- }
- return map;
- }
-
-
- /**
- * 判断车辆是否被绑定
- * @param id
- * @return
- * @throws Exception
- */
- @Override
- public boolean idle(Integer id) throws Exception {
- Car car = this.baseMapper.selectById(id);
- List<BaseWarpper> list = this.baseMapper.queryIdleData(car.getFranchiseeId() != null && car.getFranchiseeId() != 0 ? car.getFranchiseeId() : (
- car.getCompanyId() != null && car.getCompanyId() != 0 ? car.getCompanyId() : 1));
- for(BaseWarpper map : list){
- Integer carId = map.getId();
- if(carId.compareTo(id) == 0){
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * 获取所有车辆品牌
- * @return
- * @throws Exception
- */
- @Override
- public List<Map<String, Object>> queryAllBrand(Integer language) throws Exception {
- return carBrandMapper.queryAllBrand(language);
- }
-
-
- /**
- * 查询型号
- * @param brandId
- * @return
- * @throws Exception
- */
- @Override
- public List<Map<String, Object>> queryCarModel(Integer brandId) throws Exception {
- return carModelMapper.query(brandId);
- }
-
-
- /**
- * 添加车辆
- * @param modelId
- * @param color
- * @param licensePlate
- * @param time
- * @param drivingLicensePhoto
- * @param carPhoto
- * @param insurancePhoto
- * @param uid
- * @return
- * @throws Exception
- */
- @Override
- public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicensePhoto,
- String carPhoto, String insurancePhoto, Integer uid) throws Exception {
-
- Car query = this.baseMapper.query(licensePlate);
- if(null != query){
- return ResultUtil.error("车牌号已经使用");
- }
- Car car = new Car();
- car.setCarModelId(modelId);
- CarModel carModel = carModelMapper.selectById(modelId);
- car.setCarBrandId(carModel.getBrandId());
- car.setCarColor(color);
- car.setCarLicensePlate(licensePlate);
- car.setAnnualInspectionTime(time);
- car.setDrivingLicensePhoto(drivingLicensePhoto);
- car.setCarPhoto(carPhoto);
- car.setInsurancePhoto(insurancePhoto);
-
- DriverInfoRes driver = driverClient.getDriver(uid);
- car.setCompanyId(driver.getCompanyId());
- car.setFranchiseeId(driver.getFranchiseeId());
- car.setInsertTime(new Date());
- car.setState(1);
- car.setAddType(1);
- car.setAddObjectId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
- CompanyInfoRes company = companyClient.queryById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
- car.setIsPlatCar(company.getType() == 1 ? 1 : 2);
- this.baseMapper.insert(car);
- return ResultUtil.success();
- }
-
- @Override
- public List<BaseWarpper> queryIdleData(Integer companyId) throws Exception {
- return this.baseMapper.queryIdleData(companyId);
- }
-
- @Override
- public CarServerRes getCarServer(String carId) {
- return this.baseMapper.getCarServer(carId);
-
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/HotAddressServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/HotAddressServiceImpl.java
deleted file mode 100644
index 67c28e3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/service/impl/HotAddressServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dsh.course.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.HotAddress;
-import com.dsh.course.entity.OpenCity;
-import com.dsh.course.mapper.HotAddressMapper;
-import com.dsh.course.service.IHotAddressService;
-import com.dsh.course.service.IOpenCityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-
-@Service
-public class HotAddressServiceImpl extends ServiceImpl<HotAddressMapper, HotAddress> implements IHotAddressService {
-
- @Autowired
- private IOpenCityService openCityService;
-
-
- @Override
- public List<HotAddress> selectHotAddressByCityId(Integer cityId) {
- OpenCity openCity = openCityService.getBaseMapper().selectById(cityId);
- LambdaQueryWrapper<HotAddress> queryWrapper = new LambdaQueryWrapper<>();
- if(Objects.nonNull(cityId)) {
- queryWrapper.eq(HotAddress::getCityId,openCity.getCityId());
- }
- queryWrapper.last("limit 10");
- return this.baseMapper.selectList(queryWrapper);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/PhoneServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/PhoneServiceImpl.java
deleted file mode 100644
index 414628e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/service/impl/PhoneServiceImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.dsh.course.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.Phone;
-import com.dsh.course.feignClient.activity.CompanyCityClient;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.model.CompanyCityQueryCompanyReq;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.mapper.PhoneMapper;
-import com.dsh.course.model.dto.GetPhoneInfoRequest;
-import com.dsh.course.service.IPhoneService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-
-@Service
-public class PhoneServiceImpl extends ServiceImpl<PhoneMapper, Phone> implements IPhoneService {
-
- @Resource
- private PhoneMapper phoneMapper;
-
- @Autowired
- private CompanyCityClient companyCityClient;
-
- @Autowired
- private DriverClient driverClient;
-
- @Autowired
- private CompanyClient companyClient;
-
-
-
- /**
- * 获取所有系统电话
- * @return
- * @throws Exception
- */
- @Override
- public List<Phone> queryPhones(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
-
- List<Phone> list = phoneMapper.queryPhones(province, city, code);
- if(list.size() == 0){
- list = phoneMapper.queryPhones(province, city, null);
- }
- if(list.size() == 0){
- list = phoneMapper.queryPhones(province, null, null);
- }
- return list;
- }
-
-
- /**
- * 获取客服电话（个人中心）
- * @param code
- * @return
- * @throws Exception
- */
- @Override
- public Map<String, Object> queryCustomerPhone(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
-
- Map<String, Object> map = new HashMap<>();
- //平台电话
- Phone query = phoneMapper.query(2, 1, null, null, null);
- map.put("platform", null != query ? query.getPhone() : "");
-
- //公司
- query = phoneMapper.query(2, 2, province, city, code);
- if(query == null){
- query = phoneMapper.query(2, 2, province, city, null);
- }
- if(query == null){
- query = phoneMapper.query(2, 2, province, null, null);
- }
- map.put("company", null != query ? query.getPhone() : "");
- return map;
- }
-
-
-
- /**
- * 根据定位的城市行政编号获取分公司的客服电话
- * @param code
- * @return
- * @throws Exception
- */
- @Override
- public Map<String, Object> queryPhone(String code) throws Exception {
- CompanyInfoRes query = companyCityClient.query(new CompanyCityQueryCompanyReq("", ""));
- Map<String, Object> map = new HashMap<>();
- if(null == query){
- map.put("phone", "");
- }else{
- Phone phone = phoneMapper.queryInfo(query.getId(), 2);
- map.put("phone", null != phone ? phone.getPhone() : "");
- }
- return map;
- }
-
- @Override
- public Map<String, Object> queryPhone(Integer uid) throws Exception {
- DriverInfoRes driver = driverClient.getDriver(uid);
- CompanyInfoRes company = companyClient.queryById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
- Map<String, Object> map = new HashMap<>();
- if(company.getType() == 3){//加盟商
- Phone phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("franchisee", null != phone ? phone.getPhone() : "");
- company = companyClient.queryById(company.getSuperiorId());
- if(null != company){
- phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("branch", null != phone ? phone.getPhone() : "");
- }else{
- map.put("branch", "");
- }
- company = companyClient.queryById(company.getSuperiorId());
- if(null != company){
- phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("platform", null != phone ? phone.getPhone() : "");
- }else{
- map.put("platform", "");
- }
- return map;
- }
- if(company.getType() == 2){//分公司
- map.put("franchisee", "");
- Phone phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("branch", null != phone ? phone.getPhone() : "");
- company = companyClient.queryById(company.getSuperiorId());
- if(null != company){
- phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("platform",null != phone ? phone.getPhone() : "");
- }else{
- map.put("platform", "");
- }
- return map;
- }
- if(company.getType() == 1){//平台
- map.put("franchisee", "");
- map.put("branch", "");
- Phone phone = phoneMapper.queryInfo(company.getId(), 2);
- map.put("platform", null != phone ? phone.getPhone() : "");
- return map;
- }
- return map;
- }
-
- @Override
- public String selectPhoneByCompany(GetPhoneInfoRequest request) {
- LambdaQueryWrapper<Phone> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.select(Phone::getPhone);
- queryWrapper.eq(Phone::getType,request.getType());
- queryWrapper.eq(Phone::getCompanyId,request.getCompanyId());
- Phone phone = this.baseMapper.selectOne(queryWrapper);
- if (Objects.nonNull(phone)) {
- return phone.getPhone();
- }
- return null;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/SystemPriceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/SystemPriceServiceImpl.java
deleted file mode 100644
index dd8da9e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/service/impl/SystemPriceServiceImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.course.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.SystemPrice;
-import com.dsh.course.mapper.SystemPriceMapper;
-import com.dsh.course.service.ISystemPriceService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class SystemPriceServiceImpl extends ServiceImpl<SystemPriceMapper, SystemPrice> implements ISystemPriceService {
-
- @Override
- public SystemPrice query(Integer companyId, Integer type, Integer serverCarModelId) throws Exception {
- return this.baseMapper.query(companyId, type, serverCarModelId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityController.java
deleted file mode 100644
index c8d92bc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityController.java
+++ /dev/null
@@ -1,464 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.DriverActivityClient;
-import com.dsh.course.feignClient.activity.DriverActivityHistoryClient;
-import com.dsh.course.feignClient.activity.DriverActivityOnlineClient;
-import com.dsh.course.feignClient.activity.DriverActivityRegisterClient;
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import net.sf.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 20:51:18
- */
-@Controller
-@RequestMapping("/driverActivity")
-public class DriverActivityController extends BaseController {
-
- private String PREFIX = "/system/driverActivity/";
-
-// @Autowired
-// private IDriverActivityService driverActivityService;
-
- @Resource
- private DriverActivityClient driverActivityClient;
-
- @Resource
- private DriverActivityRegisterClient driverActivityRegisterClient;
-
- @Resource
- private DriverActivityHistoryClient driverActivityHistoryClient;
-
- @Resource
- private DriverActivityOnlineClient driverActivityOnlineClient;
-
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("type",UserExt.getUser().getObjectId());
- return PREFIX + "driverActivity.html";
- }
-
- /**
- * 跳转到添加 Redirecting to "Add".
- */
- @RequestMapping("/driverActivity_add")
- public String driverActivityAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "driverActivity_add.html";
- }
-
-
-
- @RequestMapping("/driver")
- public String driver(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "driver.html";
- }
-
-
- /**
- * 跳转领取统计
- * Redirect for statistics collection
- * @return
- */
- @RequestMapping("/receiveRecord")
- public String receiveRecord(Model model,Integer activityId){
- model.addAttribute("activityId",activityId);
-
-
- DriverActivity driverActivity = driverActivityClient.queryById(activityId);
-
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
- model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
-
-// DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",1));
- DriverActivityRegistered driverActivityRegistered = driverActivityRegisterClient.query1(new QueryBean(1, activityId));
- model.addAttribute("id1",driverActivityRegistered.getId());
-// driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",2));
- driverActivityRegistered = driverActivityRegisterClient.query1(new QueryBean(2, activityId));
- model.addAttribute("id2",driverActivityRegistered.getId());
-// DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",1));
- DriverActivityOnline driverActivityOnline = driverActivityClient.onLineQueryById(new QueryBean(1, activityId));
- model.addAttribute("id3",driverActivityOnline.getId());
-
- //统计专车在线 Statistical special car online
- driverActivityOnline = driverActivityClient.onLineQueryById(new QueryBean(4, activityId));
- model.addAttribute("id4",driverActivityOnline.getId());
-// driverActivityOnline = driverActivityClient.onLineQueryById(new QueryBean(4, activityId));
-// model.addAttribute("id5",driverActivityOnline.getId());
-// DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
- DriverActivityOrder driverActivityOrder = driverActivityClient.orderQueryById(activityId).get(0);
- model.addAttribute("id5",driverActivityOrder.getId());
- model.addAttribute("language",UserExt.getLanguage());
-
-model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "receiveRecord.html";
- }
-
- @RequestMapping(value = "/receiveRecordDetail")
- @ResponseBody
- public Object receiveRecordDetail(String createTime,Integer activityId) {
- String startTimes = null;
- String endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- startTimes = timeArray[0];
- endTimes = timeArray[1];
- }else{
- DriverActivity driverActivity = driverActivityClient.queryById(activityId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- startTimes=sdf.format(driverActivity.getStartTime());
- endTimes=sdf.format(driverActivity.getEndTime());
- }
- Map<String,Object> map = new HashMap<>();
- //统计邀请司机注册 Statistical invitation for driver registration.
- DriverActivityHistoryReq driverActivityHistoryReq = new DriverActivityHistoryReq();
- driverActivityHistoryReq.setDriverActivityId(activityId);
- driverActivityHistoryReq.setType(1);
- driverActivityHistoryReq.setEnd(endTimes);
- driverActivityHistoryReq.setStart(startTimes);
- DriverActivityHistoryRes driverActivityHistoryRes = driverActivityHistoryClient.queryList(driverActivityHistoryReq);
-
- Double totalMOney=0d;
- Double money=0d;
- Integer number=0;
- if(ToolUtil.isNotEmpty(driverActivityHistoryRes.getList())) {
- for (DriverActivityHistory history : driverActivityHistoryRes.getList()) {
- money += history.getMoney();
- totalMOney += history.getMoney();
- number++;
- }
- }
- map.put("money1",money);
- map.put("number1",number);
- //统计邀请用户注册 Statistical invitation for user registration.
- driverActivityHistoryReq.setType(2);
- DriverActivityHistoryRes driverActivityHistoryRes1 = driverActivityHistoryClient.queryList(driverActivityHistoryReq);
- money=0d;
-
- number=0;
- if(ToolUtil.isNotEmpty(driverActivityHistoryRes1.getList())) {
- for (DriverActivityHistory history : driverActivityHistoryRes1.getList()) {
- money += history.getMoney();
- totalMOney += history.getMoney();
- number++;
- }
- }
- map.put("money2",money);
- map.put("number2",number);
-
- //摩托车在线奖励 Motorcycle Online Rewards
- QueryDriverActivityOnlineReq req = new QueryDriverActivityOnlineReq();
- req.setDriverActivityId(activityId);
- req.setType(1);
- List<DriverActivityOnline> driverActivityOnlines = driverActivityOnlineClient.queryDriverActivityOnline(req);
- if(null != driverActivityOnlines){
- DriverActivityOnline driverActivityOnline = driverActivityOnlines.get(0);
- driverActivityHistoryReq.setActivityId(driverActivityOnline.getId());
- }
- driverActivityHistoryReq.setType(3);
- DriverActivityHistoryRes driverActivityHistoryRes2 = driverActivityHistoryClient.queryList(driverActivityHistoryReq);
- money=0d;
- number=0;
- if(ToolUtil.isNotEmpty(driverActivityHistoryRes2.getList())) {
- for (DriverActivityHistory history : driverActivityHistoryRes2.getList()) {
- money += history.getMoney();
- totalMOney += history.getMoney();
- number++;
- }
- }
- map.put("money3",money);
- map.put("number3",number);
-
- //同城累计在线奖励 Accumulated In-City Online Reward
- QueryDriverActivityOnlineReq req1 = new QueryDriverActivityOnlineReq();
- req1.setDriverActivityId(activityId);
- req1.setType(4);
- List<DriverActivityOnline> driverActivityOnlines1 = driverActivityOnlineClient.queryDriverActivityOnline(req1);
- if(null != driverActivityOnlines1){
- DriverActivityOnline driverActivityOnline = driverActivityOnlines1.get(0);
- driverActivityHistoryReq.setActivityId(driverActivityOnline.getId());
- }
- driverActivityHistoryReq.setType(3);
- DriverActivityHistoryRes driverActivityHistoryRes3 = driverActivityHistoryClient.queryList(driverActivityHistoryReq);
- money=0d;
- number=0;
- if(ToolUtil.isNotEmpty(driverActivityHistoryRes3.getList())) {
- for (DriverActivityHistory history : driverActivityHistoryRes3.getList()) {
- money += history.getMoney();
- totalMOney += history.getMoney();
- number++;
- }
- }
- map.put("money4",money);
- map.put("number4",number);
-
- //订单量 order number
- driverActivityHistoryReq.setActivityId(null);
- driverActivityHistoryReq.setType(4);
- DriverActivityHistoryRes driverActivityHistoryRes4 = driverActivityHistoryClient.queryList(driverActivityHistoryReq);
- money=0d;
- number=0;
- if(ToolUtil.isNotEmpty(driverActivityHistoryRes4.getList())) {
- for (DriverActivityHistory history : driverActivityHistoryRes4.getList()) {
- money += history.getMoney();
- totalMOney += history.getMoney();
- number++;
- }
- }
- map.put("money5",money);
- map.put("number5",number);
-
- //司机补贴 Driver's allowance
- driverActivityHistoryReq.setType(5);
- DriverActivityHistoryRes driverActivityHistoryRes5 = driverActivityHistoryClient.queryList(driverActivityHistoryReq);
- money=0d;
- number=0;
- if(ToolUtil.isNotEmpty(driverActivityHistoryRes5.getList())) {
- for (DriverActivityHistory history : driverActivityHistoryRes5.getList()) {
- money += history.getMoney();
- totalMOney += history.getMoney();
- number++;
- }
- }
- map.put("money6",money);
- map.put("number6",number);
- map.put("totalMOney",totalMOney);
- return map;
- }
- /**
- * 跳转到修改 Jump to modification.
- */
- @RequestMapping("/driverActivity_update/{driverActivityId}")
- public String driverActivityUpdate(@PathVariable Integer driverActivityId, Model model) {
-// DriverActivity driverActivity = driverActivityService.selectById(driverActivityId);
- DriverActivity driverActivity = driverActivityClient.queryById(driverActivityId);
- model.addAttribute("item",driverActivity);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
- model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
- model.addAttribute("online1",JSONObject.fromObject(driverActivityClient.onLineQueryById(new QueryBean(1,driverActivityId)).getContent()));
- model.addAttribute("online3",JSONObject.fromObject(driverActivityClient.onLineQueryById(new QueryBean(4,driverActivityId)).getContent()));
-// DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",driverActivityId));
-// DriverActivityOrder driverActivityOrder = driverActivityClient.orderQueryById(driverActivityId).get(0);
-// if(driverActivityOrder!=null){
-// model.addAttribute("startTime1", driverActivityOrder.getStart()+" - "+driverActivityOrder.getEnd());
-// }else{
-// model.addAttribute("startTime1", "");
-// }
- ArrayList<Object> objects = new ArrayList<>();
- List<DriverActivityOrder> driverActivityOrders = driverActivityClient.orderQueryById(driverActivityId);
- int a =1;
- for (DriverActivityOrder driverActivityOrder : driverActivityOrders) {
- String content = driverActivityOrder.getContent();
- JSONObject jsonObject = JSONObject.fromObject(content);
- jsonObject.put("frist",a);
- a++;
- objects.add(jsonObject);
- }
- model.addAttribute("order",objects);
- List<DriverActivitySubsidy> driverActivitySubsidy = driverActivityClient.subsidyQueryById(driverActivityId);
- ArrayList<Object> objects1 = new ArrayList<>();
- int b = 1;
- for (DriverActivitySubsidy activitySubsidy : driverActivitySubsidy) {
- String content = activitySubsidy.getContent();
- JSONObject jsonObject = JSONObject.fromObject(content);
- jsonObject.put("frist",b);
- b++;
- objects1.add(jsonObject);
- }
- model.addAttribute("subsidy",objects1);
-
- model.addAttribute("regist1", JSONObject.fromObject(driverActivityRegisterClient.query1(new QueryBean(1,driverActivityId)).getContent()));
- model.addAttribute("regist2", JSONObject.fromObject(driverActivityRegisterClient.query1(new QueryBean(2,driverActivityId)).getContent()));
-
- LogObjectHolder.me().set(driverActivity);
- return PREFIX + "driverActivity_edit.html";
- }
-
- /**
- * 获取列表 get list
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,String name) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(driverActivityClient.getList(new QueryDriverGetListReq(page,beginTime,endTime,name,UserExt.getUser().getRoleType(),UserExt.getUser().getObjectId())));
- return super.packForBT(page);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(String name, String createTime, String json2, String json3,String json4,String json5,String json8,String driverId) {
- User user = UserExt.getUser();
- driverActivityClient.insertOrUpdate(new DriverActivityInsertReq(null,user.getObjectId(),user.getRoleType(),name,createTime,json2, json3, json4
- , json5
- , null,json8
- ,driverId));
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer driverActivityId) {
- driverActivityClient.deleteById(driverActivityId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer id,String name, String createTime, String json2, String json3,String json4,String json5,String json6,String driverId) {
- User user = UserExt.getUser();
- driverActivityClient.insertOrUpdate(new DriverActivityInsertReq(id,user.getObjectId() ,user.getRoleType(),name,createTime, json2, json3
- , json4
- , json5
- , json6,null,driverId
- ));
- return SUCCESS_TIP;
- }
- @RequestMapping(value = "/updateStatus")
- @ResponseBody
- public Object updateStatus(DriverActivity driverActivity) {
- driverActivityClient.updateStatus(driverActivity);
- return SUCCESS_TIP;
- }
-
- @RequestMapping("/driverActivity_detail/{driverActivityId}")
- public String driverActivityDetail(@PathVariable Integer driverActivityId,Integer type, Model model) {
-// DriverActivity driverActivity = driverActivityService.selectById(driverActivityId);
- DriverActivity driverActivity = driverActivityClient.queryById(driverActivityId);
- model.addAttribute("item",driverActivity);
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
- model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
-
- List<DriverActivityOrder> driverActivityOrders = driverActivityClient.orderQueryById(driverActivityId);
- List<DriverActivitySubsidy> driverActivitySubsidy = driverActivityClient.subsidyQueryById(driverActivityId);
- ArrayList<Object> objects = new ArrayList<>();
- ArrayList<Object> objects1 = new ArrayList<>();
- for (DriverActivitySubsidy activitySubsidy : driverActivitySubsidy) {
- String content = activitySubsidy.getContent();
- JSONObject jsonObject = JSONObject.fromObject(content);
- objects1.add(jsonObject);
- }
- for (DriverActivityOrder driverActivityOrder : driverActivityOrders) {
- String content = driverActivityOrder.getContent();
- JSONObject jsonObject = JSONObject.fromObject(content);
- net.sf.json.JSONArray num2 = jsonObject.getJSONArray("num2");
- jsonObject.put("number",num2.size());
- objects.add(jsonObject);
- }
-
- model.addAttribute("order",objects);
- model.addAttribute("subsidy",objects1);
- DriverActivityRegistered driverActivityRegistered = driverActivityRegisterClient.query1(new QueryBean(1, driverActivityId));
- String content = driverActivityRegistered.getContent();
- JSONObject jsonObject = JSONObject.fromObject(content);
- model.addAttribute("regist1", jsonObject);
- model.addAttribute("online1",JSONObject.fromObject(driverActivityClient.onLineQueryById(new QueryBean(1,driverActivityId)).getContent()));
- model.addAttribute("regist2",JSONObject.fromObject(driverActivityRegisterClient.query1(new QueryBean(2,driverActivityId)).getContent()));
- model.addAttribute("online3",JSONObject.fromObject(driverActivityClient.onLineQueryById(new QueryBean(4,driverActivityId)).getContent()));
- model.addAttribute("type",type);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(driverActivity);
- return PREFIX + "driverActivity_detail.html";
- }
-
- /**
- * 跳转到立即处理页面 Redirect to the immediate processing page.
- */
- @RequestMapping("/driverActivity_immediately/{id}")
- public String driverActivityImmediately(@PathVariable Integer id, Model model) {
- model.addAttribute("id",id);
- return PREFIX + "driverActivity_immediately.html";
- }
- /**
- * 立即处理操作 immediately hander
- */
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
-// DriverActivity driverActivity = driverActivityService.selectById(id);
- DriverActivity driverActivity = driverActivityClient.queryById(id);
- if (SinataUtil.isNotEmpty(driverActivity)){
- driverActivity.setStatus(state);
- driverActivity.setRemark(remark);
- driverActivityClient.updateStatus(driverActivity);
- }
- return SUCCESS_TIP;
- }
- @Autowired
- private ITAuditRecordService auditRecordService;
-
- @RequestMapping(value = "/submitInfo")
- @ResponseBody
- public Object submitInfo(@RequestParam Integer id,@RequestParam Integer check,@RequestParam String text) {
- DriverActivity driverActivity = driverActivityClient.queryById(id);
- if (SinataUtil.isNotEmpty(driverActivity)){
- driverActivity.setStatus(check);
- driverActivity.setRemark(text);
- driverActivityClient.updateStatus(driverActivity);
- }
- TAuditRecord tAuditRecord = new TAuditRecord();
- tAuditRecord.setRemark(text);
- tAuditRecord.setAuditUserId(UserExt.getUser().getId());
- tAuditRecord.setAuditTime(new Date());
- tAuditRecord.setActivityType(1);
- tAuditRecord.setActivityName(driverActivity.getName());
- tAuditRecord.setActivityId(driverActivity.getId());
- if(check==3){
- tAuditRecord.setAuditStatus(2);
- }else {
- tAuditRecord.setAuditStatus(3);
- }
- auditRecordService.save(tAuditRecord);
- return SUCCESS_TIP;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityHistoryController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityHistoryController.java
deleted file mode 100644
index ffe443c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityHistoryController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.DriverActivityHistoryClient;
-import com.dsh.course.feignClient.activity.model.QueryDriverActivityHistoryReq;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.DriverActivityHistory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 20:51:26
- */
-@Controller
-@RequestMapping("/driverActivityHistory")
-public class DriverActivityHistoryController extends BaseController {
-
- private String PREFIX = "/system/driverActivityHistory/";
-
- @Resource
- private DriverActivityHistoryClient driverActivityHistoryClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model,Integer type,Integer activityId, String time) {
- model.addAttribute("type",type);
- model.addAttribute("activityId",activityId);
- model.addAttribute("language", UserExt.getLanguage());
- model.addAttribute("time", time);
- return PREFIX + "driverActivityHistory.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/driverActivityHistory_add")
- public String driverActivityHistoryAdd() {
- return PREFIX + "driverActivityHistory_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/driverActivityHistory_update/{driverActivityHistoryId}")
- public String driverActivityHistoryUpdate(@PathVariable Integer driverActivityHistoryId, Model model) {
- DriverActivityHistory driverActivityHistory = driverActivityHistoryClient.queryById(driverActivityHistoryId);
-
- model.addAttribute("item",driverActivityHistory);
- LogObjectHolder.me().set(driverActivityHistory);
- return PREFIX + "driverActivityHistory_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(Integer type,Integer activityId, String time) {
-
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- String startTime = "";
- String endTime = "";
- if(ToolUtil.isNotEmpty(time)){
- startTime = time.split(" - ")[0];
- endTime = time.split(" - ")[1];
- }
- QueryDriverActivityHistoryReq queryDriverActivityHistoryReq = new QueryDriverActivityHistoryReq(limit, offset, activityId, type, startTime, endTime);
- Page<Map<String, Object>> list = driverActivityHistoryClient.getList(queryDriverActivityHistoryReq);
- return super.packForBT(list);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(DriverActivityHistory driverActivityHistory) {
- driverActivityHistoryClient.add(driverActivityHistory);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer driverActivityHistoryId) {
- driverActivityHistoryClient.deleteById(driverActivityHistoryId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(DriverActivityHistory driverActivityHistory) {
- driverActivityHistoryClient.updateById(driverActivityHistory);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{driverActivityHistoryId}")
- @ResponseBody
- public Object detail(@PathVariable("driverActivityHistoryId") Integer driverActivityHistoryId) {
-// return driverActivityHistoryService.selectById(driverActivityHistoryId);
- return driverActivityHistoryClient.queryById(driverActivityHistoryId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOnlineController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOnlineController.java
deleted file mode 100644
index 03b8041..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOnlineController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.DriverActivityClient;
-import com.dsh.course.feignClient.activity.DriverActivityOnlineClient;
-import com.dsh.course.feignClient.activity.model.DriverActivityOnlineReq;
-import com.dsh.course.feignClient.activity.model.QueryBean;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.DriverActivityOnline;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 20:51:31
- */
-@Controller
-@RequestMapping("/driverActivityOnline")
-public class DriverActivityOnlineController extends BaseController {
-
- private String PREFIX = "/system/driverActivityOnline/";
-
- @Autowired
- private DriverActivityClient driverActivityClient;
- @Autowired
- private DriverActivityOnlineClient driverActivityOnlineClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "driverActivityOnline.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/driverActivityOnline_add")
- public String driverActivityOnlineAdd() {
- return PREFIX + "driverActivityOnline_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/driverActivityOnline_update/{driverActivityOnlineId}")
- public String driverActivityOnlineUpdate(@PathVariable QueryBean driverActivityOnlineId, Model model) {
-// DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectById(driverActivityOnlineId);
- DriverActivityOnline driverActivityOnline = driverActivityClient.onLineQueryById(driverActivityOnlineId);
- model.addAttribute("item",driverActivityOnline);
- LogObjectHolder.me().set(driverActivityOnline);
- return PREFIX + "driverActivityOnline_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return driverActivityClient.onLineQueryAll();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(DriverActivityOnlineReq driverActivityOnline) {
- driverActivityOnlineClient.save(driverActivityOnline);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer driverActivityOnlineId) {
- driverActivityOnlineClient.deleteById(driverActivityOnlineId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(DriverActivityOnlineReq driverActivityOnline) {
- driverActivityOnlineClient.updateById(driverActivityOnline);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{driverActivityOnlineId}")
- @ResponseBody
- public Object detail(@PathVariable("driverActivityOnlineId") Integer driverActivityOnlineId) {
- return driverActivityOnlineClient.queryById(driverActivityOnlineId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOrderController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOrderController.java
deleted file mode 100644
index 09969b1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityOrderController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.DriverActivityOrderClient;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.DriverActivityOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 20:51:36
- */
-@Controller
-@RequestMapping("/driverActivityOrder")
-public class DriverActivityOrderController extends BaseController {
-
- private String PREFIX = "/system/driverActivityOrder/";
-
- @Autowired
- private DriverActivityOrderClient driverActivityOrderClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "driverActivityOrder.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/driverActivityOrder_add")
- public String driverActivityOrderAdd() {
- return PREFIX + "driverActivityOrder_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/driverActivityOrder_update/{driverActivityOrderId}")
- public String driverActivityOrderUpdate(@PathVariable Integer driverActivityOrderId, Model model) {
- DriverActivityOrder driverActivityOrder = driverActivityOrderClient.queryById(driverActivityOrderId);
- model.addAttribute("item",driverActivityOrder);
- LogObjectHolder.me().set(driverActivityOrder);
- return PREFIX + "driverActivityOrder_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return driverActivityOrderClient.queryList();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(DriverActivityOrder driverActivityOrder) {
- driverActivityOrderClient.save(driverActivityOrder);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer driverActivityOrderId) {
- driverActivityOrderClient.deleteById(driverActivityOrderId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(DriverActivityOrder driverActivityOrder) {
- driverActivityOrderClient.updateById(driverActivityOrder);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{driverActivityOrderId}")
- @ResponseBody
- public Object detail(@PathVariable("driverActivityOrderId") Integer driverActivityOrderId) {
- return driverActivityOrderClient.queryById(driverActivityOrderId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityRegisteredController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityRegisteredController.java
deleted file mode 100644
index 1f8c7bd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/DriverActivityRegisteredController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.DriverActivityRegisterClient;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.DriverActivityRegistered;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 20:51:43
- */
-@Controller
-@RequestMapping("/driverActivityRegistered")
-public class DriverActivityRegisteredController extends BaseController {
-
- private String PREFIX = "/system/driverActivityRegistered/";
-
-
- @Autowired
- private DriverActivityRegisterClient driverActivityRegisterClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "driverActivityRegistered.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/driverActivityRegistered_add")
- public String driverActivityRegisteredAdd() {
- return PREFIX + "driverActivityRegistered_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/driverActivityRegistered_update/{driverActivityRegisteredId}")
- public String driverActivityRegisteredUpdate(@PathVariable Integer driverActivityRegisteredId, Model model) {
- DriverActivityRegistered driverActivityRegistered = driverActivityRegisterClient.queryById(driverActivityRegisteredId);
-// DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectById(driverActivityRegisteredId);
- model.addAttribute("item",driverActivityRegistered);
- LogObjectHolder.me().set(driverActivityRegistered);
- return PREFIX + "driverActivityRegistered_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return driverActivityRegisterClient.queryAll();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(DriverActivityRegistered driverActivityRegistered) {
- driverActivityRegisterClient.add(driverActivityRegistered);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer driverActivityRegisteredId) {
- driverActivityRegisterClient.delete(driverActivityRegisteredId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(DriverActivityRegistered driverActivityRegistered) {
- driverActivityRegisterClient.update(driverActivityRegistered);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{driverActivityRegisteredId}")
- @ResponseBody
- public Object detail(@PathVariable("driverActivityRegisteredId") Integer driverActivityRegisteredId) {
- return driverActivityRegisterClient.queryById(driverActivityRegisteredId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/HomeController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/HomeController.java
deleted file mode 100644
index a340629..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/HomeController.java
+++ /dev/null
@@ -1,543 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.feignClient.account.model.Company;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.DriverActivityOnlineClient;
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.activity.model.QueryOnlineDriverReq;
-import com.dsh.course.feignClient.activity.model.SelectCountReq;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.feignClient.driver.model.DriverSelectCountReq;
-import com.dsh.course.feignClient.order.OrderLogisticsClient;
-import com.dsh.course.feignClient.order.OrderPrivateCarClient;
-import com.dsh.course.feignClient.order.model.*;
-import com.dsh.course.util.RedisUtil;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import com.dsh.guns.modular.system.util.DateUtil;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-/**
- * 首页统计
- */
-@Controller
-@RequestMapping("/home")
-public class HomeController {
-
- @Resource
- private TUserClinet userClinet;
-
- @Resource
- private DriverClient driverClient;
-//
-// @Autowired
-// private ITOrderTaxiService tOrderTaxiService;
-
- @Autowired
- private ITCarService tCarService;
-
- @Autowired
- private RedisUtil redisUtil;
-
- @Autowired
- private IUserService userService;
-
- @Resource
- private CompanyClient companyClient;
-
- @Autowired
- private ITCarBrandService carBrandService;
-
- @Autowired
- private ITCarModelService carModelService;
-
- private List<TCompany> companys = null;
-
-
- @Resource
- private OrderPrivateCarClient orderPrivateCarClient;
-
-
- @Resource
- private OrderLogisticsClient orderLogisticsClient;
-
- @Resource
- private DriverActivityOnlineClient driverOnlineService;
-
-
- @RequestMapping("/openNetCarInfo")
- public Object openNetCarInfo(Integer id, Model model){
- model.addAttribute("id", id);
- model.addAttribute("language", UserExt.getLanguage());
- return "/netCarInfo.html";
- }
-
- @RequestMapping("/showDriverOnline")
- public String showDriverOnline(){
- return "/driverOnline.html";
- }
-
-
-
-
- @ResponseBody
- @PostMapping("/getSumData")
- public Object getSumData(Integer companyId, String addDate, String start, String end){
- Integer id = 1;
- User user = userService.getById(id);
- if(companyId == null && user.getRoleType() != 1){
- companyId = user.getObjectId();
- }
- Map<String, Object> map = new HashMap<>();
- Date date = new Date();
- Calendar calendar1 = Calendar.getInstance();
- Calendar calendar2 = Calendar.getInstance();
- Calendar calendar3 = Calendar.getInstance();
- Calendar calendar4 = Calendar.getInstance();
- if(addDate == null){
- calendar1.setTime(date);
- calendar2.setTime(date);
- }else{
- calendar1.setTime(cn.hutool.core.date.DateUtil.parseDate(addDate));
- calendar2.setTime(cn.hutool.core.date.DateUtil.parseDate(addDate));
- }
- if(start == null || end == null){
- calendar3.setTime(date);
- calendar4.setTime(date);
- }else{
- calendar3.setTime(cn.hutool.core.date.DateUtil.parseDate(start));
- calendar4.setTime(cn.hutool.core.date.DateUtil.parseDate(end));
- }
- calendar1.set(Calendar.HOUR_OF_DAY, 00);
- calendar1.set(Calendar.MINUTE, 00);
- calendar1.set(Calendar.SECOND, 00);
- calendar2.set(Calendar.HOUR_OF_DAY, 23);
- calendar2.set(Calendar.MINUTE, 59);
- calendar2.set(Calendar.SECOND, 59);
- calendar3.set(Calendar.HOUR_OF_DAY, 00);
- calendar3.set(Calendar.MINUTE, 00);
- calendar3.set(Calendar.SECOND, 00);
- calendar4.set(Calendar.HOUR_OF_DAY, 23);
- calendar4.set(Calendar.MINUTE, 59);
- calendar4.set(Calendar.SECOND, 59);
-
- //【今日运行情况】 Today's operational situation.
- Map<String, Object> map1 = new HashMap<>();
- QueryWrapper<TUser> ne = new QueryWrapper<TUser>().between("insertTime", calendar1.getTime(), calendar2.getTime()).ne("flag", 3);
- System.out.println(calendar1.getTime());
- System.out.println(calendar2.getTime());
- if(companyId != null){
- ne.eq("companyId", companyId);
- }
- int i = userClinet.selectCount(new SelectCountReq(calendar1.getTime(), calendar2.getTime(),3,companyId));
- map1.put("passengerInfo", i); //新增用户 Increase in/newly added users
-
- QueryWrapper<Driver> ne1 = new QueryWrapper<Driver>().ne("state", 1).eq("authState", 2).ne("flag", 3);
- if(companyId != null){
- ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
- }
- if(companyId==null){
- companyId=-1;
- }
- List<Driver> tDrivers = driverClient.selectList1(companyId);
- if(companyId==-1){
- companyId=null;
- }
- String keys = "";
- for(Driver driver : tDrivers){
- keys += "DRIVER" + driver.getId() + ",";
- }
-
- int size = driverClient.queryOnlineDriverCount(new SelectCountReq(calendar1.getTime(), calendar2.getTime(),3,companyId));
- map1.put("netcardriver", size); //在线司机 online driver
- QueryWrapper<OrderPrivateCar> zcTodayTme = new QueryWrapper<OrderPrivateCar>().between("travelTime", calendar1.getTime(), calendar2.getTime());
- if(companyId != null){
- zcTodayTme.eq("companyId", companyId);
- }
- int zcTodayNum = orderPrivateCarClient.selectCount(new OrderPrivateCarSelectCountReq(calendar1.getTime(), calendar2.getTime(),companyId,null));
- map1.put("orderDetail1", zcTodayNum); //专车订单 special car order
-
- QueryWrapper<OrderLogistics> tcxTodayTme = new QueryWrapper<OrderLogistics>().between("travelTime", calendar1.getTime(), calendar2.getTime());
- if(companyId != null){
- tcxTodayTme.eq("companyId", companyId);
- }
- tcxTodayTme.eq("type",4);
-
- int tcxTodayNum = orderLogisticsClient.selectCount(new OrderLogisticsSelectCountReq(calendar1.getTime(), calendar2.getTime(),companyId,4,null));
- map1.put("orderDetail4", tcxTodayNum); //同城物流订单 local-city express
-
- QueryWrapper<OrderLogistics> kcxTodayTme = new QueryWrapper<OrderLogistics>().between("travelTime", calendar1.getTime(), calendar2.getTime());
- if(companyId != null){
- kcxTodayTme.eq("companyId", companyId);
- }
- tcxTodayTme.eq("type",5);
- int kcxTodayNum = orderLogisticsClient.selectCount(new OrderLogisticsSelectCountReq(calendar1.getTime(), calendar2.getTime(),companyId,5,null));
- map1.put("orderDetail5", kcxTodayNum); //跨城物流订单 cross-city express
-
- map.put("operationStatus", map1);
-
- //【全部运营总数据】Overall operational data
- map1 = new HashMap<>();
- QueryWrapper<TUser> flag1 = new QueryWrapper<TUser>().ne("flag", 3);
- if(companyId != null){
- flag1.eq("companyId", companyId);
- }
- int flag = userClinet.selectCount(new SelectCountReq(null,null,3,companyId));
-
- map1.put("passengerInfoSum", flag); //总用户 total users
-
- QueryWrapper<Driver> ne4 = new QueryWrapper<Driver>().eq("authState", 2).ne("flag", 3);
- if(companyId != null){
- ne4.eq("companyId", companyId).or().eq("franchiseeId", companyId);
- }
- int i2 = driverClient.selectCount(new DriverSelectCountReq(null,new Integer[]{2},3,companyId,null,null));
- map1.put("netcarDriverSum", i2); //总司机 total drivers
-
- QueryWrapper<TCar> state3 = new QueryWrapper<TCar>().eq("state", 1);
- if(companyId != null){
- state3.eq("companyId", companyId).or().eq("franchiseeId", companyId);
- }
- int state1 = tCarService.getBaseMapper().selectCount(state3);
- map1.put("netCarSum", state1); //总车辆 total cars
- if(companyId==null){
- companyId=-1;
- }
- Map<String, Object> allOrderNum = orderLogisticsClient.getAllOrderNum(companyId);
- if(companyId==-1){
- companyId=null;
- }
- if(ToolUtil.isNotEmpty(allOrderNum)) {
- map1.put("orderDetailSum", (Integer) allOrderNum.get("num")); //总订单 total orders
- }else {
- map1.put("orderDetailSum",0); //总订单total orders
- }
- if(companyId==null){
- companyId=-1;
- }
- Double allIncomeMoney = companyClient.getAllIncomeMoney(companyId);
- if(companyId==-1){
- companyId=null;
- }
- if(ToolUtil.isNotEmpty(allOrderNum)) {
- map1.put("paiceSum", (Double) allOrderNum.get("money")); //交易总金额 Total transaction amount
-
- }else {
- map1.put("paiceSum", 0); //交易总金额 Total transaction amount
- }
- if(ToolUtil.isNotEmpty(allOrderNum)) {
- map1.put("paySum", allIncomeMoney); //总收益 total Icome
- }else {
- map1.put("paySum", 0); //总收益 total Icome Total income
- }
-
- map.put("operationSum", map1);
-
- //【运营数据增长查询】 Operation data growth inquiry.
- map1 = new HashMap<>();
- QueryWrapper<TUser> ne2 = new QueryWrapper<TUser>().between("insertTime", calendar3.getTime(), calendar4.getTime()).ne("flag", 3);
- if(companyId != null){
- ne2.eq("companyId", companyId);
- }
- int i4 = userClinet.selectCount(new SelectCountReq(calendar3.getTime(), calendar4.getTime(),3,companyId));
- map1.put("passengerInfoSum", i4);
-
- QueryWrapper<Driver> ne3 = new QueryWrapper<Driver>().between("insertTime", calendar3.getTime(), calendar4.getTime()).eq("authState", 2).ne("flag", 3);
- if(companyId != null){
- ne3.eq("companyId", companyId).or().eq("franchiseeId", companyId);
- }
- int i5 = driverClient.selectCount(new DriverSelectCountReq(null,new Integer[]{2},3,companyId,calendar3.getTime(), calendar4.getTime()));
- map1.put("netcarDriverSum", i5);
-
- QueryWrapper<OrderPrivateCar> zcTodayTmeByConditions = new QueryWrapper<OrderPrivateCar>().between("travelTime", calendar3.getTime(), calendar4.getTime());
- if(companyId != null){
- zcTodayTmeByConditions.eq("companyId", companyId);
- }
- int zcTodayNum1 = orderPrivateCarClient.selectCount(new OrderPrivateCarSelectCountReq(calendar3.getTime(), calendar4.getTime(),companyId,null));
- map1.put("orderDetail1", zcTodayNum1); //专车订单 special order
-
- QueryWrapper<OrderLogistics> tcxTodayTmeByConditions = new QueryWrapper<OrderLogistics>().between("travelTime", calendar3.getTime(), calendar4.getTime());
- if(companyId != null){
- tcxTodayTmeByConditions.eq("companyId", companyId);
- }
- tcxTodayTmeByConditions.eq("type",4);
- int tcxTodayNum1 = orderLogisticsClient.selectCount(new OrderLogisticsSelectCountReq(calendar3.getTime(), calendar4.getTime(),companyId,4,null));
- map1.put("orderDetail4", tcxTodayNum1); //同城物流订单 local-city express
-
- QueryWrapper<OrderLogistics> kcxTodayTmeByConditions = new QueryWrapper<OrderLogistics>().between("travelTime", calendar3.getTime(), calendar4.getTime());
- if(companyId != null) {
- kcxTodayTmeByConditions.eq("companyId", companyId);
- }
-
- String startTime = null;
- if (SinataUtil.isNotEmpty(start)){
- startTime = DateUtil.format(cn.hutool.core.date.DateUtil.parseDate(start), "yyyy-MM-dd");
- }
- String endTime = null;
- if (SinataUtil.isNotEmpty(end)){
- endTime = DateUtil.format(cn.hutool.core.date.DateUtil.parseDate(end), "yyyy-MM-dd");
- }
- Double allTradeMoneyByTime = orderLogisticsClient.getAllTradeMoney(new GetAllTradeMoneyReq(companyId, startTime, endTime));
- Double allIncomeMoneyByTime = companyClient.getAllIncomeMoney1(new GetAllTradeMoneyReq(companyId, startTime, endTime));
- map1.put("paiceSum", allTradeMoneyByTime); //交易总金额 Total transaction amount
- map1.put("paySum", allIncomeMoneyByTime); //总收益 total Icome
- map.put("operationGrow", map1);
-
-
- //【运营总趋势】
- Integer[] states = new Integer[]{8, 9};
- map1 = new HashMap<>();
- List<Integer> m1 = new ArrayList<>();
- List<Integer> m2 = new ArrayList<>();
- List<Integer> m3 = new ArrayList<>();
- List<Integer> m4 = new ArrayList<>();
- List<Integer> m5 = new ArrayList<>();
- List<Integer> m6 = new ArrayList<>();
- List<Integer> m7 = new ArrayList<>();
- for(int j = 30; j > 0; j--){
- Calendar s1 = Calendar.getInstance();
- s1.setTime(date);
- s1.set(s1.get(Calendar.YEAR), s1.get(Calendar.MONTH), s1.get(Calendar.DAY_OF_MONTH) - j, 0, 0, 1);
- Calendar e1 = Calendar.getInstance();
- e1.setTime(date);
- e1.set(e1.get(Calendar.YEAR), e1.get(Calendar.MONTH), e1.get(Calendar.DAY_OF_MONTH) - j, 23, 59, 59);
-
-
- //用户注册趋势图
- QueryWrapper<TUser> ne5 = new QueryWrapper<TUser>().between("insertTime", s1.getTime(), e1.getTime()).ne("flag", 3);
- if(companyId != null){
- ne5.eq("companyId", companyId);
- }
- int i7 = userClinet.selectCount(new SelectCountReq(s1.getTime(), e1.getTime(),3,companyId));
- m2.add(i7);
-
- //专车订单趋势图
- QueryWrapper<OrderPrivateCar> inZC = new QueryWrapper<OrderPrivateCar>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
- if(companyId != null){
- inZC.eq("companyId", companyId);
- }
- int zc = orderPrivateCarClient.selectCount(new OrderPrivateCarSelectCountReq( s1.getTime(), e1.getTime(),companyId,states));
- m4.add(zc);
-
- //同城物流订单趋势图
- QueryWrapper<OrderLogistics> inTCX = new QueryWrapper<OrderLogistics>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
- if(companyId != null){
- inTCX.eq("companyId", companyId);
- }
- inTCX.eq("type",4);
- int tcx = orderLogisticsClient.selectCount(new OrderLogisticsSelectCountReq(s1.getTime(), e1.getTime(),companyId,4,states));
- m6.add(tcx);
-
-
- }
- map1.put("orderDetail5", m7); //跨城物流订单数趋势图 Number of cross-city logistics orders chart
- map1.put("orderDetail4", m6); //同城物流订单数趋势图 Number of local-city logistics orders chart
- map1.put("orderDetail3", m5); //跨城订单数趋势图 Number of cross-city logistics orders chart
- map1.put("orderDetail1", m4); //专车订单数趋势图 Number of special orders chart
- map1.put("orderDetailSum", m3); //全部订单数趋势图 Number of all orders chart
- map1.put("passengerInfoSum", m2); //用户注册趋势图 Number of user register orders chart
- map1.put("orderDetail2", m1); //
- map.put("operationTrend", map1);
-
- return map;
- }
-
-
-
- @ResponseBody
- @PostMapping("/getDriverPosition")
- public Object getDriverPosition(Integer companyId){
-
- Integer id = UserExt.getUser().getId();
- User user = userService.getById(id);
- if(companyId == null && user.getRoleType() != 1){
- companyId = user.getObjectId();
- }
- QueryWrapper<Driver> ne = new QueryWrapper<Driver>().eq("authState", 2).ne("state", 1).ne("flag", 3);
- if(companyId != null){
- ne.eq("companyId", companyId).or().eq("franchiseeId", companyId);
- }else {
- companyId=-1;
- }
- List<Driver> tDrivers = driverClient.selectList1(companyId);
- Map<String, Object> map = new HashMap<>();
- List<Object> list1 = new ArrayList<>();
- List<Object> list2 = new ArrayList<>();
- for(Driver tDriver : tDrivers){
- Map<String, Object> d = new HashMap<>();
- String value = redisUtil.getValue("DRIVER" + tDriver.getId());
- if(ToolUtil.isEmpty(value)){
- continue;
- }
- d.put("driver", tDriver);
- d.put("lon", value.split(",")[0]);
- d.put("lat", value.split(",")[1]);
- if(tDriver.getState() == 2){
- list1.add(d);
- }else{
- list2.add(d);
- }
- }
- map.put("driver1", list1);
- map.put("driver2", list2);
-
- QueryPrivateCarOrderReq queryPrivateCarOrderReq = new QueryPrivateCarOrderReq();
- queryPrivateCarOrderReq.setState(1);
- List<Map<String, Object>> privateCarOrderList = orderPrivateCarClient.getPrivateCarOrderList1(companyId);
-
- QueryLoginsicsListReq queryLoginsicsListReq = new QueryLoginsicsListReq();
- queryLoginsicsListReq.setState(1);
- List<Map<String, Object>> logisticsOrderList = orderLogisticsClient.getLogisticsOrderList1(companyId);
- Map<String, Object> map1 = new HashMap<>();
- map1.put("zhuanche", privateCarOrderList);
- map1.put("kuacheng", logisticsOrderList);
- map.put("order", map1);
- return map;
- }
-
-
- @ResponseBody
- @PostMapping("/getAllOrder")
- public Object getAllOrder(Integer type){
- User user = UserExt.getUser();
- List list = new ArrayList<>();
- List<Map<String, Object>> logisticsOrderList1 = orderLogisticsClient.getLogisticsOrderList1(user.getObjectId());
- List<Map<String, Object>> privateCarOrderList1 = orderPrivateCarClient.getPrivateCarOrderList1(user.getObjectId());
- if(type==null || "".equals(type)){
- for(Map<String, Object> t : logisticsOrderList1){
- Map<String, Object> map = new HashMap<>();
- map.put("lon", Double.valueOf(t.get("startLon").toString()));
- map.put("lat", Double.valueOf(t.get("startLat").toString()));
- list.add(map);
- }
- for(Map<String, Object> t : privateCarOrderList1){
- Map<String, Object> map = new HashMap<>();
- map.put("lon", Double.valueOf(t.get("startLon").toString()));
- map.put("lat", Double.valueOf(t.get("startLat").toString()));
- list.add(map);
- }
- }else if(type==1){
- for(Map<String, Object> t : privateCarOrderList1){
- Map<String, Object> map = new HashMap<>();
- map.put("lon", Double.valueOf(t.get("startLon").toString()));
- map.put("lat", Double.valueOf(t.get("startLat").toString()));
- list.add(map);
- }
- }else {
- for(Map<String, Object> t : logisticsOrderList1){
- Map<String, Object> map = new HashMap<>();
- map.put("lon", Double.valueOf(t.get("startLon").toString()));
- map.put("lat", Double.valueOf(t.get("startLat").toString()));
- list.add(map);
- }
- }
- return list;
- }
-
-
- @ResponseBody
- @PostMapping("/getCompanyInfoByUserId")
- public Object getCompanyInfoByUserId(){
- Integer id = 1;
- User user = userService.getById(id);
- companys = new ArrayList<>();
- List<TCompany> ids = new ArrayList<>();
- CompanyInfoRes tCompany = null;
- if(user.getRoleType() == 1 && user.getObjectId() == null){
- tCompany = companyClient.queryById(1);
- }else{
- tCompany = companyClient.queryById(user.getObjectId());
- }
- TCompany tCompany1 = new TCompany();
- BeanUtils.copyProperties(tCompany,tCompany1);
- ids.add(tCompany1);
- companys.addAll(ids);
- this.getCompanyIds(ids);
- return companys;
- }
-
-
- @ResponseBody
- @RequestMapping(value = "/getDriverInfo", method = RequestMethod.POST)
- public Object getDriverInfo(Integer driverId){
- Map<String, Object> map = new HashMap<>();
- DriverInfoRes tDriver = driverClient.getDriver(driverId);
- TCar tCar = tCarService.getById(tDriver.getCarId());
- TCarBrand tCarBrand = null;
- TCarModel tCarModel = null;
- if(null != tCar){
- tCarBrand = carBrandService.getById(tCar.getCarBrandId());
- tCarModel = carModelService.getById(tCar.getCarModelId());
- }
- Integer[] states = new Integer[]{2, 3, 4, 5, 6, 11};
-// Wrapper<TOrderTaxi> state4 = new EntityWrapper<TOrderTaxi>().in("state", states).eq("driverId", driverId).eq("isDelete", 1);
-// List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(state4);
- map.put("netcarDriver", tDriver);
- map.put("netcar", tCar);
- map.put("carBrand", null != tCarBrand ? tCarBrand.getName() : "");
- map.put("carModel", null != tCarModel ? tCarModel.getName() : "");
-// map.put("order", tOrderTaxis);
- return map;
- }
-
-
-
- public void getCompanyIds(List<TCompany> ids){
- List<TCompany> ids_ = new ArrayList<>();
- for(TCompany id : ids){
- if(id.getId() == 1){
-// List<Company> tCompanies = companyClient.selectList1(new QueryWrapper<Company>().eq("superiorId", id.getId()).or().isNull("superiorId").eq("state", 0).ne("flag", 3).ne("type", 1));
- List<Company> tCompanies = companyClient.selectList2(id.getId());
- ArrayList<TCompany> tCompanies1 = new ArrayList<>();
- for (Company tCompany : tCompanies) {
- TCompany tCompany1 = new TCompany();
- BeanUtils.copyProperties(tCompany,tCompany1);
- tCompanies1.add(tCompany1);
- }
- ids_.addAll(tCompanies1);
- companys.addAll(tCompanies1);
- }else{
-// List<Company> tCompanies = companyClient.selectList3(new QueryWrapper<Company>().eq("superiorId", id.getId()).eq("state", 0).ne("flag", 3));
- List<Company> tCompanies = companyClient.selectList3(id.getId());
- ArrayList<TCompany> tCompanies1 = new ArrayList<>();
- for (Company tCompany : tCompanies) {
- TCompany tCompany1 = new TCompany();
- BeanUtils.copyProperties(tCompany,tCompany1);
- tCompanies1.add(tCompany1);
- }
- ids_.addAll(tCompanies1);
- companys.addAll(tCompanies1);
- }
- }
- if(ids_.size() == 0){
- return;
- }
- this.getCompanyIds(ids_);
- }
-
-
-
- @ResponseBody
- @RequestMapping(value = "/queryOnlineDriver", method = RequestMethod.POST)
- public Object queryOnlineDriver(String name, String phone, Integer offset, Integer limit){
- try {
- return driverClient.queryOnlineDriver(new QueryOnlineDriverReq(name, phone, offset, limit));
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/ReportController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/ReportController.java
deleted file mode 100644
index d0a5487..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/ReportController.java
+++ /dev/null
@@ -1,435 +0,0 @@
-//package com.dsh.guns.modular.system.controller.general;
-//
-//
-//import com.dsh.app.feignClient.activity.CompanyClient;
-//import com.dsh.app.feignClient.activity.model.CompanyInfoRes;
-//import com.dsh.app.feignClient.activity.model.CompanyQueryStateAndFlgReq;
-//import com.dsh.guns.modular.system.service.ITCompanyService;
-//import com.dsh.guns.modular.system.service.IUserActivityDiscount1Service;
-//import com.dsh.guns.modular.system.service.IUserCouponRecordService;
-//import com.dsh.guns.modular.system.service.IUserRedPacketRecordService;
-//import com.dsh.guns.modular.system.util.ResultUtil;
-//import org.apache.commons.lang3.StringUtils;
-//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.servlet.ServletOutputStream;
-//import javax.servlet.http.HttpServletResponse;
-//import java.net.URLEncoder;
-//import java.util.List;
-//
-///**
-// * 报表控制器
-// */
-//@Controller
-//@RequestMapping("/report")
-//public class ReportController {
-//
-// private String PREFIX = "/system/report/";
-//
-// @Autowired
-// private CompanyClient companyClient;
-//
-// @Autowired
-// private IUserCouponRecordService userCouponRecordService;
-//
-// @Autowired
-// private IUserRedPacketRecordService redPacketRecordService;
-//
-// @Autowired
-// private IUserActivityDiscount1Service userActivityDiscount1Service;
-//
-//
-//
-//
-// /**
-// * 跳转到日常运营数据汇总页
-// * @return
-// */
-// @RequestMapping("/showOperationalData")
-// public String showOperationalData(Model model){
-// List<CompanyInfoRes> companyInfoRes = companyClient.queryByStateAndFlg(new CompanyQueryStateAndFlgReq(0, 3));
-// model.addAttribute("company", companyInfoRes);
-// return PREFIX + "operationalData.html";
-// }
-//
-// /**
-// * 跳转到优惠券统计页
-// * @param model
-// * @return
-// */
-// @RequestMapping("/showCouponStatistics")
-// public String showCouponStatistics(Model model){
-// List<CompanyInfoRes> companyInfoRes = companyClient.queryByStateAndFlg(new CompanyQueryStateAndFlgReq(0, 3));
-// model.addAttribute("company", companyInfoRes);
-// return PREFIX + "couponStatistics.html";
-// }
-//
-// /**
-// * 跳转到优惠券统计详情页
-// * @param type
-// * @param model
-// * @return
-// */
-// @RequestMapping("/showCouponStatisticsInfo")
-// public String showCouponStatisticsInfo(Integer type, Model model){
-// List<CompanyInfoRes> companyInfoRes = companyClient.queryByStateAndFlg(new CompanyQueryStateAndFlgReq(0, 3));
-// model.addAttribute("company", companyInfoRes);
-// model.addAttribute("type", type);
-// return PREFIX + "couponStatisticsInfo.html";
-// }
-//
-//
-//
-//
-//
-//
-// /**
-// * 获取日常运营数据
-// * @param type
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryOperationalData", method = RequestMethod.POST)
-// public Object queryOperationalData(Integer type, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// return companyClient.queryOperationalData(type, start, end, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-// /**
-// * 下载日常运营数据汇总表
-// * @param type
-// * @param time
-// * @param companyId
-// * @param response
-// */
-// @ResponseBody
-// @RequestMapping(value = "/downloadOperationalData", method = RequestMethod.GET)
-// public void downloadOperationalData(Integer type, String time, Integer companyId, HttpServletResponse response){
-// try {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// HSSFWorkbook hssfWorkbook = companyClient.downloadOperationalData(type, start, end, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("日常运营数据汇总表.xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-//
-//
-// /**
-// * 获取优惠券统计
-// * @param type
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryCouponRegister", method = RequestMethod.POST)
-// public Object queryCouponRegister(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// return userCouponRecordService.queryCouponRegister(type, name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-// /**
-// * 下载优惠券领取数据
-// * @param type
-// * @param name
-// * @param time
-// * @param companyId
-// * @param response
-// */
-// @ResponseBody
-// @RequestMapping(value = "/downloadCouponRegister", method = RequestMethod.GET)
-// public void downloadCouponRegister(Integer type, String name, String time, Integer companyId, HttpServletResponse response){
-// try {
-// String na = "";
-// if(type == 2){
-// na = "注册优惠券奖励";
-// }
-// if(type == 3){
-// na = "邀请优惠券奖励";
-// }
-// if(type == 4){
-// na = "充值优惠券奖励";
-// }
-// HSSFWorkbook hssfWorkbook = userCouponRecordService.downloadCouponRegister(type, name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(na + ".xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-//
-//
-// /**
-// * 获取红包统计数据
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryRedEnvelopes", method = RequestMethod.POST)
-// public Object queryRedEnvelopes(String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// return redPacketRecordService.queryRedEnvelopes(name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-//
-// /**
-// * 下载红包奖励
-// * @param name
-// * @param time
-// * @param companyId
-// * @param response
-// */
-// @ResponseBody
-// @RequestMapping(value = "/downloadRedEnvelopes", method = RequestMethod.GET)
-// public void downloadRedEnvelopes(String name, String time, Integer companyId, HttpServletResponse response){
-// try {
-// HSSFWorkbook hssfWorkbook = redPacketRecordService.downloadRedEnvelopes(name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("红包奖励.xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-//
-//
-//
-// /**
-// * 获取折扣统计
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryDiscount1", method = RequestMethod.POST)
-// public Object queryDiscount1(String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// return userActivityDiscount1Service.queryDiscount1(name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-// /**
-// * 下载折扣优惠活动
-// * @param name
-// * @param time
-// * @param companyId
-// * @param response
-// */
-// @ResponseBody
-// @RequestMapping(value = "/downloadDiscount1", method = RequestMethod.GET)
-// public void downloadDiscount1(String name, String time, Integer companyId, HttpServletResponse response){
-// try {
-// HSSFWorkbook hssfWorkbook = userActivityDiscount1Service.downloadDiscount1(name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("折扣优惠活动.xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-//
-// /**
-// * 获取优惠券统计明细
-// * @param type
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryCouponRegisterInfo", method = RequestMethod.POST)
-// public Object queryCouponRegisterInfo(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// type += 1;
-// return userCouponRecordService.queryCouponRegisterInfo(type, name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-//
-//
-//
-// /**
-// * 获取充值赠送优惠券明细
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryCouponRegisterInfo1", method = RequestMethod.POST)
-// public Object queryCouponRegisterInfo1(String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// return userCouponRecordService.queryCouponRegisterInfo1( name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-//
-// /**
-// * 获取折扣优惠详情
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryDiscountInfo", method = RequestMethod.POST)
-// public Object queryDiscountInfo(String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// return userActivityDiscount1Service.queryDiscountInfo(name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-//
-//
-//
-// /**
-// * 获取红包领取详情
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// */
-// @ResponseBody
-// @RequestMapping(value = "/queryRedEnvelopesInfo", method = RequestMethod.POST)
-// public Object queryRedEnvelopesInfo(String name, String time, Integer companyId, Integer offset, Integer limit){
-// try {
-// return redPacketRecordService.queryRedEnvelopesInfo(name, time, companyId, offset, limit);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-//
-// /**
-// * 优惠明细下载
-// * @param type
-// * @param name
-// * @param time
-// * @param companyId
-// * @param response
-// */
-// @ResponseBody
-// @RequestMapping(value = "/downloadCouponStatisticsInfo", method = RequestMethod.GET)
-// public void downloadCouponStatisticsInfo(Integer type, String name, String time, Integer companyId, HttpServletResponse response){
-// try {
-// if(type == 1 || type == 2){
-// type += 1;
-// HSSFWorkbook hssfWorkbook = userCouponRecordService.downloadCouponRegisterInfo(type, name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode((type == 2 ? "注册奖励明细" : "邀请奖励明细") + ".xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }
-// if(type == 3){
-// HSSFWorkbook hssfWorkbook = userCouponRecordService.downloadCouponRegisterInfo1(name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("充值奖励明细.xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }
-// if(type == 4){
-// HSSFWorkbook hssfWorkbook = userActivityDiscount1Service.downloadDiscountInfo(name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("折扣优惠明细.xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }
-// if(type == 5){
-// HSSFWorkbook hssfWorkbook = redPacketRecordService.downloadRedEnvelopesInfo(name, time, companyId);
-// response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("红包优惠明细.xls", "utf-8"));
-// response.setContentType("application/vnd.ms-excel");
-// ServletOutputStream out = response.getOutputStream();
-// hssfWorkbook.write(out);
-// out.flush();
-// out.close();
-// }
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponActivityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponActivityController.java
deleted file mode 100644
index ff16b8e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponActivityController.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.course.feignClient.activity.UserCouponRecordClient;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.enums.ActivityTypeEnum;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ISysCouponActivityService;
-import com.dsh.guns.modular.system.service.ISysCouponRecordService;
-import com.dsh.guns.modular.system.service.ITAuditRecordService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.*;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 09:14:59
- */
-@Controller
-@RequestMapping("/sysCouponActivity")
-public class SysCouponActivityController extends BaseController {
-
- private String PREFIX = "/system/sysCouponActivity/";
-
- @Autowired
- private ISysCouponActivityService sysCouponActivityService;
-
- @Autowired
- private TUserClinet tUserClinet;
-
- @Autowired
- private ISysCouponRecordService couponRecordService;
-
- @Autowired
- UserCouponRecordClient userCouponRecordClient;
- @Autowired
- private ITAuditRecordService auditRecordService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("companyId",UserExt.getUser().getObjectId());
- return PREFIX + "sysCouponActivity.html";
- }
-
- /**
- * 跳转到选择优惠券页面
- * @return
- */
- @RequestMapping("/sysCouponRecord")
- public String sysCouponRecord(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
-
- return PREFIX + "sysCouponRecord.html";
- }
-
- /**
- * 跳转到选择用户页面
- * @return
- */
- @RequestMapping("user")
- public String user(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tUser.html";
- }
- /**
- * 跳转到添加
- */
- @RequestMapping("/sysCouponActivity_add")
- public String sysCouponActivityAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "sysCouponActivity_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/sysCouponActivity_update/{sysCouponActivityId}")
- public String sysCouponActivityUpdate(@PathVariable Integer sysCouponActivityId, Model model) {
- SysCouponActivity sysCouponActivity = sysCouponActivityService.getById(sysCouponActivityId);
- model.addAttribute("item",sysCouponActivity);
- if(sysCouponActivity.getSendType()==2){
- model.addAttribute("sendUserInfoList",JSON.parseArray(sysCouponActivity.getSendUserId()));
- }else{
- model.addAttribute("sendUserInfoList",new ArrayList<>());
- }
- LogObjectHolder.me().set(sysCouponActivity);
- return PREFIX + "sysCouponActivity_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,Integer couponUseType,Integer status) {
- Date startTimes = null;
- Date endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
- }
- Page<SysCouponActivity> page = new PageFactory<SysCouponActivity>().defaultPage();
- LambdaQueryWrapper<SysCouponActivity> wrapper = new LambdaQueryWrapper<>();
-// Wrapper wrapper = new QueryWrapper<SysCouponActivity>().lambda();
- if(SinataUtil.isNotEmpty(createTime)){
- wrapper.between(SysCouponActivity::getInsertTime,startTimes,endTimes);
- }
- if(SinataUtil.isNotEmpty(couponUseType)){wrapper.eq(SysCouponActivity::getCouponUseType,couponUseType);}
- if(SinataUtil.isNotEmpty(status)){wrapper.eq(SysCouponActivity::getStatus,status);}
-// ShiroUser user = ShiroKit.getUser();
-// if(user.getRoleType()!=1){
-// wrapper.eq(SysCouponActivity::getCompanyId,user.getObjectId());
-// wrapper.eq(SysCouponActivity::getCompanyType,user.getRoleType());
-// }
- wrapper.ne(SysCouponActivity::getStatus,4);
- wrapper.orderByDesc(SysCouponActivity::getId);
- return super.packForBT(sysCouponActivityService.getBaseMapper().selectPage(page,wrapper));
- }
-
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(SysCouponActivity sysCouponActivity,Integer activityId,Integer allNum) {
- SysCouponRecord sysCouponRecord = couponRecordService.getById(activityId);
- sysCouponActivity.setCouponType(sysCouponRecord.getCouponType());
- sysCouponActivity.setCouponUseType(sysCouponRecord.getCouponUseType());
- sysCouponActivity.setMoney(sysCouponRecord.getMoney());
- sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
- sysCouponActivity.setInsertTime(new Date());
- sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(UserExt.getUser().getObjectId());
- sysCouponActivity.setCompanyType(UserExt.getUser().getRoleType());
- sysCouponActivity.setAllNum(allNum);
- // 数量
- Integer number = sysCouponActivity.getNumber();
-
- sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
- sysCouponActivityService.save(sysCouponActivity);
- if(true){
- //定时发送优惠券 Timed delivery of discount coupons.
- Timer timer = new Timer();
- timer.schedule(new timerTaskTest(sysCouponActivity.getId(),number,allNum),30*1000);//timer.schedule(执行的方法，延迟多久执行(ms))
- }
- return SUCCESS_TIP;
- }
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/sysCouponActivity_immediately/{id}")
- public String sysCouponActivityImmediately(@PathVariable Integer id, Model model) {
- model.addAttribute("id",id);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "sysCouponActivity_immediately.html";
- }
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @Transactional(rollbackFor = Exception.class)
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
- SysCouponActivity sysCouponActivity = sysCouponActivityService.getById(id);
- if (SinataUtil.isNotEmpty(sysCouponActivity)){
- sysCouponActivity.setStatus(state);
- sysCouponActivity.setRemark(remark);
- sysCouponActivityService.updateById(sysCouponActivity);
-
- // 添加审核记录
- TAuditRecord tAuditRecord = new TAuditRecord();
- tAuditRecord.setActivityId(id);
- tAuditRecord.setActivityName(sysCouponActivity.getName());
- if(state == 2){
- tAuditRecord.setAuditStatus(3);
- }
- if(state == 3){
- tAuditRecord.setAuditStatus(2);
- }
- tAuditRecord.setAuditTime(new Date());
- tAuditRecord.setAuditUserId(Objects.requireNonNull(UserExt.getUser()).getId());
- tAuditRecord.setRemark(remark);
- tAuditRecord.setActivityType(ActivityTypeEnum.SEND_ACTIVITY.getCode());
- auditRecordService.save(tAuditRecord);
-
- if(state==3){
- //定时发送优惠券 Timed delivery of discount coupons.
- Timer timer = new Timer();
- timer.schedule(new timerTaskTest(id),30*1000);//timer.schedule(执行的方法，延迟多久执行(ms))
- }
- }
- return SUCCESS_TIP;
- }
- class timerTaskTest extends TimerTask {
- private Integer id;
-
- private Integer number;
-
- private Integer allNum;
-
- public timerTaskTest(Integer id) {
- this.id = id;
- }
- public timerTaskTest(Integer id,Integer number,Integer allNum) {
- this.id = id;
- this.number = number;
- this.allNum = allNum;
- }
- @Override
- public void run() {
- SysCouponActivity sysCouponActivity = sysCouponActivityService.getById(id);
-
- SysCouponRecord sysCouponRecord = couponRecordService.getBaseMapper().selectById(sysCouponActivity.getCouponId());
-
- UserCouponRecord userCouponRecord = new UserCouponRecord();
- if(sysCouponActivity.getCouponType()==3){
- userCouponRecord.setType(2);
- userCouponRecord.setTotalAmount(sysCouponRecord.getMoney().doubleValue());
- userCouponRecord.setResidualAmount(sysCouponRecord.getMoney().doubleValue());
- }
- userCouponRecord.setMoney(sysCouponActivity.getMoney());
- userCouponRecord.setFullMoney(sysCouponActivity.getFullMoney());
- Date nowDay = new Date();
- userCouponRecord.setInsertTime(nowDay);
- userCouponRecord.setCouponId(sysCouponRecord.getId());
- userCouponRecord.setExpirationTime(new Date(nowDay.getTime()+sysCouponActivity.getEffective()*24*3600*1000L));
- userCouponRecord.setCompanyId(sysCouponActivity.getCompanyId());
- userCouponRecord.setState(1);
- userCouponRecord.setCouponType(sysCouponActivity.getCouponType());
- userCouponRecord.setCouponUseType(sysCouponActivity.getCouponUseType());
- userCouponRecord.setCouponActivityId(sysCouponActivity.getId());
- userCouponRecord.setActivityType(1);
- //判断发送类型1=全部用户，2=选择用户 1:all user 2:select user
- if(sysCouponActivity.getSendType()==1){
- Integer companyId =null;
-// if(sysCouponActivity.getCompanyType()!=1){
- companyId = sysCouponActivity.getCompanyId();
-// }
-// List<TUser> list = userService.selectList(wrapper);
-
- List<TUser> list = tUserClinet.queryUserListByCompanyId(companyId);
- for(TUser user:list){
- userCouponRecord.setUserId(user.getId());
- for (int i=0;i<sysCouponActivity.getNumber();i++){
- if(allNum<number){
- break;
- }
- userCouponRecordClient.addUserCouponRecord(userCouponRecord);
- allNum=allNum-number;
- }
- }
- sysCouponActivity.setSendUserNum(list.size());
- sysCouponActivity.updateById();
- }else{
- JSONArray userId = JSON.parseArray(sysCouponActivity.getSendUserId());
- for(int j=0;j<userId.size();j++){
- userCouponRecord.setUserId(userId.getJSONObject(j).getInteger("userId"));
- for (int i=0;i<sysCouponActivity.getNumber();i++){
- if(allNum<number){
- break;
- }
- userCouponRecordClient.addUserCouponRecord(userCouponRecord);
- allNum=allNum-number;
- }
- }
- sysCouponActivity.setSendUserNum(userId.size());
- sysCouponActivity.updateById();
-
- }
-
- }
- }
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer sysCouponActivityId) {
- SysCouponActivity sysCouponActivity = new SysCouponActivity();
- sysCouponActivity.setId(sysCouponActivityId);
- sysCouponActivity.setStatus(4);
- sysCouponActivityService.updateById(sysCouponActivity);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(SysCouponActivity sysCouponActivity,Integer activityId) {
- SysCouponRecord sysCouponRecord = couponRecordService.getById(activityId);
- sysCouponActivity.setCouponType(sysCouponRecord.getCouponType());
- sysCouponActivity.setCouponUseType(sysCouponRecord.getCouponUseType());
- sysCouponActivity.setMoney(sysCouponRecord.getMoney());
- sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
- sysCouponActivity.setInsertTime(new Date());
- sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(11);
- sysCouponActivity.setCompanyType(33);
- sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
- sysCouponActivityService.updateById(sysCouponActivity);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{sysCouponActivityId}")
- @ResponseBody
- public Object detail(@PathVariable("sysCouponActivityId") Integer sysCouponActivityId) {
- return sysCouponActivityService.getById(sysCouponActivityId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponRecordController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponRecordController.java
deleted file mode 100644
index c009a93..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysCouponRecordController.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.SysCouponRecord;
-import com.dsh.guns.modular.system.model.TAuditRecord;
-import com.dsh.guns.modular.system.service.ISysCouponRecordService;
-import com.dsh.guns.modular.system.service.ITAuditRecordService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-15 17:42:16
- */
-@Controller
-@RequestMapping("/sysCouponRecord")
-public class SysCouponRecordController extends BaseController {
-
- private String PREFIX = "/system/sysCouponRecord/";
-
- @Autowired
- private ISysCouponRecordService sysCouponRecordService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "sysCouponRecord.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/sysCouponRecord_add")
- public String sysCouponRecordAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "sysCouponRecord_add.html";
- }
- @RequestMapping("/sysCouponRecord_audit/{sysCouponRecordId}")
- public String sysCouponRecordAudit(Model model,@PathVariable Integer sysCouponRecordId) {
- model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("id",sysCouponRecordId);
- return PREFIX + "immediately.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/sysCouponRecord_update/{sysCouponRecordId}")
- public String sysCouponRecordUpdate(@PathVariable Integer sysCouponRecordId, Model model) {
- SysCouponRecord sysCouponRecord = sysCouponRecordService.getById(sysCouponRecordId);
- model.addAttribute("item",sysCouponRecord);
- LogObjectHolder.me().set(sysCouponRecord);
- return PREFIX + "sysCouponRecord_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,Integer couponUseType,Integer couponType,Integer yy) {
-
- Date startTimes = null;
- Date endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
- }
- Page<SysCouponRecord> page = new PageFactory<SysCouponRecord>().defaultPage();
-// Wrapper wrapper = new EntityWrapper<SysCouponRecord>();
- LambdaQueryWrapper<SysCouponRecord> wrapper = new LambdaQueryWrapper<>();
- if(SinataUtil.isNotEmpty(createTime)){
- wrapper.between(SysCouponRecord::getInsertTime,startTimes,endTimes);
- }
- if(SinataUtil.isNotEmpty(couponUseType)){
- wrapper.eq(SysCouponRecord::getCouponUseType,couponUseType);
- }
- if(SinataUtil.isNotEmpty(couponType)){
- wrapper.eq(SysCouponRecord::getCouponType,couponType);
- }
- if(SinataUtil.isNotEmpty(yy)){
- wrapper.eq(SysCouponRecord::getLanguage,yy);
- }
- if(UserExt.getUser().getObjectId()!=1){
- wrapper.eq(SysCouponRecord::getCompanyId,UserExt.getUser().getObjectId());
- }
-// wrapper.eq(SysCouponRecord::getCompanyId,ShiroKit.getUser().getObjectId());
-// wrapper.eq(SysCouponRecord::getCompanyType,ShiroKit.getUser().getRoleType());
- wrapper.orderByDesc(SysCouponRecord::getId);
- Page<SysCouponRecord> sysCouponRecordPage = sysCouponRecordService.getBaseMapper().selectPage(page, wrapper);
- List<SysCouponRecord> records = sysCouponRecordPage.getRecords();
- for (SysCouponRecord record : records) {
- TAuditRecord one = recordService.getOne(new LambdaQueryWrapper<TAuditRecord>().eq(TAuditRecord::getActivityId, record.getId()).eq(TAuditRecord::getActivityType, 6));
- if(one!=null){
-
- record.setRemark(one.getRemark());
- }
- }
- sysCouponRecordPage.setRecords(records);
- return super.packForBT(sysCouponRecordPage);
- }
- @RequestMapping(value = "/list1")
- @ResponseBody
- public Object list1(String createTime,Integer couponUseType,Integer couponType,Integer yy) {
-
- Date startTimes = null;
- Date endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
- }
- Page<SysCouponRecord> page = new PageFactory<SysCouponRecord>().defaultPage();
-// Wrapper wrapper = new EntityWrapper<SysCouponRecord>();
- LambdaQueryWrapper<SysCouponRecord> wrapper = new LambdaQueryWrapper<>();
- if(SinataUtil.isNotEmpty(createTime)){
- wrapper.between(SysCouponRecord::getInsertTime,startTimes,endTimes);
- }
- if(SinataUtil.isNotEmpty(couponUseType)){
- wrapper.eq(SysCouponRecord::getCouponUseType,couponUseType);
- }
- if(SinataUtil.isNotEmpty(couponType)){
- wrapper.eq(SysCouponRecord::getCouponType,couponType);
- }
- if(SinataUtil.isNotEmpty(yy)){
- wrapper.eq(SysCouponRecord::getLanguage,yy);
- }
- if(UserExt.getUser().getObjectId()!=1){
- wrapper.eq(SysCouponRecord::getCompanyId,UserExt.getUser().getObjectId());
- }
- wrapper.eq(SysCouponRecord::getStatus,2);
-// wrapper.eq(SysCouponRecord::getCompanyId,ShiroKit.getUser().getObjectId());
-// wrapper.eq(SysCouponRecord::getCompanyType,ShiroKit.getUser().getRoleType());
- wrapper.orderByDesc(SysCouponRecord::getId);
- Page<SysCouponRecord> sysCouponRecordPage = sysCouponRecordService.getBaseMapper().selectPage(page, wrapper);
- List<SysCouponRecord> records = sysCouponRecordPage.getRecords();
- for (SysCouponRecord record : records) {
- TAuditRecord one = recordService.getOne(new LambdaQueryWrapper<TAuditRecord>().eq(TAuditRecord::getActivityId, record.getId()).eq(TAuditRecord::getActivityType, 6));
- if(one!=null){
-
- record.setRemark(one.getRemark());
- }
- }
- sysCouponRecordPage.setRecords(records);
- return super.packForBT(sysCouponRecordPage);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(SysCouponRecord sysCouponRecord,Integer language) {
- sysCouponRecord.setInsertTime(new Date());
- sysCouponRecord.setLanguage(language);
- sysCouponRecord.setCompanyId(UserExt.getUser().getObjectId());
-// sysCouponRecord.setCompanyId(ShiroKit.getUser().getObjectId());
-// sysCouponRecord.setCompanyType(ShiroKit.getUser().getRoleType());
- sysCouponRecordService.save(sysCouponRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer sysCouponRecordId) {
- sysCouponRecordService.removeById(sysCouponRecordId);
- return SUCCESS_TIP;
- }
-
- @RequestMapping(value = "/audit")
- @ResponseBody
- public Object delete(@RequestParam Integer id,String remark,Integer state) {
- SysCouponRecord sysCouponRecord = sysCouponRecordService.getById(id);
- TAuditRecord tAuditRecord = new TAuditRecord();
- if(state==2){
- sysCouponRecord.setStatus(3);
- tAuditRecord.setAuditStatus(3);
- }else {
- sysCouponRecord.setStatus(2);
- tAuditRecord.setAuditStatus(2);
- }
- sysCouponRecordService.updateById(sysCouponRecord);
- tAuditRecord.setActivityId(id);
- tAuditRecord.setActivityName(sysCouponRecord.getName());
- tAuditRecord.setActivityType(6);
- tAuditRecord.setAuditTime(new Date());
- tAuditRecord.setAuditUserId(UserExt.getUser().getId());
- tAuditRecord.setRemark(remark);
- recordService.save(tAuditRecord);
- return SUCCESS_TIP;
- }
-
- @Autowired
- private ITAuditRecordService recordService;
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(SysCouponRecord sysCouponRecord,Integer language) {
- sysCouponRecord.setLanguage(language);
- sysCouponRecordService.updateById(sysCouponRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{sysCouponRecordId}")
- @ResponseBody
- public Object detail(@PathVariable("sysCouponRecordId") Integer sysCouponRecordId) {
- return sysCouponRecordService.getById(sysCouponRecordId);
- }
-}
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysRedPacketRecord1Controller.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysRedPacketRecord1Controller.java
deleted file mode 100644
index ccf8f33..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/SysRedPacketRecord1Controller.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.SysRedPacketRecord;
-import com.dsh.guns.modular.system.service.ISysRedPacketRecordService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-13 10:50:42
- */
-@Controller
-@RequestMapping("/sysRedPacketRecord")
-public class SysRedPacketRecord1Controller extends BaseController {
-
- private String PREFIX = "/system/sysRedPacketRecord/";
-
- @Autowired
- private ISysRedPacketRecordService sysRedPacketRecordService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "sysRedPacketRecord.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/sysRedPacketRecord_add")
- public String sysRedPacketRecordAdd() {
- return PREFIX + "sysRedPacketRecord_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/sysRedPacketRecord_update/{sysRedPacketRecordId}")
- public String sysRedPacketRecordUpdate(@PathVariable Integer sysRedPacketRecordId, Model model) {
- SysRedPacketRecord sysRedPacketRecord = sysRedPacketRecordService.getById(sysRedPacketRecordId);
- model.addAttribute("item",sysRedPacketRecord);
- LogObjectHolder.me().set(sysRedPacketRecord);
- return PREFIX + "sysRedPacketRecord_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime) {
- Date startTimes = null;
- Date endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
- }
- Page<SysRedPacketRecord> page = new PageFactory<SysRedPacketRecord>().defaultPage();
-// Wrapper wrapper = new EntityWrapper<SysRedPacketRecord>();
- LambdaQueryWrapper<SysRedPacketRecord> wrapper = new LambdaQueryWrapper<>();
- if(SinataUtil.isNotEmpty(createTime)){
- wrapper.between(SysRedPacketRecord::getInsertTime,startTimes,endTimes);
- }
- wrapper.eq(SysRedPacketRecord::getCompanyId, UserExt.getUser().getObjectId());
- wrapper.eq(SysRedPacketRecord::getCompanyType,UserExt.getUser().getRoleType());
- wrapper.orderByDesc(SysRedPacketRecord::getId);
- return super.packForBT(sysRedPacketRecordService.getBaseMapper().selectPage(page,wrapper));
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(SysRedPacketRecord sysRedPacketRecord) {
- sysRedPacketRecord.setInsertTime(new Date());
- sysRedPacketRecord.setCompanyId(UserExt.getUser().getObjectId());
- sysRedPacketRecord.setCompanyType(UserExt.getUser().getRoleType());
- sysRedPacketRecordService.save(sysRedPacketRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer sysRedPacketRecordId) {
- sysRedPacketRecordService.removeById(sysRedPacketRecordId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(SysRedPacketRecord sysRedPacketRecord) {
- sysRedPacketRecordService.updateById(sysRedPacketRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{sysRedPacketRecordId}")
- @ResponseBody
- public Object detail(@PathVariable("sysRedPacketRecordId") Integer sysRedPacketRecordId) {
- return sysRedPacketRecordService.getById(sysRedPacketRecordId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAdvertisementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAdvertisementController.java
deleted file mode 100644
index 2a57184..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAdvertisementController.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.BaseBean;
-import com.dsh.course.entity.OpenCity;
-import com.dsh.course.feignClient.activity.AdvertisementClient;
-import com.dsh.course.feignClient.activity.model.QueryAdvertisementReq;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.course.mapper.OpenCityMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TAdvertisement;
-import com.dsh.guns.modular.system.model.TOpenCity;
-import com.dsh.guns.modular.system.service.ITOpenCityService;
-import com.dsh.guns.modular.system.service.ITRegionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 广告设置控制器
- *
- * @author fengshuonan
- * @Date 2020-06-02 09:36:03
- */
-@Controller
-@RequestMapping("/tAdvertisement")
-public class TAdvertisementController extends BaseController {
-
- private String PREFIX = "/system/tAdvertisement/";
-
- @Autowired
- private AdvertisementClient advertisementClient;
-
- @Autowired
- private ITRegionService tRegionService;
-
- @Autowired
- private CityMapper cityMapper;
-
- @Autowired
- private OpenCityMapper openCityMapper;
-
- @Autowired
- private ITOpenCityService openCityService;
-
- /**
- * 跳转到广告设置首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tAdvertisement.html";
- }
-
- /**
- * 跳转到添加广告设置
- */
- @RequestMapping("/tAdvertisement_add")
- public String tAdvertisementAdd(Model model) {
-// List<City> list = cityMapper.selectList(new QueryWrapper<City>().eq("pid", 0));
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAdvertisement_add.html";
- }
-
- /**
- * 跳转到修改广告设置
- */
- @RequestMapping("/tAdvertisement_update/{tAdvertisementId}")
- public String tAdvertisementUpdate(@PathVariable Integer tAdvertisementId, Model model) {
- TAdvertisement tAdvertisement = advertisementClient.queryAdvertisementById(tAdvertisementId);
- model.addAttribute("item",tAdvertisement);
- LogObjectHolder.me().set(tAdvertisement);
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAdvertisement_edit.html";
- }
-
- /**
- * 获取广告设置列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String name,
- Integer type) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Integer language = UserExt.getLanguage();
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> advertisementList = advertisementClient.getAdvertisementList(new QueryAdvertisementReq(page, beginTime, endTime, type, name));
- for (Map<String, Object> map : advertisementList) {
- TOpenCity openCity = openCityService.getBaseMapper().selectById(Integer.valueOf(map.get("openCityId").toString()));
- if(null != openCity){
- map.put("openCityName", language == 1 ? openCity.getChineseName() : language == 2 ? openCity.getEnglishName() : openCity.getIndonesianName());
- }
- }
- page.setRecords(advertisementList);
- return super.packForBT(page);
- }
-
- /**
- * 新增广告设置
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TAdvertisement tAdvertisement,Integer cityId) {
- tAdvertisement.setInsertTime(new Date());
-// tAdvertisement.setInsertUser(ShiroKit.getUser().getId());
- tAdvertisement.setCityId(cityId);
- advertisementClient.saveAdvertisement(tAdvertisement);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除广告设置
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tAdvertisementId) {
- advertisementClient.deleteAdvertisementById(tAdvertisementId);
- return SUCCESS_TIP;
- }
-
- /**
- * 操作广告设置
- */
- @RequestMapping(value = "/opt")
- @ResponseBody
- public Object opt(@RequestParam Integer tAdvertisementId,@RequestParam Integer optType) {
- TAdvertisement tAdvertisement = advertisementClient.queryAdvertisementById(tAdvertisementId);
- if (SinataUtil.isNotEmpty(tAdvertisement)){
- if (1 == optType.intValue()){ //上线 online
- tAdvertisement.setState(1);
- }else if (2 == optType.intValue()){ //下线 off-line
- tAdvertisement.setState(2);
- }
- tAdvertisement.setUpdateTime(new Date());
-// tAdvertisement.setUpdateUser(ShiroKit.getUser().getId());
- advertisementClient.updateAdvertisementById(tAdvertisement);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 修改广告设置
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TAdvertisement tAdvertisement,Integer cityId) {
- tAdvertisement.setUpdateTime(new Date());
-// tAdvertisement.setUpdateUser(ShiroKit.getUser().getId());
- tAdvertisement.setCityId(cityId);
- advertisementClient.updateAdvertisementById(tAdvertisement);
- return SUCCESS_TIP;
- }
-
-
- @RequestMapping(value = "/change")
- @ResponseBody
- public Object change(Integer code) {
- List<OpenCity> openCities = openCityMapper.selectList(new LambdaQueryWrapper<OpenCity>().ne(BaseBean::getFlag,3).eq(OpenCity::getAreaId, code));
- return openCities;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAgreementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAgreementController.java
deleted file mode 100644
index d4c9a36..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAgreementController.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TAgreement;
-import com.dsh.guns.modular.system.service.ITAgreementService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-
-/**
- * 用户端协议管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-01 17:42:20
- */
-@Controller
-@RequestMapping("/tAgreement")
-public class TAgreementController extends BaseController {
-
- private String PREFIX = "/system/tAgreement/";
-
- @Autowired
- private ITAgreementService tAgreementService;
-
- /**
- * 跳转到用户端协议管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- //注册协议
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 6).eq("language",1));
- TAgreement five = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 6).eq("language",1));
-
-
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 6).eq("language",2));
- TAgreement five1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 6).eq("language",2));
- model.addAttribute("one1",one1);
- model.addAttribute("five1",five1);
-
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 6).eq("language",3));
- TAgreement five2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 6).eq("language",3));
- model.addAttribute("one2",one2);
- model.addAttribute("five2",five2);
- //用户协议
- TAgreement two = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 2).eq("language",1));
- TAgreement two1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 2).eq("language",2));
- TAgreement two2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 2).eq("language",3));
- model.addAttribute("two1",two1);
- model.addAttribute("two2",two2);
-
-
- TAgreement six = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 2));
- //隐私协议
- TAgreement three = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 1).eq("language",1));
- TAgreement seven = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 1).eq("language",1));
-
-
- TAgreement three1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 1).eq("language",2));
- TAgreement seven1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 1).eq("language",2));
-
- TAgreement three2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 1).eq("language",3));
- TAgreement seven2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 1).eq("language",3));
- model.addAttribute("three1",three1);
- model.addAttribute("seven1",seven1);
- model.addAttribute("three2",three2);
- model.addAttribute("seven2",seven2);
-
-
-
-
-
- TAgreement four = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 16));
- TAgreement eight = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 16).eq("language",1));
- TAgreement eight1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 16).eq("language",2));
- TAgreement eight2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 16).eq("language",3));
- model.addAttribute("eight1",eight1);
- model.addAttribute("eight2",eight2);
-
- TAgreement ten = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 1).eq("type", 17));
- TAgreement ten1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 17).eq("language",1));
- TAgreement ten2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 17).eq("language",2));
- TAgreement ten3 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 17).eq("language",3));
- model.addAttribute("ten2",ten2);
- model.addAttribute("ten3",ten3);
- model.addAttribute("one",one);
- model.addAttribute("two",two);
- model.addAttribute("three",three);
- model.addAttribute("four",four);
- model.addAttribute("five",five);
- model.addAttribute("six",six);
- model.addAttribute("seven",seven);
- model.addAttribute("eight",eight);
- model.addAttribute("ten",ten);
- model.addAttribute("ten1",ten1);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreement.html";
- }
-
- /**
- * 跳转到司机端协议管理首页
- */
- @RequestMapping("/driver")
- public String driverIndex(Model model) {
- //注册协议
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 6));
- //用户协议
- TAgreement two = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 2));
- //隐私协议
- TAgreement three = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("useType", 2).eq("type", 1));
- model.addAttribute("one",one);
- model.addAttribute("two",two);
- model.addAttribute("three",three);
-
- return PREFIX + "tAgreementDriver.html";
- }
-
- /**
- * 跳转到取消订单说明协议管理首页
- */
- @RequestMapping("/order")
- public String orderIndex(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 7).eq("language",1));
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 7).eq("language",2));
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 7).eq("language",3));
- model.addAttribute("one",one);
- model.addAttribute("one1",one1);
- model.addAttribute("one2",one2);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreementOrder.html";
- }
-
- /**
- * 跳转到用户指南设置协议管理首页
- */
- @RequestMapping("/user")
- public String userIndex(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 3).eq("language",1));
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 3).eq("language",2));
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 3).eq("language",3));
- model.addAttribute("one",one);
- model.addAttribute("one1",one1);
- model.addAttribute("one2",one2);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreementUser.html";
- }
-
- /**
- * 跳转到法律法规设置协议管理首页
- */
- @RequestMapping("/law")
- public String lawIndex(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 4).eq("language",1));
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 4).eq("language",2));
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 4).eq("language",3));
- model.addAttribute("one",one);
- model.addAttribute("one1",one1);
- model.addAttribute("one2",one2);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreementLaw.html";
- }
-
- /**
- * 跳转到关于我们设置协议管理首页
- */
- @RequestMapping("/me")
- public String meIndex(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 5).eq("language",1));
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 5).eq("language",2));
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 5).eq("language",3));
- model.addAttribute("one",one);
- model.addAttribute("one1",one1);
- model.addAttribute("one2",one2);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreementMe.html";
- }
-
- /**
- * 跳转到充值领券规则设置协议管理首页
- */
- @RequestMapping("/recharge")
- public String rechargeIndex(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 8).eq("language",1));
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 8).eq("language",2));
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 8).eq("language",3));
- model.addAttribute("one",one);
- model.addAttribute("one1",one1);
- model.addAttribute("one2",one2);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreementRecharge.html";
- }
-
- /**
- * 跳转到司机注册协议设置管理首页
- */
- @RequestMapping("/driverRegister")
- public String driverRegister(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 9));
- model.addAttribute("one",one);
- return PREFIX + "driverRegister.html";
- }
-
- @RequestMapping("/getTCFromType")
- @ResponseBody
- public Object getTCFromType(Integer type) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 15).eq("language",type));
- return one;
- }
-
- /**
- * 跳转到改派说明设置管理首页
- */
- @RequestMapping("/instructions")
- public String instructions(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 10));
- model.addAttribute("one",one);
- return PREFIX + "instructions.html";
- }
-
- /**
- * 跳转到跨城出行乘车须知
- */
- @RequestMapping("/corssHtml")
- public String corssHtml(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 11));
- model.addAttribute("one",one);
- return PREFIX + "corssHtml.html";
- }
-
-
- /**
- * 跳转到常见问题
- * @param model
- * @return
- */
- @RequestMapping("/showCommonProblem")
- public String showCommonProblem(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 12));
- model.addAttribute("one",one);
- return PREFIX + "commonProblem.html";
- }
-
-
- /**
- * 跳转到计价规则
- * @param model
- * @return
- */
- @RequestMapping("/showPricingRules")
- public String showPricingRules(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 13));
- model.addAttribute("one",one);
- return PREFIX + "pricingRules.html";
- }
-
-
- /**
- * 跳转到包车协议
- * @param model
- * @return
- */
- @RequestMapping("/showCharterCar")
- public String showCharterCar(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 14));
- model.addAttribute("one",one);
- return PREFIX + "tAgreementCharterCar.html";
- }
-
-
- /**
- * 跳转到小件物流协议
- * @param model
- * @return
- */
- @RequestMapping("/showSmallPieceLogistics")
- public String showSmallPieceLogistics(Model model) {
- TAgreement one = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 15).eq("language",1));
- TAgreement one1 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 15).eq("language",2));
- TAgreement one2 = tAgreementService.getOne(new QueryWrapper<TAgreement>().eq("type", 15).eq("language",3));
- model.addAttribute("one",one);
- model.addAttribute("one1",one1);
- model.addAttribute("one2",one2);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tAgreementSmallPieceLogistics.html";
- }
-
-
- /**
- * 修改协议
- */
- @RequestMapping(value = "/updateAppParam")
- @ResponseBody
- public Object updateAppParam(@RequestParam Integer id,@RequestParam String context) {
- TAgreement agreement = tAgreementService.getById(id);
- agreement.setContent(context);
- agreement.setUpdateTime(new Date());
- agreement.setUpdateUser(UserExt.getUser().getId());
- tAgreementService.updateById(agreement);
- return SUCCESS_TIP;
- }
-
- /**
- * 跳转到添加用户端协议管理
- */
- @RequestMapping("/tAgreement_add")
- public String tAgreementAdd() {
- return PREFIX + "tAgreement_add.html";
- }
-
- /**
- * 跳转到修改用户端协议管理
- */
- @RequestMapping("/tAgreement_update/{tAgreementId}")
- public String tAgreementUpdate(@PathVariable Integer tAgreementId, Model model) {
- TAgreement tAgreement = tAgreementService.getById(tAgreementId);
- model.addAttribute("item",tAgreement);
- LogObjectHolder.me().set(tAgreement);
- return PREFIX + "tAgreement_edit.html";
- }
-
- /**
- * 获取用户端协议管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return tAgreementService.list(null);
- }
-
- /**
- * 新增用户端协议管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TAgreement tAgreement) {
- tAgreementService.save(tAgreement);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除用户端协议管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tAgreementId) {
- tAgreementService.removeById(tAgreementId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改用户端协议管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TAgreement tAgreement) {
- tAgreementService.updateById(tAgreement);
- return SUCCESS_TIP;
- }
-
- /**
- * 用户端协议管理详情
- */
- @RequestMapping(value = "/detail/{tAgreementId}")
- @ResponseBody
- public Object detail(@PathVariable("tAgreementId") Integer tAgreementId) {
- return tAgreementService.getById(tAgreementId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAuditRecordController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAuditRecordController.java
deleted file mode 100644
index d96e730..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TAuditRecordController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TAuditRecord;
-import com.dsh.guns.modular.system.service.ITAuditRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2023-04-25 17:58:54
- */
-@Controller
-@RequestMapping("/tAuditRecord")
-public class TAuditRecordController extends BaseController {
-
- private String PREFIX = "/system/tAuditRecord/";
-
- @Autowired
- private ITAuditRecordService tAuditRecordService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tAuditRecord.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tAuditRecord_add")
- public String tAuditRecordAdd() {
- return PREFIX + "tAuditRecord_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tAuditRecord_update/{tAuditRecordId}")
- public String tAuditRecordUpdate(@PathVariable Integer tAuditRecordId, Model model) {
- TAuditRecord tAuditRecord = tAuditRecordService.getById(tAuditRecordId);
- model.addAttribute("item",tAuditRecord);
- LogObjectHolder.me().set(tAuditRecord);
- return PREFIX + "tAuditRecord_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return tAuditRecordService.list(null);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TAuditRecord tAuditRecord) {
- tAuditRecordService.save(tAuditRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tAuditRecordId) {
- tAuditRecordService.removeById(tAuditRecordId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TAuditRecord tAuditRecord) {
- tAuditRecordService.updateById(tAuditRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tAuditRecordId}")
- @ResponseBody
- public Object detail(@PathVariable("tAuditRecordId") Integer tAuditRecordId) {
- return tAuditRecordService.getById(tAuditRecordId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarBrandController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarBrandController.java
deleted file mode 100644
index 6b7face..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarBrandController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.TCarBrand;
-import com.dsh.guns.modular.system.service.ITCarBrandService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 车辆品牌管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-05 13:52:25
- */
-@Controller
-@RequestMapping("/tCarBrand")
-public class TCarBrandController extends BaseController {
-
- private String PREFIX = "/system/tCarBrand/";
-
- @Autowired
- private ITCarBrandService tCarBrandService;
-
- /**
- * 跳转到车辆品牌管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tCarBrand.html";
- }
-
- /**
- * 跳转到添加车辆品牌管理
- */
- @RequestMapping("/tCarBrand_add")
- public String tCarBrandAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCarBrand_add.html";
- }
-
- /**
- * 跳转到修改车辆品牌管理
- */
- @RequestMapping("/tCarBrand_update/{tCarBrandId}")
- public String tCarBrandUpdate(@PathVariable Integer tCarBrandId, Model model) {
- TCarBrand tCarBrand = tCarBrandService.getById(tCarBrandId);
- model.addAttribute("item",tCarBrand);
- LogObjectHolder.me().set(tCarBrand);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCarBrand_edit.html";
- }
-
- /**
- * 获取车辆品牌管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,
- String name,Integer yy) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> carBrandList = tCarBrandService.getCarBrandList(page, beginTime, endTime, name, yy);
-
- if(ToolUtil.isEmpty(yy)){
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (Map<String, Object> stringObjectMap : carBrandList) {
- stringObjectMap.put("name",stringObjectMap.get("ename"));
- }
- }else if(language==3){
- for (Map<String, Object> stringObjectMap : carBrandList) {
- stringObjectMap.put("name",stringObjectMap.get("yname"));
- }
- }
- }else {
- if(yy==2){
- for (Map<String, Object> stringObjectMap : carBrandList) {
- stringObjectMap.put("name",stringObjectMap.get("ename"));
- }
- }else if(yy==3){
- for (Map<String, Object> stringObjectMap : carBrandList) {
- stringObjectMap.put("name",stringObjectMap.get("yname"));
- }
- }
- }
- page.setRecords(carBrandList);
- return super.packForBT(page);
- }
-
- /**
- * 新增车辆品牌管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TCarBrand tCarBrand,Integer language) {
- tCarBrand.setInsertTime(new Date());
- tCarBrand.setState(1);
- tCarBrand.setLanguage(language);
- tCarBrandService.save(tCarBrand);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除车辆品牌管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tCarBrandId) {
- TCarBrand tCarBrand = tCarBrandService.getById(tCarBrandId);
- tCarBrand.setState(2);
- tCarBrandService.updateById(tCarBrand);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改车辆品牌管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TCarBrand tCarBrand,Integer language) {
- tCarBrand.setLanguage(language);
- tCarBrandService.updateById(tCarBrand);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarController.java
deleted file mode 100644
index af1767e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarController.java
+++ /dev/null
@@ -1,1498 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.model.CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq;
-import com.dsh.course.feignClient.account.model.CompanyQueryTypeAndFlgAndNameReq;
-import com.dsh.course.feignClient.account.model.CompanyQueryTypeAndFlgReq;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.DriverClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.activity.model.CompanyQueryReq;
-import com.dsh.course.feignClient.activity.model.TDriverReq;
-import com.dsh.course.mapper.CarInsuranceMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.ErrorTip;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import com.dsh.guns.modular.system.util.DateUtil;
-import com.dsh.guns.modular.system.util.ExcelExportUtil;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.dsh.guns.core.util.WoUtil;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 车辆管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-05 17:25:12
- */
-@Controller
-@RequestMapping("/tCar")
-public class TCarController extends BaseController {
-
- private String PREFIX = "/system/tCar/";
-
- @Autowired
- private ITCarService tCarService;
-
-// @Autowired
-// private ITCompanyService tCompanyService;
-
- @Autowired
- private ITCarServiceService tCarServiceService;
-
-// @Autowired
-// private ITDriverLineService tDriverLineService;
-
- @Autowired
- private ITCarBrandService tCarBrandService;
-
- @Autowired
- private ITCarModelService tCarModelService;
-
- @Autowired
- private ITCarServiceService itCarServiceService;
-
- @Autowired
- private ITServerCarmodelService itServerCarmodelService;
-
-// @Autowired
-// private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Resource
- private CarInsuranceMapper carInsuranceMapper;
-
- @Autowired
- private CompanyClient companyClient;
- @Autowired
- private DriverClient driverClient;
-
-
- /**
- * 跳转到车辆管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCar.html";
- }
-
- /**
- * 跳转到添加车辆管理
- */
- @RequestMapping("/tCar_add")
- public String tCarAdd(Model model) {
- List<CompanyInfoRes> companyList = companyClient.queryByTypeCompany(2);
- model.addAttribute("companyList",companyList);
- User user = UserExt.getUser();
- Integer roleType = user.getRoleType();
- model.addAttribute("roleType",roleType);
- if (2 == roleType){
-// List<TCompany> franchiseeList = companyClient.queryByTypeCompany(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",11));
- List<CompanyInfoRes> companyInfoRes = companyClient.queryByListCompany(new CompanyQueryReq(3, user.getObjectId()));
- model.addAttribute("franchiseeList",companyInfoRes);
- }else{
- model.addAttribute("franchiseeList",null);
- }
- //查询当前用户所属分公司/加盟商
-
- model.addAttribute("objectName",companyClient.queryById(UserExt.getUser().getObjectId()).getName());
-
- //车辆品牌 car brand
- List<TCarBrand> brandList = tCarBrandService.list(new QueryWrapper<TCarBrand>().eq("state", 1));
- model.addAttribute("brandList",brandList);
- //车辆类型
- /*List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("state", 1));
- model.addAttribute("modelList",modelList);*/
-
- List<TServerCarmodel> zcModelList = itServerCarmodelService.list(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- model.addAttribute("zcModelList",zcModelList);
- List<TServerCarmodel> kcModelList = itServerCarmodelService.list(new QueryWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
- model.addAttribute("kcModelList",kcModelList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCar_add.html";
- }
-
- /**
- * 查询车辆类型
- * @param carBrandId
- * @return
- */
- @RequestMapping(value = "/brandChange")
- @ResponseBody
- public Object brandChange(@RequestParam Integer carBrandId) {
- List<TCarModel> list = new ArrayList<>();
- if (SinataUtil.isNotEmpty(carBrandId)){
- list = tCarModelService.list(new QueryWrapper<TCarModel>().eq("state",1).eq("brandId", carBrandId));
- }
- return list;
- }
-
- /**
- * 跳转到修改车辆管理
- */
- @RequestMapping("/tCar_update/{tCarId}")
- public String tCarUpdate(@PathVariable Integer tCarId, Model model) {
- TCar tCar = tCarService.getById(tCarId);
- model.addAttribute("item",tCar);
- LogObjectHolder.me().set(tCar);
- User user = UserExt.getUser();
- Integer roleType = user.getRoleType();
- model.addAttribute("roleType",roleType);
- model.addAttribute("objectName",companyClient.queryById(user.getObjectId()).getName());
-
- if (1 == roleType){
-// List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
- List<CompanyInfoRes> companyInfoRes = companyClient.queryByTypeCompany(2);
- model.addAttribute("companyList",companyInfoRes);
-// List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tCar.getCompanyId()));
- List<CompanyInfoRes> companyInfoRes1 = companyClient.queryByListCompany(new CompanyQueryReq(3, tCar.getCompanyId()));
- model.addAttribute("franchiseeList",companyInfoRes1);
- }else if (2 == roleType){
-// List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",11));
- List<CompanyInfoRes> companyInfoRes1 = companyClient.queryByListCompany(new CompanyQueryReq(3, user.getObjectId()));
- model.addAttribute("franchiseeList",companyInfoRes1);
- }
-
- //查询平台ID
-// TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
- CompanyInfoRes company = companyClient.queryByTypeCompany(1).get(0);
- //判断是平台司机还是加盟司机
- if ((SinataUtil.isEmpty(tCar.getCompanyId()) || tCar.getCompanyId() == 0 || tCar.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tCar.getFranchiseeId()) || tCar.getFranchiseeId() == 0)){
- model.addAttribute("companyType",1);
- }else{
- model.addAttribute("companyType",2);
- }
-
- //获取经营业务
- List<TCarService> serviceList = tCarServiceService.list(new QueryWrapper<TCarService>().eq("carId", tCar.getId()));
- Integer one = 1;
- Integer two = 1;
- Integer three = 1;
- Integer four = 1;
- Integer five = 1;
- Integer six = 1;
- Integer zcModel = 0;
- Integer kcModel = 0;
- for (TCarService obj : serviceList){
- if (obj.getType() == 1){
- one = 2;
- zcModel = obj.getServerCarModelId();
- }
- if (obj.getType() == 2){
- two = 2;
- }
- if (obj.getType() == 3){
- three = 2;
- kcModel = obj.getServerCarModelId();
- }
- if (obj.getType() == 4){
- four = 2;
- }
- if (obj.getType() == 5){
- five = 2;
- }
- if (obj.getType() == 6){
- six = 2;
- }
- }
- model.addAttribute("one",one);
- model.addAttribute("two",two);
- model.addAttribute("three",three);
- model.addAttribute("four",four);
- model.addAttribute("five",five);
- model.addAttribute("six",six);
- model.addAttribute("zcModel",zcModel);
- model.addAttribute("kcModel",kcModel);
-
- List<TServerCarmodel> zcModelList = itServerCarmodelService.list(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- model.addAttribute("zcModelList",zcModelList);
- List<TServerCarmodel> kcModelList = itServerCarmodelService.list(new QueryWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
- model.addAttribute("kcModelList",kcModelList);
-
- //车辆品牌 car brand
- List<TCarBrand> brandList = tCarBrandService.list(new QueryWrapper<TCarBrand>().eq("state", 1));
- model.addAttribute("brandList",brandList);
- //车辆类型
- List<TCarModel> modelList = tCarModelService.list(new QueryWrapper<TCarModel>().eq("brandId",tCar.getCarBrandId()).eq("state", 1));
- model.addAttribute("modelList",modelList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCar_edit.html";
- }
-
-
- /**
- * 跳转到保险列表页
- * @param carId
- * @param model
- * @return
- */
- @RequestMapping("/carInsurance")
- public String carInsurance(Integer carId, Model model){
- model.addAttribute("carId", carId);
- return PREFIX + "carInsurance.html";
- }
-
- /**
- * 跳转到添加页面
- * @param carId
- * @param model
- * @return
- */
- @RequestMapping("/showAddCarInsurance")
- public String showAddCarInsurance(Integer carId, Model model){
- model.addAttribute("carId", carId);
- model.addAttribute("id", "");
- return PREFIX + "carInsuranceInfo.html";
- }
-
- /**
- * 跳转到编辑页
- * @param id
- * @param carId
- * @param model
- * @return
- */
- @RequestMapping("/showEditCarInsurance")
- public String showEditCarInsurance(Integer id, Integer carId, Model model){
- model.addAttribute("carId", carId);
- model.addAttribute("id", id);
- return PREFIX + "carInsuranceInfo.html";
- }
-
- /**
- * 添加保险数据
- * @param carInsurance
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/saveCarInsurance", method = RequestMethod.POST)
- public ResultUtil saveCarInsurance(CarInsurance carInsurance){
- if(carInsurance.getId() == null){
- carInsuranceMapper.insert(carInsurance);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoVehicleInsurance(carInsurance.getId(), 1);
-// }
-// }
-// }).start();
- }else{
- carInsuranceMapper.updateById(carInsurance);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoVehicleInsurance(carInsurance.getId(), 2);
-// }
-// }
-// }).start();
- }
-
- return ResultUtil.success();
- }
-
- /**
- * 获取保险详情
- * @param id
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/queryCarInsurance", method = RequestMethod.POST)
- public ResultUtil queryCarInsurance(Integer id){
- CarInsurance carInsurance = carInsuranceMapper.selectById(id);
- return ResultUtil.success(carInsurance);
- }
-
-
- /**
- * 获取保险列表
- * @param carId
- * @param offset
- * @param limit
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/queryInsuranceList", method = RequestMethod.POST)
- public Object queryInsuranceList(Integer carId, Integer offset,Integer limit){
- try {
- Map<String, Object> map = new HashMap<>();
- List<Map<String, Object>> list = carInsuranceMapper.queryInsuranceList(carId, offset, limit);
- int i = carInsuranceMapper.queryInsuranceListCount(carId);
- map.put("rows", list);
- map.put("total", i);
- return map;
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- }
-
- /**
- * 删除保险
- * @param id
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/delCarInsurance", method = RequestMethod.POST)
- public ResultUtil delCarInsurance(Integer id){
- carInsuranceMapper.deleteById(id);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoVehicleInsurance(id, 3);
-// }
-// }
-// }).start();
- return ResultUtil.success();
- }
-
-
- /**
- * 获取车辆管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,
- String id,
- String brandName,
- String modelName,
- String carColor,
- String serverStr,
- String carLicensePlate,
- String driverName,
- String companyName,
- String franchiseeName) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tCarService.getCarList(page,UserExt.getUser().getRoleType(),UserExt.getUser().getObjectId(),beginTime,endTime,id,brandName,modelName,carColor,serverStr,carLicensePlate,driverName,companyName,franchiseeName));
- return super.packForBT(page);
- }
-
- /**
- * 新增车辆管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add( TCar tCar, String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
- TCar tCar1 = tCarService.getBaseMapper().selectOne(new QueryWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate()).eq("state", 1));
- if(null != tCar1){
- return ResultUtil.error(UserExt.getLanguage() == 1 ? "车牌号重复" : UserExt.getLanguage() == 2 ? "Duplicate license plate" : "Kode kendaraan diulangi.");
- }
-
- if (1 == roleType){ //平台 platfrom
- if (2 == companyType.intValue()){
- if (SinataUtil.isNotEmpty(oneId)){
- tCar.setCompanyId(oneId);
- }
- if (SinataUtil.isNotEmpty(twoId)){
- tCar.setFranchiseeId(twoId);
- }
- }else if (1 == companyType.intValue()){
-// TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
- CompanyInfoRes company = companyClient.queryByTypeCompany(1).get(0);
- tCar.setCompanyId(company.getId());
- tCar.setFranchiseeId(0);
- }
- tCar.setAddType(2);
- tCar.setIsPlatCar(1);
- }else if (2 == roleType){ //分公司 sub company
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tCar.setCompanyId(UserExt.getUser().getObjectId());
- }
- if (SinataUtil.isNotEmpty(franchiseeId)){
- tCar.setFranchiseeId(franchiseeId);
- }
- tCar.setIsPlatCar(2);
- tCar.setAddType(3);
- tCar.setAddObjectId(UserExt.getUser().getObjectId());
- }else if (3 == roleType){ //加盟商 Franchisee.
- CompanyInfoRes tCompany = companyClient.queryById(UserExt.getUser().getObjectId());
- if (SinataUtil.isNotEmpty(tCompany)){
- tCar.setCompanyId(tCompany.getSuperiorId());
- }
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tCar.setFranchiseeId(UserExt.getUser().getObjectId());
- }
- tCar.setIsPlatCar(2);
- tCar.setAddType(4);
- tCar.setAddObjectId(UserExt.getUser().getObjectId());
- }
- tCar.setInsertTime(new Date());
- tCar.setState(1);
- tCarService.save(tCar);
-
- //添加经营业务 Add business operations.
- String[] serverArray = serverBox.split(",");
- for (int i=0;i<serverArray.length;i++){
- TCarService service = new TCarService();
- service.setCarId(tCar.getId());
- service.setType(Integer.valueOf(serverArray[i]));
- if (1 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(zcModel));
- }else if (3 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(kcModel));
- }
- tCarServiceService.save(service);
- }
-
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoCompanyStat();
-// pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
-// }
-// }
-// }).start();
- return ResultUtil.success();
- }
-
- /**
- * 删除车辆管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tCarId) {
- TCar tCar = tCarService.getById(tCarId);
- tCar.setState(2);
- tCarService.updateById(tCar);
-
- //清除相对应的司机关联车辆ID Remove the corresponding driver-associated vehicle ID.
- List<TDriverReq> list = driverClient.queryDriverListByCarId(tCarId);
- for (TDriverReq obj : list){
- obj.setCarId(null);
- driverClient.updateById(obj);
- }
-
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoCompanyStat();
-// pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
-// }
-// }
-// }).start();
- return SUCCESS_TIP;
- }
-
- /**
- * 修改车辆管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
- TCar tCar1 = tCarService.getBaseMapper().selectOne(new QueryWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate()).eq("state", 1));
- if(null != tCar1 && tCar1.getId().compareTo(tCar.getId()) != 0){
- return ResultUtil.error(UserExt.getLanguage() == 1 ? "车牌号重复" : UserExt.getLanguage() == 2 ? "Duplicate license plate" : "Kode kendaraan diulangi.");
- }
- if (1 == roleType){ //平台 platfrom
- if (2 == companyType.intValue()){
- if (SinataUtil.isNotEmpty(oneId)){
- tCar.setCompanyId(oneId);
- }
- if (SinataUtil.isNotEmpty(twoId)){
- tCar.setFranchiseeId(twoId);
- }
- }else if (1 == companyType.intValue()){
-// TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
- CompanyInfoRes company = companyClient.queryByTypeCompany(1).get(0);
- tCar.setCompanyId(company.getId());
- tCar.setFranchiseeId(0);
- }
- }else if (2 == roleType){ //分公司 sub company
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tCar.setCompanyId(UserExt.getUser().getObjectId());
- }
- if (SinataUtil.isNotEmpty(franchiseeId)){
- tCar.setFranchiseeId(franchiseeId);
- }
- }else if (3 == roleType){ //加盟商 Franchisee
- CompanyInfoRes tCompany = companyClient.queryById(UserExt.getUser().getObjectId());
- if (SinataUtil.isNotEmpty(tCompany)){
- tCar.setCompanyId(tCompany.getSuperiorId());
- }
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tCar.setFranchiseeId(UserExt.getUser().getObjectId());
- }
- }
-
- //删除业务 Delete business
- tCarServiceService.remove(new QueryWrapper<TCarService>().eq("carId",tCar.getId()));
-
- //添加经营业务 add business
- String[] serverArray = serverBox.split(",");
- for (int i=0;i<serverArray.length;i++){
- TCarService service = new TCarService();
- service.setCarId(tCar.getId());
- service.setType(Integer.valueOf(serverArray[i]));
- if (1 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(zcModel));
- }else if (3 == service.getType()){
- service.setServerCarModelId(Integer.valueOf(kcModel));
- }
- tCarServiceService.save(service);
- }
-
- tCarService.updateById(tCar);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){
-// pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
-// }
-// }
-// }).start();
- return ResultUtil.success();
- }
-
- /**
- * 车辆管理详情
- */
- @RequestMapping(value = "/detail/{tCarId}")
- @ResponseBody
- public Object detail(@PathVariable("tCarId") Integer tCarId) {
- return tCarService.getById(tCarId);
- }
-
- /**
- * 下载模板
- * @param request
- * @param response
- */
- @RequestMapping(value = "/uploadCarModel")
- public void uploadCarModel(HttpServletRequest request, HttpServletResponse response) {
- // 表格数据【封装】 Table datas
- List<List<String>> dataList = new ArrayList<List<String>>();
- Integer language = UserExt.getLanguage();
- if(language==1){
- // 首行【封装】 first line
- List<String> shellList = new ArrayList<String>();
- shellList.add("所属机构[平台车辆/加盟车辆]");
- shellList.add("所属分公司[提示:加盟车辆选填]");
- shellList.add("所属加盟商[提示:加盟车辆选填]");
- shellList.add("服务模式:摩托车车[是/否]");
- shellList.add("服务模式:同城快送[是/否]");
- shellList.add("车辆品牌");
- shellList.add("车辆类型");
- shellList.add("车辆颜色[1(黑色)/2(银色)/3(白色)/4(红色)/5(黄色)/6(橙色)/7(蓝色)]");
- shellList.add("车牌号");
- shellList.add("行驶证编号");
- shellList.add("年检到期时间[例如 2020-02-02]");
- shellList.add("商业保险到期时间[例如 2020-02-02]");
- dataList.add(shellList);
-
- try {
- // 调用工具类进行导出 Invoke the utility class to carry out data export.
- ExcelExportUtil.easySheet("平台导入车辆模板"+DateUtil.format(new Date(), "YYYYMMddHHmmss"), "平台导入车辆模板", dataList, request, response);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }else if(language==2){
- // 首行【封装】 first line
- List<String> shellList = new ArrayList<String>();
- shellList.add("Affiliated Organization [Platform Vehicle/Franchised Vehicle]");
- shellList.add("Affiliated branch [Tip: Select for franchised vehicle]");
- shellList.add("Franchisee [Tip: Select Franchised vehicle]");
- shellList.add("Service mode: Motorcycle [Yes/No]");
- shellList.add("Service mode: intra-city express [Yes/No]");
- shellList.add("Vehicle brand");
- shellList.add("Vehicle type");
- shellList.add("Vehicle color [1(Black)/2(Silver)/3(white)/4(red)/5(yellow)/6(orange)/7(Blue)]");
- shellList.add("License plate number");
- shellList.add("License number");
- shellList.add("Annual inspection expiration time [e.g. 2020-02-02]");
- shellList.add("Commercial Insurance Expiration Time [e.g. 2020-02-02]");
- dataList.add(shellList);
-
- try {
- // 调用工具类进行导出 Invoke the utility class to carry out data export.
- ExcelExportUtil.easySheet("Platform import vehicle template"+DateUtil.format(new Date(), "YYYYMMddHHmmss"), "Platform import vehicle template", dataList, request, response);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }else {
- // 首行【封装】 first line
- List<String> shellList = new ArrayList<String>();
- shellList.add("Organisasi Berkait [Platform Vehicle/Franchised Vehicle]");
- shellList.add("Branch terkait [Tip: Pilih untuk kendaraan terkait]");
- shellList.add("Franchisee [Tip: Pilih kendaraan Franchised]");
- shellList.add("Mod layanan: Motosikal [Ya/Tidak]");
- shellList.add("Modus layanan: ekspres intra-kota [Ya/Tidak]");
- shellList.add("Tanda kendaraan");
- shellList.add("Jenis kendaraan");
- shellList.add("Warna kendaraan [1(Hitam)/2(Perak)/3(putih)/4(merah)/5(kuning)/6(oranye)/7(Biru)]");
- shellList.add("Nomor plat lisensi");
- shellList.add("Nomor lisensi");
- shellList.add("Waktu penggantian inspeksi tahunan [contohnya 2020-02-02]");
- shellList.add("Waktu Expiration Insurance Commercial [contohnya 2020-02-02]");
- dataList.add(shellList);
-
- try {
- // 调用工具类进行导出 Invoke the utility class to carry out data export.
- ExcelExportUtil.easySheet("templat kendaraan import platform"+DateUtil.format(new Date(), "YYYYMMddHHmmss"), "templat kendaraan import platform", dataList, request, response);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- }
-
-
- /**
- * 导入操作
- * @param request
- * @return
- */
- @RequestMapping(value="/exportCar",method = RequestMethod.POST)
- @ResponseBody
- public Object exportCar(HttpServletRequest request){
- Integer language = UserExt.getLanguage();
- if(language==1) {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
- try {
- //定时五秒后执行 Execute after five seconds on schedule.
- /*Map<String,Object> maps=new HashMap<>();
- Workbook book = WoUtil.ImportFile(file);
- maps.put("book",book);
- QuartzManager.addJob(AddContract.class, (AddContract.name+new Date().getTime()).toUpperCase(), TimeJobType.ADMIN,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);*/
-
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表 get first table
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //所属机构[平台车辆/加盟车辆] Affiliated Organization [Platform Vehicles/Franchise Vehicles]
- String zero = null;
- if (SinataUtil.isNotEmpty(cell0)) {
- zero = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell1 = row.getCell(1); //所属分公司[提示:加盟车辆选填] Affiliated branch company [Note: Franchise vehicles are optional].
- String one = null;
-
- if (SinataUtil.isNotEmpty(cell1)) {
- cell1.setCellType(Cell.CELL_TYPE_STRING);
- one = String.valueOf(cell1.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(2); //所属加盟商[提示:加盟车辆选填] Affiliated Franchise [Note: Franchise vehicles are optional].
- String two = null;
- if (SinataUtil.isNotEmpty(cell2)) {
- two = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(3); //服务模式:专车[是/否] Business mode: dedicated vehicle [yes/no]
- String three = null;
- if (SinataUtil.isNotEmpty(cell3)) {
- three = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(4); //服务模式:出租车[是/否] Business mode: taxi [yes/no]
- String four = null;
- if (SinataUtil.isNotEmpty(cell4)) {
- four = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(5); //服务模式:跨城出行[是/否] Business mode: cross-city [yes/no]
- String five = null;
- if (SinataUtil.isNotEmpty(cell5)) {
- five = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(6); //服务模式:小件跨城物流[是/否] Business mode: small-scale logistics [yes/no]
- String six = null;
- if (SinataUtil.isNotEmpty(cell6)) {
- six = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
- Cell cell7 = row.getCell(7); //服务模式:小件跨城物流[是/否] Business mode: small-scale logistics [yes/no]
- String seven = null;
- if (SinataUtil.isNotEmpty(cell7)) {
- seven = String.valueOf(cell7.getStringCellValue()).trim();
- }
-
- Cell cell8 = row.getCell(8); //服务模式:包车[是/否] Service mode: Chartered service [Yes/No]
- cell8.setCellType(Cell.CELL_TYPE_STRING);
- String eight = null;
- if (SinataUtil.isNotEmpty(cell8)) {
- eight = String.valueOf(cell8.getStringCellValue()).trim();
- }
-
- Cell cell9 = row.getCell(9); //车辆品牌 car brand
- cell9.setCellType(Cell.CELL_TYPE_STRING);
- String nine = null;
- if (SinataUtil.isNotEmpty(cell9)) {
- nine = String.valueOf(cell9.getStringCellValue()).trim();
- }
-
- Cell cell10 = row.getCell(10); //车辆类型 car type
- cell10.setCellType(Cell.CELL_TYPE_STRING);
-
- String ten = null;
- if (SinataUtil.isNotEmpty(cell10)) {
- ten = String.valueOf(cell10.getStringCellValue()).trim();
- }
-
- Cell cell11 = row.getCell(11); //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色] Vehicle color options include black, silver, white, red, yellow, orange, and blue.
- cell11.setCellType(Cell.CELL_TYPE_STRING);
- String eleven = null;
- if (SinataUtil.isNotEmpty(cell11)) {
- eleven = String.valueOf(cell11.getStringCellValue()).trim();
- }
-
-
- if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(seven)
- || SinataUtil.isEmpty(eight) || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(eleven)) {
- return new ErrorTip(500, "单元格不能为空");
- } else {
- //判断所属机构 Determine the affiliated organization.
- if (!zero.equals("平台车辆") && !zero.equals("加盟车辆")) {
- return new ErrorTip(500, "所属机构内容不正确");
- }
- //判断服务模式【专车】 Assessing the Service Mode "Private Car
- if (!three.equals("是") && !three.equals("否")) {
- return new ErrorTip(500, "服务模式【摩托车】内容不正确");
- }
- //判断服务模式【出租车】Assessing the Service Mode "taxi Car
- if (!four.equals("是") && !four.equals("否")) {
- return new ErrorTip(500, "服务模式【同城快送】内容不正确");
- }
- //判断车辆颜色Assessing the car colors
- if (!seven.equals("1") && !seven.equals("2") && !seven.equals("3") && !seven.equals("4") && !seven.equals("5") && !seven.equals("6") && !seven.equals("7")) {
- return new ErrorTip(500, "车辆颜色内容不正确");
- }
- //判断年检到期时间格式是否正确 Verify if the format of the expiration date for inspection is correct.
- try {
- if (!isValidDate(ten)) {
- ten = importByExcelForDate(ten);
- }
- } catch (Exception e) {
- return new ErrorTip(500, "年检到期时间格式不正确");
- }
- //判断商业保险到期时间格式是否正确 Check whether the expiration date format of the commercial insurance is correct.
- try {
- if (!isValidDate(eleven)) {
- eleven = importByExcelForDate(eleven);
- }
- } catch (Exception e) {
- return new ErrorTip(500, "商业保险到期时间格式不正确");
- }
-
- //查找平台公司 Search for platform companies
-// TCompany platCompany = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes platCompany = companyClient.queryByTypeAndFlg(new CompanyQueryTypeAndFlgReq(1, 3));
- Integer companyId = platCompany.getId();
- Integer franchiseeId = 0;
- if ("加盟车辆".equals(zero)) {
- //判断所属分公司是否存在 Check if the subsidiary company exists
- if (SinataUtil.isNotEmpty(one)) {
-// TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("name", one).eq("type", 2).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes company = companyClient.queryByTypeAndFlgAndName(new CompanyQueryTypeAndFlgAndNameReq(2, 3, one));
- if (SinataUtil.isNotEmpty(company)) {
- companyId = company.getId();
- //判断加盟商是否存在 Assessing the existence of a franchisee
- if (SinataUtil.isNotEmpty(two)) {
-// TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",company.getId()).eq("name", two).eq("type", 3).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes franchisee = companyClient.queryBySuperiorIdAndTypeAndFlgAndName(new CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq(3, 3, two, company.getId()));
- if (SinataUtil.isNotEmpty(franchisee)) {
- franchiseeId = franchisee.getId();
- }
- }
- }
- }
- }
-
- Integer carBrandId = null;
- Integer carModelId = null;
- //查找品牌 search brand
- if (SinataUtil.isNotEmpty(five)) {
- TCarBrand carBrand = tCarBrandService.getOne(new QueryWrapper<TCarBrand>().eq("name", five).eq("state", 1).last(" limit 1"));
- if (SinataUtil.isNotEmpty(carBrand)) {
- carBrandId = carBrand.getId();
- if (SinataUtil.isNotEmpty(six)) {
- //查找类型 search type
- TCarModel carModel = tCarModelService.getOne(new QueryWrapper<TCarModel>().eq("brandId", carBrand.getId()).eq("name", six).eq("state", 1).last(" limit 1"));
- if (SinataUtil.isNotEmpty(carModel)) {
- carModelId = carModel.getId();
- }
- }
- }
- }
-
- //添加车辆对象 add vechcle obj
- TCar car = new TCar();
- if ("平台车辆".equals(zero)) {
- car.setIsPlatCar(1);
- } else if ("加盟车辆".equals(zero)) {
- car.setIsPlatCar(2);
- }
- car.setCompanyId(companyId);
- car.setFranchiseeId(franchiseeId);
- car.setCarColor(seven);
- car.setCarBrandId(carBrandId);
- car.setCarModelId(carModelId);
- car.setCarLicensePlate(eight);
- car.setDrivingLicenseNumber(nine);
- car.setAnnualInspectionTime(DateUtil.parseDate(ten));
- car.setCommercialInsuranceTime(DateUtil.parseDate(eleven));
- car.setInsertTime(new Date());
- car.setState(1);
- if (UserExt.getUser().getRoleType() == 1) {
- car.setAddType(2);
- } else if (UserExt.getUser().getRoleType() == 2) {
- car.setAddType(3);
- car.setAddObjectId(UserExt.getUser().getObjectId());
- } else if (UserExt.getUser().getRoleType() == 3) {
- car.setAddType(4);
- car.setAddObjectId(UserExt.getUser().getObjectId());
- }
- tCarService.save(car);
-
- //添加专车服务模式 add special car service
- if ("是".equals(three)) {
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(1);
- tCarServiceService.save(service);
- }
- //添加小件同城物流服务模式 add small-scale local-city service model
- if ("是".equals(four)) {
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(4);
- tCarServiceService.save(service);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return SUCCESS_TIP;
- }else if(language==2){
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
- try {
- //定时五秒后执行 execute after 5s on schedule
- /*Map<String,Object> maps=new HashMap<>();
- Workbook book = WoUtil.ImportFile(file);
- maps.put("book",book);
- QuartzManager.addJob(AddContract.class, (AddContract.name+new Date().getTime()).toUpperCase(), TimeJobType.ADMIN,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);*/
-
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表 get first table
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //所属机构[平台车辆/加盟车辆] Affiliated Organization [Platform Vehicles/Franchise Vehicles]
- String zero = null;
- if (SinataUtil.isNotEmpty(cell0)) {
- zero = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell1 = row.getCell(1); //所属分公司[提示:加盟车辆选填] Affiliated branch company [Note: Franchise vehicles are optional].
- String one = null;
- if (SinataUtil.isNotEmpty(cell1)) {
- cell1.setCellType(Cell.CELL_TYPE_STRING);
- one = String.valueOf(cell1.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(2); //所属加盟商[提示:加盟车辆选填]Affiliated Franchise [Note: Franchise vehicles are optional].
- String two = null;
- if (SinataUtil.isNotEmpty(cell2)) {
- two = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(3); //服务模式:专车[是/否]Business mode: dedicated vehicle [yes/no]
- String three = null;
- if (SinataUtil.isNotEmpty(cell3)) {
- three = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(4); //服务模式:出租车[是/否]Business mode: taxi [yes/no]
- String four = null;
- if (SinataUtil.isNotEmpty(cell4)) {
- four = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(5); //服务模式:跨城出行[是/否]Business mode: cross-city [yes/no]
- String five = null;
- if (SinataUtil.isNotEmpty(cell5)) {
- five = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(6); //服务模式:小件跨城物流[是/否]Business mode: small-scale logistics [yes/no]
- String six = null;
- if (SinataUtil.isNotEmpty(cell6)) {
- six = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
- Cell cell7 = row.getCell(7); //服务模式:小件跨城物流[是/否]Business mode: small-scale logistics [yes/no]
- String seven = null;
- if (SinataUtil.isNotEmpty(cell7)) {
- seven = String.valueOf(cell7.getStringCellValue()).trim();
- }
-
- Cell cell8 = row.getCell(8); //服务模式:包车[是/否]Service mode: Chartered service [Yes/No]
- cell8.setCellType(Cell.CELL_TYPE_STRING);
- String eight = null;
- if (SinataUtil.isNotEmpty(cell8)) {
- eight = String.valueOf(cell8.getStringCellValue()).trim();
- }
-
- Cell cell9 = row.getCell(9); //车辆品牌car brand
- cell9.setCellType(Cell.CELL_TYPE_STRING);
- String nine = null;
- if (SinataUtil.isNotEmpty(cell9)) {
- nine = String.valueOf(cell9.getStringCellValue()).trim();
- }
-
- Cell cell10 = row.getCell(10); //车辆类型 car type
- cell10.setCellType(Cell.CELL_TYPE_STRING);
-
- String ten = null;
- if (SinataUtil.isNotEmpty(cell10)) {
- ten = String.valueOf(cell10.getStringCellValue()).trim();
- }
-
- Cell cell11 = row.getCell(11); //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]Vehicle color options include black, silver, white, red, yellow, orange, and blue.
- cell11.setCellType(Cell.CELL_TYPE_STRING);
- String eleven = null;
- if (SinataUtil.isNotEmpty(cell11)) {
- eleven = String.valueOf(cell11.getStringCellValue()).trim();
- }
-
-
- if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(seven)
- || SinataUtil.isEmpty(eight) || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(eleven)) {
- return new ErrorTip(500, "Cells cannot be empty");
- } else {
- //判断所属机构 Determine the affiliated organization.
- if (!zero.equals("Platform vehicle") && !zero.equals("Franchised vehicle")) {
- return new ErrorTip(500, "The organization content is incorrect");
- }
- //判断服务模式【专车】Assessing the Service Mode "Private Car
- if (!three.equals("yes") && !three.equals("no")) {
- return new ErrorTip(500, "Service mode [motorcycle] content is incorrect");
- }
- //判断服务模式【出租车】Assessing the Service Mode "taxi
- if (!four.equals("yes") && !four.equals("no")) {
- return new ErrorTip(500, "Service mode [Intra-city Express] content is incorrect");
- }
- //判断车辆颜色 Assessing the color
- if (!seven.equals("1") && !seven.equals("2") && !seven.equals("3") && !seven.equals("4") && !seven.equals("5") && !seven.equals("6") && !seven.equals("7")) {
- return new ErrorTip(500, "The vehicle color content is incorrect");
- }
- //判断年检到期时间格式是否正确 Verify if the format of the expiration date for inspection is correct.
- try {
- if (!isValidDate(ten)) {
- ten = importByExcelForDate(ten);
- }
- } catch (Exception e) {
- return new ErrorTip(500, "The format of the annual inspection expiration time is incorrect");
- }
- //判断商业保险到期时间格式是否正确 Check whether the expiration date format of the commercial insurance is correct.
- try {
- if (!isValidDate(eleven)) {
- eleven = importByExcelForDate(eleven);
- }
- } catch (Exception e) {
- return new ErrorTip(500, "The format of commercial insurance expiration time is incorrect");
- }
-
- //查找平台公司 Search for platform companies
-// TCompany platCompany = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes platCompany = companyClient.queryByTypeAndFlg(new CompanyQueryTypeAndFlgReq(1, 3));
- Integer companyId = platCompany.getId();
- Integer franchiseeId = 0;
- if ("Franchised vehicle".equals(zero)) {
- //判断所属分公司是否存在 Checking if the subsidiary company exists.
- if (SinataUtil.isNotEmpty(one)) {
-// TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("name", one).eq("type", 2).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes company = companyClient.queryByTypeAndFlgAndName(new CompanyQueryTypeAndFlgAndNameReq(2, 3, one));
- if (SinataUtil.isNotEmpty(company)) {
- companyId = company.getId();
- //判断加盟商是否存在 Assessing the existence of a franchisee
- if (SinataUtil.isNotEmpty(two)) {
-// TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",company.getId()).eq("name", two).eq("type", 3).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes franchisee = companyClient.queryBySuperiorIdAndTypeAndFlgAndName(new CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq(3, 3, two, company.getId()));
- if (SinataUtil.isNotEmpty(franchisee)) {
- franchiseeId = franchisee.getId();
- }
- }
- }
- }
- }
-
- Integer carBrandId = null;
- Integer carModelId = null;
- //查找品牌 search brand
- if (SinataUtil.isNotEmpty(five)) {
- TCarBrand carBrand = tCarBrandService.getOne(new QueryWrapper<TCarBrand>().eq("name", five).eq("state", 1).last(" limit 1"));
- if (SinataUtil.isNotEmpty(carBrand)) {
- carBrandId = carBrand.getId();
- if (SinataUtil.isNotEmpty(six)) {
- //查找类型 search type
- TCarModel carModel = tCarModelService.getOne(new QueryWrapper<TCarModel>().eq("brandId", carBrand.getId()).eq("name", six).eq("state", 1).last(" limit 1"));
- if (SinataUtil.isNotEmpty(carModel)) {
- carModelId = carModel.getId();
- }
- }
- }
- }
-
- //添加车辆对象 add vechcle obj
- TCar car = new TCar();
- if ("Platform vehicle".equals(zero)) {
- car.setIsPlatCar(1);
- } else if ("Franchised vehicle".equals(zero)) {
- car.setIsPlatCar(2);
- }
- car.setCompanyId(companyId);
- car.setFranchiseeId(franchiseeId);
- car.setCarColor(seven);
- car.setCarBrandId(carBrandId);
- car.setCarModelId(carModelId);
- car.setCarLicensePlate(eight);
- car.setDrivingLicenseNumber(nine);
- car.setAnnualInspectionTime(DateUtil.parseDate(ten));
- car.setCommercialInsuranceTime(DateUtil.parseDate(eleven));
- car.setInsertTime(new Date());
- car.setState(1);
- if (UserExt.getUser().getRoleType() == 1) {
- car.setAddType(2);
- } else if (UserExt.getUser().getRoleType() == 2) {
- car.setAddType(3);
- car.setAddObjectId(UserExt.getUser().getObjectId());
- } else if (UserExt.getUser().getRoleType() == 3) {
- car.setAddType(4);
- car.setAddObjectId(UserExt.getUser().getObjectId());
- }
- tCarService.save(car);
-
- //添加专车服务模式
- if ("yes".equals(three)) {
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(1);
- tCarServiceService.save(service);
- }
- //添加小件同城物流服务模式
- if ("yes".equals(four)) {
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(4);
- tCarServiceService.save(service);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return SUCCESS_TIP;
- }else {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
- try {
- //定时五秒后执行
- /*Map<String,Object> maps=new HashMap<>();
- Workbook book = WoUtil.ImportFile(file);
- maps.put("book",book);
- QuartzManager.addJob(AddContract.class, (AddContract.name+new Date().getTime()).toUpperCase(), TimeJobType.ADMIN,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);*/
-
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表 get first table
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //所属机构[平台车辆/加盟车辆] Affiliated Organization [Platform Vehicles/Franchise Vehicles]
- String zero = null;
- if (SinataUtil.isNotEmpty(cell0)) {
- zero = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell1 = row.getCell(1); //所属分公司[提示:加盟车辆选填]Affiliated Organization [Platform Vehicles/Franchise Vehicles]
- String one = null;
- if (SinataUtil.isNotEmpty(cell1)) {
- cell1.setCellType(Cell.CELL_TYPE_STRING);
- one = String.valueOf(cell1.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(2); //所属加盟商[提示:加盟车辆选填]Affiliated Franchise [Platform Vehicles/Franchise Vehicles]
- String two = null;
- if (SinataUtil.isNotEmpty(cell2)) {
- two = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(3); //服务模式:专车[是/否]Business mode: dedicated vehicle [yes/no]
- String three = null;
- if (SinataUtil.isNotEmpty(cell3)) {
- three = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(4); //服务模式:出租车[是/否] Business mode: taxi [yes/no]
- String four = null;
- if (SinataUtil.isNotEmpty(cell4)) {
- four = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(5); //服务模式:跨城出行[是/否] Business mode: cross-city [yes/no]
- String five = null;
- if (SinataUtil.isNotEmpty(cell5)) {
- five = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(6); //服务模式:小件跨城物流[是/否]Business mode: small-scale logistics [yes/no]
- String six = null;
- if (SinataUtil.isNotEmpty(cell6)) {
- six = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
- Cell cell7 = row.getCell(7); //服务模式:小件跨城物流[是/否]Business mode: small-scale logistics [yes/no]
- String seven = null;
- if (SinataUtil.isNotEmpty(cell7)) {
- seven = String.valueOf(cell7.getStringCellValue()).trim();
- }
-
- Cell cell8 = row.getCell(8); //服务模式:包车[是/否]Service mode: Chartered service [Yes/No]
- cell8.setCellType(Cell.CELL_TYPE_STRING);
- String eight = null;
- if (SinataUtil.isNotEmpty(cell8)) {
- eight = String.valueOf(cell8.getStringCellValue()).trim();
- }
-
- Cell cell9 = row.getCell(9); //车辆品牌 car brand
- cell9.setCellType(Cell.CELL_TYPE_STRING);
- String nine = null;
- if (SinataUtil.isNotEmpty(cell9)) {
- nine = String.valueOf(cell9.getStringCellValue()).trim();
- }
-
- Cell cell10 = row.getCell(10); //车辆类型
- cell10.setCellType(Cell.CELL_TYPE_STRING);
-
- String ten = null;
- if (SinataUtil.isNotEmpty(cell10)) {
- ten = String.valueOf(cell10.getStringCellValue()).trim();
- }
-
- Cell cell11 = row.getCell(11); //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]Vehicle color options include black, silver, white, red, yellow, orange, and blue.
- cell11.setCellType(Cell.CELL_TYPE_STRING);
- String eleven = null;
- if (SinataUtil.isNotEmpty(cell11)) {
- eleven = String.valueOf(cell11.getStringCellValue()).trim();
- }
-
-
- if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(seven)
- || SinataUtil.isEmpty(eight) || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(eleven)) {
- return new ErrorTip(500, "Sel tidak dapat kosong");
- } else {
- //判断所属机构
- if (!zero.equals("Mobil platform") && !zero.equals("Kendaraan yang dibersihkan")) {
- return new ErrorTip(500, "isi organisasi tidak benar");
- }
- //判断服务模式【专车】
- if (!three.equals("ya") && !three.equals("Tidak")) {
- return new ErrorTip(500, "Konten mode layanan [motor] tidak benar");
- }
- //判断服务模式【出租车】
- if (!four.equals("ya") && !four.equals("Tidak")) {
- return new ErrorTip(500, "Konten mode layanan [Intra-city Express] tidak benar");
- }
- //判断车辆颜色
- if (!seven.equals("1") && !seven.equals("2") && !seven.equals("3") && !seven.equals("4") && !seven.equals("5") && !seven.equals("6") && !seven.equals("7")) {
- return new ErrorTip(500, "Konten warna kendaraan tidak benar");
- }
- //判断年检到期时间格式是否正确
- try {
- if (!isValidDate(ten)) {
- ten = importByExcelForDate(ten);
- }
- } catch (Exception e) {
- return new ErrorTip(500, "Format waktu penggantian inspeksi tahunan tidak benar");
- }
- //判断商业保险到期时间格式是否正确
- try {
- if (!isValidDate(eleven)) {
- eleven = importByExcelForDate(eleven);
- }
- } catch (Exception e) {
- return new ErrorTip(500, "Format waktunya kehabisan asuransi komersial tidak benar");
- }
-
- //查找平台公司 Search for platform companies
-// TCompany platCompany = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes platCompany = companyClient.queryByTypeAndFlg(new CompanyQueryTypeAndFlgReq(1, 3));
- Integer companyId = platCompany.getId();
- Integer franchiseeId = 0;
- if ("Kendaraan yang dibersihkan".equals(zero)) {
- //判断所属分公司是否存在 Checking if the subsidiary company exists.
- if (SinataUtil.isNotEmpty(one)) {
-// TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("name", one).eq("type", 2).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes company = companyClient.queryByTypeAndFlgAndName(new CompanyQueryTypeAndFlgAndNameReq(2, 3, one));
- if (SinataUtil.isNotEmpty(company)) {
- companyId = company.getId();
- //判断加盟商是否存在 Assessing the existence of a franchisee
- if (SinataUtil.isNotEmpty(two)) {
-// TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",company.getId()).eq("name", two).eq("type", 3).notIn("flag", "3").last(" limit 1"));
- CompanyInfoRes franchisee = companyClient.queryBySuperiorIdAndTypeAndFlgAndName(new CompanyQuerySuperiorIdAndTypeAndFlgAndNameReq(3, 3, two, company.getId()));
- if (SinataUtil.isNotEmpty(franchisee)) {
- franchiseeId = franchisee.getId();
- }
- }
- }
- }
- }
-
- Integer carBrandId = null;
- Integer carModelId = null;
- //查找品牌 search brand
- if (SinataUtil.isNotEmpty(five)) {
- TCarBrand carBrand = tCarBrandService.getOne(new QueryWrapper<TCarBrand>().eq("name", five).eq("state", 1).last(" limit 1"));
- if (SinataUtil.isNotEmpty(carBrand)) {
- carBrandId = carBrand.getId();
- if (SinataUtil.isNotEmpty(six)) {
- //查找类型 search type
- TCarModel carModel = tCarModelService.getOne(new QueryWrapper<TCarModel>().eq("brandId", carBrand.getId()).eq("name", six).eq("state", 1).last(" limit 1"));
- if (SinataUtil.isNotEmpty(carModel)) {
- carModelId = carModel.getId();
- }
- }
- }
- }
-
- //添加车辆对象 add vechcle obj
- TCar car = new TCar();
- if ("Mobil platform".equals(zero)) {
- car.setIsPlatCar(1);
- } else if ("Kendaraan yang dibersihkan".equals(zero)) {
- car.setIsPlatCar(2);
- }
- car.setCompanyId(companyId);
- car.setFranchiseeId(franchiseeId);
- car.setCarColor(seven);
- car.setCarBrandId(carBrandId);
- car.setCarModelId(carModelId);
- car.setCarLicensePlate(eight);
- car.setDrivingLicenseNumber(nine);
- car.setAnnualInspectionTime(DateUtil.parseDate(ten));
- car.setCommercialInsuranceTime(DateUtil.parseDate(eleven));
- car.setInsertTime(new Date());
- car.setState(1);
- if (UserExt.getUser().getRoleType() == 1) {
- car.setAddType(2);
- } else if (UserExt.getUser().getRoleType() == 2) {
- car.setAddType(3);
- car.setAddObjectId(UserExt.getUser().getObjectId());
- } else if (UserExt.getUser().getRoleType() == 3) {
- car.setAddType(4);
- car.setAddObjectId(UserExt.getUser().getObjectId());
- }
- tCarService.save(car);
-
- //添加专车服务模式
- if ("ya".equals(three)) {
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(1);
- tCarServiceService.save(service);
- }
- //添加小件同城物流服务模式
- if ("ya".equals(four)) {
- TCarService service = new TCarService();
- service.setCarId(car.getId());
- service.setType(4);
- tCarServiceService.save(service);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return SUCCESS_TIP;
- }
- }
-
- /**
- * 判断日期是否满足yyyy-MM-dd格式
- * @param str
- * @return
- */
- public static boolean isValidDate(String str) {
- boolean convertSuccess=true;
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- try {
- format.setLenient(false);
- format.parse(str);
- } catch (Exception e) {
- convertSuccess=false;
- }
- return convertSuccess;
- }
-
-
- /**
- * 转换日期
- * @return
- */
- public static String importByExcelForDate(String value) {//value就是它的天数
- String currentCellValue = "";
- if(value != null && !value.equals("")){
- Calendar calendar = new GregorianCalendar(1900,0,-1);
- Date d = calendar.getTime();
- Date dd = DateUtils.addDays(d,Integer.valueOf(value));
- DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
- currentCellValue = formater.format(dd);
- }
- return currentCellValue;
- }
-
- /**
- * 导出车辆信息
- */
- @RequestMapping(value = "/outCar")
- public void outCar(HttpServletRequest request, HttpServletResponse response) {
- List<Map<String,Object>> listMap = tCarService.getCarList(null,UserExt.getUser().getRoleType(),UserExt.getUser().getObjectId(),null,null,null,null,null,null,null,null,null,null,null);
-
- // 表格数据【封装】
- List<List<String>> dataList = new ArrayList<>();
-
- //第一行显示【封装】
- List<String> twoList = new ArrayList<String>();
- twoList.add("总计:");
- twoList.add(String.valueOf(listMap.size())+"条");
- dataList.add(twoList);
-
- // 列【封装】
- List<String> shellList = new ArrayList<String>();
- shellList.add("添加时间");
- shellList.add("车辆ID");
- shellList.add("所属机构");
- shellList.add("车辆品牌");
- shellList.add("车辆类型");
- shellList.add("颜色");
- shellList.add("服务模式");
- shellList.add("车牌号");
- shellList.add("行驶证号码");
- shellList.add("关联司机");
- shellList.add("年检到期时间");
- shellList.add("商业保险到期时间");
- shellList.add("车辆剩余电量");
- dataList.add(shellList);
-
- for (Map<String,Object> object : listMap){
- // 详细数据列【封装】 detail
- shellList = new ArrayList<String>();
- if(SinataUtil.isNotEmpty(object.get("insertTime"))){
- shellList.add(DateUtil.format(DateUtil.parse(object.get("insertTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
- }else{
- shellList.add("-");
- }
- shellList.add(String.valueOf(object.get("id")));
-
- if(SinataUtil.isNotEmpty(object.get("companyName"))){
- shellList.add(object.get("companyName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("brandName"))){
- shellList.add(object.get("brandName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("modelName"))){
- shellList.add(object.get("modelName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("carColor"))){
- shellList.add(object.get("carColor").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("serverStr"))){
- shellList.add(object.get("serverStr").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("carLicensePlate"))){
- shellList.add(object.get("carLicensePlate").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("drivingLicenseNumber"))){
- shellList.add(object.get("drivingLicenseNumber").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("driverName"))){
- shellList.add(object.get("driverName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("annualInspectionTime"))){
- shellList.add(DateUtil.format(DateUtil.parse(object.get("annualInspectionTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("commercialInsuranceTime"))){
- shellList.add(DateUtil.format(DateUtil.parse(object.get("commercialInsuranceTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("power"))){
- shellList.add(object.get("power").toString());
- }else{
- shellList.add("-");
- }
- dataList.add(shellList);
- }
- try {
- // 调用工具类进行导出
- ExcelExportUtil.easySheet("车辆信息导出记录"+DateUtil.format(new Date(), "YYYYMMddHHmmss"), "车辆信息导出记录", dataList,request, response);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarModelController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarModelController.java
deleted file mode 100644
index 29ca003..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCarModelController.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.TCarBrand;
-import com.dsh.guns.modular.system.model.TCarModel;
-import com.dsh.guns.modular.system.service.ITCarBrandService;
-import com.dsh.guns.modular.system.service.ITCarModelService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.net.InetSocketAddress;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 车辆类型管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-05 14:31:28
- */
-@Controller
-@RequestMapping("/tCarModel")
-public class TCarModelController extends BaseController {
-
- private String PREFIX = "/system/tCarModel/";
-
- @Autowired
- private ITCarModelService tCarModelService;
-
- @Autowired
- private ITCarBrandService tCarBrandService;
-
- /**
- * 跳转到车辆类型管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tCarModel.html";
- }
-
- /**
- * 跳转到添加车辆类型管理
- */
- @RequestMapping("/tCarModel_add")
- public String tCarModelAdd(Model model) {
- List<TCarBrand> brandList = tCarBrandService.list(new QueryWrapper<TCarBrand>().eq("state", 1).orderByDesc("insertTime"));
- model.addAttribute("brandList",brandList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCarModel_add.html";
- }
-
- /**
- * 跳转到修改车辆类型管理
- */
- @RequestMapping("/tCarModel_update/{tCarModelId}")
- public String tCarModelUpdate(@PathVariable Integer tCarModelId, Model model) {
- TCarModel tCarModel = tCarModelService.getById(tCarModelId);
- model.addAttribute("item",tCarModel);
- LogObjectHolder.me().set(tCarModel);
-
- List<TCarBrand> brandList = tCarBrandService.list(new QueryWrapper<TCarBrand>().eq("state", 1).orderByDesc("insertTime"));
- model.addAttribute("brandList",brandList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCarModel_edit.html";
- }
-
- /**
- * 获取车辆类型管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,
- String name,Integer yy) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> carModelList = tCarModelService.getCarModelList(page, beginTime, endTime, name, yy);
- if(ToolUtil.isEmpty(yy)){
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (Map<String, Object> stringObjectMap : carModelList) {
- stringObjectMap.put("name",stringObjectMap.get("ename"));
- }
- }else if(language==3){
- for (Map<String, Object> stringObjectMap : carModelList) {
- stringObjectMap.put("name",stringObjectMap.get("yname"));
- }
- }
- }else {
- if(yy==2){
- for (Map<String, Object> stringObjectMap : carModelList) {
- stringObjectMap.put("name",stringObjectMap.get("ename"));
- }
- }else if(yy==3){
- for (Map<String, Object> stringObjectMap : carModelList) {
- stringObjectMap.put("name",stringObjectMap.get("yname"));
- }
- }
- }
-
-
- page.setRecords(carModelList);
- return super.packForBT(page);
- }
-
- /**
- * 新增车辆类型管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TCarModel tCarModel,Integer language) {
- tCarModel.setInsertTime(new Date());
- tCarModel.setState(1);
- tCarModel.setLanguage(language);
- tCarModelService.save(tCarModel);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除车辆类型管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tCarModelId) {
- TCarModel tCarModel = tCarModelService.getById(tCarModelId);
- tCarModel.setState(2);
- tCarModelService.updateById(tCarModel);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改车辆类型管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TCarModel tCarModel,Integer language) {
- tCarModel.setLanguage(language);
- tCarModelService.updateById(tCarModel);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TChatSetController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TChatSetController.java
deleted file mode 100644
index 017c590..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TChatSetController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TbChatSet;
-import com.dsh.guns.modular.system.service.ITbChatSetService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/TChatSet")
-public class TChatSetController extends BaseController {
-
- private String PREFIX = "/system/tChatSetPage/";
-
- @Autowired
- private ITbChatSetService tbChatSetService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tbChatSetPage.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbChatSet_add")
- public String tbChatSetAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tbChatSetPage_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbChatSet_update/{tbChatSetId}")
- public String tbChatSetUpdate(@PathVariable Integer tbChatSetId, Model model) {
- TbChatSet tbChatSet = tbChatSetService.getById(tbChatSetId);
- model.addAttribute("item",tbChatSet);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(tbChatSet);
- return PREFIX + "tbChatSetPage_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String time,Integer type,Integer yy) {
- List<TbChatSet> list = tbChatSetService.getList(time,type,yy);
- return list;
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer type,String content,Integer yy) {
- TbChatSet tbChatSet = new TbChatSet();
- tbChatSet.setType(type);
- tbChatSet.setContent(content);
- tbChatSet.setLanguage(yy);
- tbChatSet.setCreateTime(new Date());
- tbChatSetService.save(tbChatSet);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer TChatSetPageId) {
- TbChatSet byId = tbChatSetService.getById(TChatSetPageId);
- byId.setState(3);
- tbChatSetService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer id, Integer type,String content,Integer yy) {
- TbChatSet byId = tbChatSetService.getById(id);
- byId.setType(type);
- byId.setLanguage(yy);
- byId.setContent(content);
- tbChatSetService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbChatSetId}")
- @ResponseBody
- public Object detail(@PathVariable("tbChatSetId") Integer tbChatSetId) {
- return tbChatSetService.getById(tbChatSetId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCompanyController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCompanyController.java
deleted file mode 100644
index ba69b5c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TCompanyController.java
+++ /dev/null
@@ -1,919 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import cn.hutool.crypto.SecureUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.Car;
-import com.dsh.course.entity.City;
-import com.dsh.course.feignClient.activity.CompanyCityClient;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.course.mapper.CarMapper;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.SuccessTip;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ITOpenCityService;
-import com.dsh.guns.modular.system.service.ITPhoneService;
-import com.dsh.guns.modular.system.service.ITRegionService;
-import com.dsh.guns.modular.system.service.IUserService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.*;
-
-/**
- * 分公司管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-06 09:15:48
- */
-@Controller
-@RequestMapping("/tCompany")
-public class TCompanyController extends BaseController {
-
- private String PREFIX = "/system/tCompany/";
-//
-// @Autowired
-// private ITCompanyService tCompanyService;
-
- @Autowired
- private ITRegionService tRegionService;
-
- @Autowired
- private IUserService userService;
-
- @Autowired
- private CompanyClient companyClient;
- @Autowired
- private CompanyCityClient companyCityClient;
-
- @Autowired
- private CityMapper cityMapper;
- @Autowired
- private CarMapper carMapper;
- @Autowired
- private ITOpenCityService openCityService;
-
-// @Value("${pushMinistryOfTransport}")
-// private boolean pushMinistryOfTransport;
-
- /**
- * 跳转到修改平台信息
- */
- @RequestMapping("/admin_update")
- public String tCompanyUpdate(Model model) {
-// CompanyInfoRes tCompany = companyClient.queryByTypeAndFlg(new CompanyQueryTypeAndFlgReq(1, 3));
- CompanyInfoRes tCompany = companyClient.queryById(UserExt.getUser().getObjectId());
-
- model.addAttribute("item",tCompany);
- LogObjectHolder.me().set(tCompany);
- Integer language = UserExt.getLanguage();
-
-
- //系统用户对象
- User user = userService.getOne(new QueryWrapper<User>().eq("objectId", tCompany.getId()));
- model.addAttribute("user",user);
-
- //经营区域
- List<Map<String, Object>> scopeList = companyClient.getCompanyScopeById(UserExt.getUser().getObjectId());
- List<Map<String, Object>> list = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : scopeList) {
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity tOpenCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null == tOpenCity){
- continue;
- }
- Map<String, Object> map = new HashMap<>();
- map.put("id", openCityId);
- map.put("name", language == 1 ? tOpenCity.getChineseName() : language == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- list.add(map);
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("scopeList", list);
- model.addAttribute("tOpenCity", JSON.toJSONString(list));
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "platformEdit.html";
- }
-
- /**
- * 跳转到分公司管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompany.html";
- }
-
- /**
- * 跳转到加盟商管理首页
- */
- @RequestMapping("/franchisee")
- public String franchisee(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "franchisee.html";
- }
-
- /**
- * 跳转到企业审核首页
- */
- @RequestMapping("/auditPage")
- public String auditPage(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompanyAudit.html";
- }
-
- /**
- * 跳转到添加分公司管理
- */
- @RequestMapping("/tCompany_add")
- public String tCompanyAdd(Model model) {
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompany_add.html";
- }
-
- /**
- * 跳转到添加加盟商司管理
- */
- @RequestMapping("/tCompany_addFranchisee")
- public String tCompany_addFranchisee(Model model) {
- Integer roleType = UserExt.getUser().getRoleType();
- if (1 == roleType){
- //查询分公司
-// List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
- List<CompanyInfoRes> companyList = companyClient.queryByTypeCompany(2);
- model.addAttribute("companyList",companyList);
- }else if (2 == roleType){
- CompanyInfoRes tCompany = companyClient.queryById(UserExt.getUser().getObjectId());
- model.addAttribute("company",tCompany);
- }
- model.addAttribute("roleType",roleType);
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompany_addFranchisee.html";
- }
-
- /**
- * 跳转到查看分公司详情
- */
- @RequestMapping("/tCompany_detail/{tCompanyId}")
- public String tCompany_detail(@PathVariable Integer tCompanyId, Model model) {
- CompanyInfoRes tCompany = companyClient.queryById(tCompanyId);
- model.addAttribute("item",tCompany);
- LogObjectHolder.me().set(tCompany);
-
- //系统用户对象
- User user = userService.getOne(new QueryWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId).ne("status",3));
- model.addAttribute("user",user);
-
- //经营区域
- List<Map<String, Object>> scopeList = companyClient.getCompanyScopeById(tCompanyId);
- List<Map<String, Object>> list = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : scopeList) {
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity tOpenCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null == tOpenCity){
- continue;
- }
- stringObjectMap.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- Map<String, Object> map = new HashMap<>();
- map.put("id", openCityId);
- map.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- list.add(map);
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("scopeList", list);
- model.addAttribute("tOpenCity", JSON.toJSONString(list));
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompany_detail.html";
- }
-
- /**
- * 跳转到修改分公司管理
- */
- @RequestMapping("/tCompany_update/{tCompanyId}")
- public String tCompanyUpdate(@PathVariable Integer tCompanyId, Model model) {
-// TCompany tCompany = tCompanyService.selectById(tCompanyId);
- CompanyInfoRes tCompany = companyClient.queryById(tCompanyId);
- model.addAttribute("item",tCompany);
- LogObjectHolder.me().set(tCompany);
-
- //系统用户对象
- User user = userService.getOne(new QueryWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
- model.addAttribute("user",user);
-
- //经营区域
- List<Map<String, Object>> scopeList = companyClient.getCompanyScopeById(tCompanyId);
- List<Map<String, Object>> list = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : scopeList) {
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity tOpenCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null == tOpenCity){
- continue;
- }
- stringObjectMap.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- Map<String, Object> map = new HashMap<>();
- map.put("id", openCityId);
- map.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- list.add(map);
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("scopeList",list);
- model.addAttribute("tOpenCity", JSON.toJSONString(list));
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompany_edit.html";
- }
-
- /**
- * 跳转到查看加盟商
- */
- @RequestMapping("/tCompany_detailFranchisee/{tCompanyId}")
- public String tCompany_detailFranchisee(@PathVariable Integer tCompanyId, Model model) {
- CompanyInfoRes tCompany = companyClient.queryById(tCompanyId);
- model.addAttribute("item",tCompany);
- LogObjectHolder.me().set(tCompany);
-
- Integer roleType = UserExt.getUser().getRoleType();
- model.addAttribute("roleType",roleType);
-
- CompanyInfoRes obj = companyClient.queryById(tCompany.getSuperiorId());
- if (SinataUtil.isNotEmpty(obj)){
- model.addAttribute("companyName",obj.getName());
- }else {
- model.addAttribute("companyName","平台");
- }
- //经营区域
- List<Map<String, Object>> scopeList = companyClient.getCompanyScopeById(tCompanyId);
- List<Map<String, Object>> list = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : scopeList) {
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity tOpenCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null == tOpenCity){
- continue;
- }
- stringObjectMap.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- Map<String, Object> map = new HashMap<>();
- map.put("id", openCityId);
- map.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- list.add(map);
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("scopeList",scopeList);
- model.addAttribute("tOpenCity", JSON.toJSONString(list));
-
-
- //系统用户对象
- User user = userService.getOne(new QueryWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
- model.addAttribute("user",user);
- return PREFIX + "tCompany_detailFranchisee.html";
- }
-
- /**
- * 跳转到修改分公司管理
- */
- @RequestMapping("/tCompany_updateFranchisee/{tCompanyId}")
- public String tCompany_updateFranchisee(@PathVariable Integer tCompanyId, Model model) {
- CompanyInfoRes tCompany = companyClient.queryById(tCompanyId);
- model.addAttribute("item",tCompany);
- LogObjectHolder.me().set(tCompany);
- Integer language = UserExt.getLanguage();
-
- Integer roleType = UserExt.getUser().getRoleType();
- if (1 == roleType){
- //查询分公司
-// List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
- List<CompanyInfoRes> companyList = companyClient.queryByTypeCompany(2);
- model.addAttribute("companyList",companyList);
- }else if (2 == roleType){
- CompanyInfoRes obj = companyClient.queryById(11);
- model.addAttribute("company",obj);
- }
- model.addAttribute("roleType",roleType);
- //系统用户对象
- User user = userService.getOne(new QueryWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
- model.addAttribute("user",user);
-
- //经营区域
- List<Map<String, Object>> scopeList = companyClient.getCompanyScopeById(1);
- List<Map<String, Object>> list = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : scopeList) {
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity tOpenCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null == tOpenCity){
- continue;
- }
- stringObjectMap.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- Map<String, Object> map = new HashMap<>();
- map.put("id", openCityId);
- map.put("name", language == 1 ? tOpenCity.getChineseName() : language == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- list.add(map);
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("scopeList", list);
- model.addAttribute("tOpenCity", JSON.toJSONString(list));
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tCompany_updateFranchisee.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/tCompany_immediately/{id}")
- public String sysCouponActivityImmediately(@PathVariable Integer id, Model model) {
- CompanyInfoRes tCompany = companyClient.queryById(id);
- model.addAttribute("item",tCompany);
- LogObjectHolder.me().set(tCompany);
-
- //系统用户对象
- if(Objects.nonNull(tCompany.getSuperId())){
- User user = userService.getOne(new QueryWrapper<User>().eq("objectId", tCompany.getSuperId()).ne("status",3));
- model.addAttribute("user",user);
- }else {
- User user = userService.getOne(new QueryWrapper<User>().eq("objectId", id).ne("status",3));
- if(Objects.nonNull(user)){
- model.addAttribute("user",user);
- }else {
- model.addAttribute("user",new User());
- }
- }
-
- //经营区域
- List<Map<String, Object>> scopeList = companyClient.getCompanyCityById(id);
- List<Map<String, Object>> list = new ArrayList<>();
- for (Map<String, Object> stringObjectMap : scopeList) {
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity tOpenCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null == tOpenCity){
- continue;
- }
- stringObjectMap.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- Map<String, Object> map = new HashMap<>();
- map.put("id", openCityId);
- map.put("name", UserExt.getLanguage() == 1 ? tOpenCity.getChineseName() : UserExt.getLanguage() == 2 ? tOpenCity.getEnglishName() : tOpenCity.getIndonesianName());
- list.add(map);
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3)
- .eq("status",3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("scopeList", list);
- model.addAttribute("tOpenCity", JSON.toJSONString(list));
- model.addAttribute("id",id);
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tCompanyAudit_immediately.html";
- }
-
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @Transactional(rollbackFor = Exception.class)
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
- CompanyInfoRes tCompany = companyClient.queryById(id);
- if (SinataUtil.isNotEmpty(tCompany)){
- if(Objects.nonNull(tCompany.getSuperId()) && state == 3){
- // 查询出上一条老的数据
- CompanyInfoRes byId = companyClient.queryById(tCompany.getSuperId());
-
- Integer byIdId = byId.getId();
- // 审核通过的新数据覆盖老的数据
- tCompany.setId(null);
- BeanUtils.copyProperties(tCompany,byId);
- byId.setId(byIdId);
- byId.setSuperId(null);
- byId.setStatus(state);
- byId.setRemark(remark);
- companyClient.updateCompany(byId);
-
- User user = userService.getOne(Wrappers.lambdaQuery(User.class)
- .eq(User::getObjectId, byIdId)
- .last("LIMIT 1"));
- if(Objects.nonNull(user)){
- user.setName(tCompany.getName());
- userService.updateById(user);
- }
-
- // 删除老数据的公司经营业务
- companyCityClient.removeByCompanyId(byId.getId());
- // 查询新数据的经营业务，指向老数据
- List<TCompanyCityResp> list = companyClient.getCompanyCityByCompanyId(id);
- for (TCompanyCityResp tCompanyCityResp : list) {
- tCompanyCityResp.setCompanyId(byId.getId());
- tCompanyCityResp.setState(1);
- companyClient.updateCompanyCity(tCompanyCityResp);
- }
- // 删除新数据
- companyClient.removeById(id);
- }else {
- tCompany.setStatus(state);
- tCompany.setRemark(remark);
- CompanyInfoRes companyInfoRes = new CompanyInfoRes();
- BeanUtils.copyProperties(tCompany,companyInfoRes);
- companyClient.updateCompany(companyInfoRes);
- }
- }
- return SUCCESS_TIP;
- }
-
-
- @RequestMapping(value = "/change")
- @ResponseBody
- public Object change(@RequestParam Integer code) {
- List<City> list = new ArrayList<>();
- if (SinataUtil.isNotEmpty(code)){
- list = cityMapper.selectList(new QueryWrapper<City>().eq("pid",code));
- }
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (City city : list) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : list) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- return list;
- }
-
- /**
- * 获取分公司审核列表
- */
- @RequestMapping(value = "/auditList")
- @ResponseBody
- public Object auditList(String insertTime,
- String name,
- String principalName,
- String principalPhone,
- String adminName,
- String adminPhone,
- String serviceStr,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- Integer language = UserExt.getLanguage();
- List<Map<String, Object>> companyList = companyClient.getAuditList(new GetCompanyListReq(page, beginTime, endTime, name, principalName, principalPhone, adminName, adminPhone, serviceStr, state,language));
- for (Map<String, Object> stringObjectMap : companyList) {
- Integer id = (Integer) stringObjectMap.get("id");
- Integer integer = carMapper.selectCount(new LambdaQueryWrapper<Car>().eq(Car::getCompanyId, id));
- stringObjectMap.put("carNumber",integer);
- List<User> users = userService.getBaseMapper().selectList(new LambdaQueryWrapper<User>().eq(User::getObjectId, id));
- if(!CollectionUtils.isEmpty(users)){
- stringObjectMap.put("account",users.get(0).getAccount());
- }else {
- stringObjectMap.put("account","");
- }
- }
- page.setRecords(companyList);
- return super.packForBT(page);
- }
-
-
- /**
- * 获取分公司管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String name,
- String principalName,
- String principalPhone,
- String adminName,
- String adminPhone,
- String serviceStr,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- Integer language = UserExt.getLanguage();
- List<Map<String, Object>> companyList = companyClient.getCompanyList(new GetCompanyListReq(page, beginTime, endTime, name, principalName, principalPhone, adminName, adminPhone, serviceStr, state,language));
- for (Map<String, Object> stringObjectMap : companyList) {
- Integer id = (Integer) stringObjectMap.get("id");
- Integer integer = carMapper.selectCount(new LambdaQueryWrapper<Car>().eq(Car::getCompanyId, id));
- stringObjectMap.put("carNumber",integer);
- List<User> users = userService.getBaseMapper().selectList(new LambdaQueryWrapper<User>().eq(User::getObjectId, id));
- if(users.size()>0) {
- stringObjectMap.put("account", users.get(0).getAccount());
- }
- }
- page.setRecords(companyList);
- return super.packForBT(page);
- }
-
- /**
- * 获取分公司管理列表
- */
- @RequestMapping(value = "/listFranchisee")
- @ResponseBody
- public Object listFranchisee(String insertTime,
- String name,
- String account,
- String principalName,
- String principalPhone,
- String serviceStr,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() == 3){
- page.setRecords(null);
- }else{
- Integer language = UserExt.getLanguage();
- List<Map<String, Object>> franchiseeList1 = companyClient.getFranchiseeList1(new GetFranchiseeList1Req(page, beginTime, endTime, name, account, principalName, principalPhone, serviceStr, state, UserExt.getUser().getRoleType(), UserExt.getUser().getObjectId(),language));
- for (Map<String, Object> stringObjectMap : franchiseeList1) {
- Integer id = (Integer) stringObjectMap.get("id");
- Integer integer = carMapper.selectCount(new LambdaQueryWrapper<Car>().eq(Car::getFranchiseeId, id));
- stringObjectMap.put("carNumber",integer);
- List<User> users = userService.getBaseMapper().selectList(new LambdaQueryWrapper<User>().eq(User::getObjectId, id));
- stringObjectMap.put("account",users.get(0).getAccount());
- }
- page.setRecords(franchiseeList1);
- }
- return super.packForBT(page);
- }
-
- /**
- * 新增分公司管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
- //判断账号是否已存在
- int count = userService.getBaseMapper().selectCount(new QueryWrapper<User>().eq("account", account));
- if (count > 0){
- return new SuccessTip(500,"error1");
- }
- tCompany.setType(2); //2：分公司
- tCompany.setState(0); //0：正常
- tCompany.setInsertTime(new Date());
- SaveCompanyReq saveCompanyReq = new SaveCompanyReq();
- BeanUtils.copyProperties(tCompany,saveCompanyReq);
- Integer integer = companyClient.saveCompany(saveCompanyReq);
-
- //添加User对象
- User user = new User();
- user.setAccount(account);
-// user.setSalt(ShiroKit.getRandomSalt(5));
- user.setPassword(SecureUtil.md5(password));
- user.setRoleid("2");
- user.setDeptid(25);
- user.setStatus(1);
- user.setCreatetime(new Date());
- user.setRoleType(2);
- user.setObjectId(integer);
- user.setName(tCompany.getName());
- user.setSex(1);
- userService.save(user);
-
-
- addSet(integer);
-
-
-
- //添加经营区域
- addScopeAudit(subArr,integer);
- return SUCCESS_TIP;
- }
- //添加经营区域
- public void addSocpe(String subArr,Integer id){
- JSONArray jsonArray = JSON.parseArray(subArr);
- companyClient.deleteByCompanyId(id);
- int size = jsonArray.size();
- companyClient.deleteCompanyCity(id);
- for (int i = 0; i < size; i++){
- JSONObject jsonObject = jsonArray.getJSONObject(i);
-// TCompanyCityResp tCompanyCity = companyClient.queryCompanyCityByIdAndCompanyId(new QueryCompanyCityReq(jsonObject.getInteger("recordId"), id));
-
-// TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id));
- TCompanyCityResp tCompanyCity = new TCompanyCityResp();
- Integer openCityId = jsonObject.getInteger("id");
- tCompanyCity.setOpenCityId(openCityId);
- tCompanyCity.setCompanyId(id);
- tCompanyCity.setState(1);
- companyClient.saveCompanyCity(tCompanyCity);
- }
- }
-
- //添加经营区域
- public void addScopeAudit(String subArr,Integer id){
- JSONArray jsonArray = JSON.parseArray(subArr);
- companyClient.deleteByCompanyId(id);
- int size = jsonArray.size();
- companyClient.deleteCompanyCity(id);
- for (int i = 0; i < size; i++){
- JSONObject jsonObject = jsonArray.getJSONObject(i);
-// TCompanyCityResp tCompanyCity = companyClient.queryCompanyCityByIdAndCompanyId(new QueryCompanyCityReq(jsonObject.getInteger("recordId"), id));
-
-// TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id));
- TCompanyCityResp tCompanyCity = new TCompanyCityResp();
- Integer openCityId = jsonObject.getInteger("id");
- tCompanyCity.setOpenCityId(openCityId);
- tCompanyCity.setCompanyId(id);
- tCompanyCity.setState(0);
- companyClient.saveCompanyCity(tCompanyCity);
- }
- }
-
- /**
- * 新增加盟商管理
- */
- @RequestMapping(value = "/addFranchisee")
- @ResponseBody
- public Object addFranchisee(TCompany tCompany,@RequestParam String subArr,String account,String password) {
- //判断账号是否已存在
- int count = userService.getBaseMapper().selectCount(new QueryWrapper<User>().eq("account", account));
- if (count > 0){
- return "error1";
- }
- tCompany.setType(3); //2：分公司
- if (UserExt.getUser().getRoleType() == 2){
- tCompany.setSuperiorId(UserExt.getUser().getObjectId());
- }
- tCompany.setState(0); //0：正常
- tCompany.setInsertTime(new Date());
- SaveCompanyReq saveCompanyReq = new SaveCompanyReq();
- BeanUtils.copyProperties(tCompany,saveCompanyReq);
- Integer integer = companyClient.saveCompany(saveCompanyReq);
- //添加User对象
- User user = new User();
- user.setAccount(account);
-// user.setSalt(ShiroKit.getRandomSalt(5));
- user.setPassword(SecureUtil.md5(password));
- user.setRoleid("3");
- user.setDeptid(26);
- user.setStatus(1);
- user.setCreatetime(new Date());
- user.setRoleType(3);
- user.setObjectId(integer);
- user.setName(tCompany.getName());
- user.setSex(1);
- userService.save(user);
-
- addSet(integer);
- addScopeAudit(subArr,integer);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除分公司管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tCompanyId) {
-// TCompany tCompany = tCompanyService.selectById(tCompanyId);
- CompanyInfoRes tCompany = companyClient.queryById(tCompanyId);
-// tCompany.setFlag("3");
- tCompany.setFlag(3);
- companyClient.updateCompany(tCompany);
- companyCityClient.removeByCompanyId(tCompanyId);
- userService.remove(new LambdaQueryWrapper<User>().eq(User::getObjectId, tCompanyId));
-
- return SUCCESS_TIP;
- }
-
- /**
- * 修改分公司管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
- //判断账号是否已存在
- User user = userService.getById(userId);
- //添加User对象
- if (SinataUtil.isNotEmpty(account) && SinataUtil.isNotEmpty(password)){
- if (!user.getAccount().equals(account)){
- //判断账号是否已存在
- int count = userService.getBaseMapper().selectCount(new QueryWrapper<User>().eq("account", account));
- if (count > 0){
- return "error";
- }
- }
- user.setAccount(account);
- user.setPassword(SecureUtil.md5(password));
- userService.updateById(user);
- }
- CompanyInfoRes companyInfoRes = companyClient.queryById(tCompany.getId());
- tCompany.setType(companyInfoRes.getType()); //2：分公司
- tCompany.setState(0); //0：正常
- tCompany.setInsertTime(new Date());
- SaveCompanyReq saveCompanyReq = new SaveCompanyReq();
- BeanUtils.copyProperties(tCompany,saveCompanyReq);
- saveCompanyReq.setId(null);
- saveCompanyReq.setSuperId(tCompany.getId());
- Integer integer = companyClient.saveCompany(saveCompanyReq);
-
- addSet(integer);
- //添加经营区域
- addScopeAudit(subArr,integer);
- return SUCCESS_TIP;
- }
-
-// /**
-// * 修改分公司管理
-// */
-// @RequestMapping(value = "/update")
-// @ResponseBody
-// public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
-// //判断账号
-// User user = userService.getById(userId);
-// if (SinataUtil.isNotEmpty(account) && SinataUtil.isNotEmpty(password)){
-// if (!user.getAccount().equals(account)){
-// //判断账号是否已存在
-// int count = userService.getBaseMapper().selectCount(new QueryWrapper<User>().eq("account", account));
-// if (count > 0){
-// return "error";
-// }
-// }
-// //修改账号密码
-// user.setAccount(account);
-//// user.setSalt(ShiroKit.getRandomSalt(5));
-// user.setPassword(SecureUtil.md5(password));
-// }
-// CompanyInfoRes companyInfoRes = new CompanyInfoRes();
-// BeanUtils.copyProperties(tCompany,companyInfoRes);
-//
-// companyClient.updateCompany(companyInfoRes);
-// user.setName(tCompany.getName());
-// userService.updateById(user);
-//
-// //添加经营区域
-// addSocpe(subArr,tCompany.getId());
-//
-// CompanyInfoRes tCompany1 = companyClient.queryById(tCompany.getId());
-// if(tCompany1.getType() == 1){
-//// new Thread(new Runnable() {
-//// @Override
-//// public void run() {
-//// if(pushMinistryOfTransport){//上传平台数据
-//// pushMinistryOfTransportUtil.baseInfoCompanyPay();//上传网约车平台公司支付信息
-//// pushMinistryOfTransportUtil.baseInfoCompany(tCompany.getId());
-//// pushMinistryOfTransportUtil.baseInfoCompanyService();
-//// pushMinistryOfTransportUtil.baseInfoCompanyPermit(tCompany.getId());
-//// }
-//// }
-//// }).start();
-// }
-// return SUCCESS_TIP;
-// }
-
- /**
- * 修改加盟商管理
- */
- @RequestMapping(value = "/updateFranchisee")
- @ResponseBody
- public Object updateFranchisee(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
- //判断账号
- User user = userService.getById(userId);
- if (!user.getAccount().equals(account)){
- //判断账号是否已存在
- int count = userService.getBaseMapper().selectCount(new QueryWrapper<User>().eq("account", account));
- if (count > 0){
- return "error";
- }
- user.setAccount(account);
- user.setPassword(SecureUtil.md5(password));
- userService.updateById(user);
- }
- tCompany.setType(3); //2：分公司
- if (UserExt.getUser().getRoleType() == 2){
- tCompany.setSuperiorId(UserExt.getUser().getObjectId());
- }
- tCompany.setState(0); //0：正常
- tCompany.setInsertTime(new Date());
- SaveCompanyReq saveCompanyReq = new SaveCompanyReq();
- BeanUtils.copyProperties(tCompany,saveCompanyReq);
- saveCompanyReq.setId(null);
- saveCompanyReq.setSuperId(tCompany.getId());
- Integer integer = companyClient.saveCompany(saveCompanyReq);
-
- addSet(integer);
- addScopeAudit(subArr,integer);
- return SUCCESS_TIP;
- }
-
-// /**
-// * 修改加盟商管理
-// */
-// @RequestMapping(value = "/updateFranchisee")
-// @ResponseBody
-// public Object updateFranchisee(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
-// //判断账号
-// User user = userService.getById(userId);
-// if (!user.getAccount().equals(account)){
-// //判断账号是否已存在
-// int count = userService.getBaseMapper().selectCount(new QueryWrapper<User>().eq("account", account));
-// if (count > 0){
-// return "error";
-// }
-// }
-//
-// CompanyInfoRes companyInfoRes = new CompanyInfoRes();
-// BeanUtils.copyProperties(tCompany,companyInfoRes);
-// companyClient.updateCompany(companyInfoRes);
-//
-// //修改账号密码
-// user.setAccount(account);
-//// user.setSalt(ShiroKit.getRandomSalt(5));
-//// user.setPassword(ShiroKit.md5(password, user.getSalt()));
-// user.setName(tCompany.getName());
-// userService.updateById(user);
-// addSocpe(subArr,tCompany.getId());
-// return SUCCESS_TIP;
-// }
-
-
- @Autowired
- private ITPhoneService tPhoneService;
-
- private void addSet(Integer companyId){
- String json0 = "{\"num1\":\"\",\"num2\":\"\"}";
- //修改积分设置
- tPhoneService.addIntegral(json0,companyId);
-
-
- String json1 = "{\"num1\":\"\",\"num2\":\"\",\"num3\":\"\"}";
- // 修改等待超时
- tPhoneService.addWait(json1,companyId);
-
- String json2 = "[{\"num1\":\"\",\"num2\":\"\"},{\"num1\":\"\",\"num2\":\"\"}]";
- // 修改注册时长
- tPhoneService.addRegister(json2,companyId);
-
- String json3 ="[{\"num1\":\"\",\"num2\":\"\",\"num3\":\"\"},{\"num1\":\"\",\"num2\":\"\",\"num3\":\"\"}]";
- // 修改用户等级
- tPhoneService.addUserLevel(json3,companyId);
-
- String json4 = "{\"num1\":\"\",\"num2\":\"\",\"num3\":\"\",\"num4\":\"\",\"num5\":\"\",\"num6\":\"\",\"num7\":\"\",\"num8\":\"\",\"num9\":\"\",\"num10\":\"\",\"num11\":\"\",\"num12\":\"\"}";
- //修改摩托车退单
- tPhoneService.addMotorPushOrder(json4,companyId);
-
- String json5 = "{\"num1\":\"\",\"num2\":\"\",\"num3\":\"\",\"num4\":\"\",\"num5\":\"\",\"num6\":\"\",\"num7\":\"\",\"num8\":\"\",\"num9\":\"\",\"num10\":\"\",\"num11\":\"\",\"num12\":\"\"}";
- //修改同城快送推单
- tPhoneService.addSendOrder(json5,companyId);
-
- // 修改 取消设置
- tPhoneService.addCancel(companyId);
-
- // 修改预约取消设置
- tPhoneService.addYyCancel(companyId);
-
- // 修改 报警电话
- tPhoneService.addPolice(companyId);
-
- // 修改客服电话
- tPhoneService.addTalk(companyId);
-
- //修改保底
- tPhoneService.addMin(companyId);
-
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TComplaintController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TComplaintController.java
deleted file mode 100644
index ccfc6d6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TComplaintController.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.order.ComplaintClient;
-import com.dsh.course.feignClient.order.model.QueryComplaintListReq;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TComplaint;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.model.User;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 投诉列表控制器
- *
- * @author fengshuonan
- * @Date 2020-06-09 17:31:24
- */
-@Controller
-@RequestMapping("/tComplaint")
-public class TComplaintController extends BaseController {
-
- private String PREFIX = "/system/tComplaint/";
-
- @Autowired
- private ComplaintClient complaintClient;
-
- @Autowired
- private ITSystemNoticeService tSystemNoticeService;
-
-
-
-
-
- /**
- * 跳转到投诉列表首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tComplaint.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TComplaint tComplaint = complaintClient.queryTComplaintId(id);
- String str = "";
- if (1 == type){
- str = tComplaint.getReason();
- }else if (2 == type){
- str = tComplaint.getDescription();
- }else if (3 == type){
- str = tComplaint.getHandleResult();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/tComplaint_immediately/{tComplaintId}")
- public String tComplaintUpdate(@PathVariable Integer tComplaintId, Model model) {
- model.addAttribute("tComplaintId",tComplaintId);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tComplaint_immediately.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{str}")
- public String lookDetail(@PathVariable String str, Model model) {
- System.out.println(str);
- model.addAttribute("str",str);
- return PREFIX + "lookDetail.html";
- }
-
- /**
- * 获取投诉列表列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String userName,
- String userPhone,
- String driverPhone,
- Integer isHandle) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- User user = UserExt.getUser();
- page.setRecords(complaintClient.getComplaintList(new QueryComplaintListReq(page,user.getRoleType(),user.getObjectId(),beginTime,endTime,userName,userPhone,driverPhone,isHandle)));
- return super.packForBT(page);
- }
-
- /**
- * 删除投诉列表
- */
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam String handleResult) {
- TComplaint tComplaint = complaintClient.queryTComplaintId(id);
- if(SinataUtil.isNotEmpty(tComplaint)){
- tComplaint.setHandleResult(handleResult);
-// tComplaint.setHandleUserId(ShiroKit.getUser().getId());
- tComplaint.setIsHandle(1);
- tComplaint.setHandleTime(new Date());
- complaintClient.update(tComplaint);
-
- //增加系统消息
- TSystemNotice notice = new TSystemNotice();
- notice.setType(2);
- notice.setUserType(1);
- notice.setContent("投诉处理结果:["+handleResult+"]。");
- notice.setUserId(tComplaint.getUserId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- tSystemNoticeService.save1(notice);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 删除投诉
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(Integer tComplaintId) {
- complaintClient.delete(tComplaintId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改投诉列表
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TComplaint tComplaint) {
- complaintClient.update(tComplaint);
- return SUCCESS_TIP;
- }
-
- /**
- * 投诉列表详情
- */
- @RequestMapping(value = "/detail/{tComplaintId}")
- @ResponseBody
- public Object detail(@PathVariable("tComplaintId") Integer tComplaintId) {
- return complaintClient.queryTComplaintId(tComplaintId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverController.java
deleted file mode 100644
index 6d4b206..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverController.java
+++ /dev/null
@@ -1,1981 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import cn.hutool.crypto.SecureUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.model.Company;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.activity.model.CompanyQueryStateAndFlgReq;
-import com.dsh.course.feignClient.activity.model.FranchiseeListReq;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.DriverServiceClient;
-import com.dsh.course.feignClient.driver.DriverTrainClient;
-import com.dsh.course.feignClient.driver.model.*;
-import com.dsh.course.mapper.DriverPunishMapper;
-import com.dsh.course.mapper.DriverVerifyMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.ErrorTip;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ITCarService;
-import com.dsh.guns.modular.system.service.ITCarServiceService;
-import com.dsh.guns.modular.system.util.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.dsh.guns.core.util.WoUtil;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 司机审核列表控制器
- *
- * @author fengshuonan
- * @Date 2020-06-04 17:35:28
- */
-@Controller
-@RequestMapping("/tDriver")
-public class TDriverController extends BaseController {
-
- private String PREFIX = "/system/tDriver/";
-
- @Autowired
- private DriverClient driverClient;
-
- @Autowired
- private CompanyClient companyClient;
-
- @Autowired
- private DriverServiceClient driverServiceClient;
-
-// @Autowired
-// private ITDriverLineService tDriverLineService;
-
-//
-// @Autowired
-// private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Autowired
- private DriverTrainClient driverTrainClient;
-
- @Resource
- private DriverPunishMapper driverPunishMapper;
-
-
-
-
- /**
- * 跳转到司机审核列表首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver.html";
- }
-
- /**
- * 跳转到审核通过司机首页
- */
- @RequestMapping("/yesDriver")
- public String yesDriver(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- BigDecimal money = driverClient.getWithholding();
- model.addAttribute("money",money);
- return PREFIX + "yesDriver.html";
- }
-
- /**
- * 跳转到添加司机
- */
- @RequestMapping("/tDriver_add")
- public String tDriverAdd(Model model) {
- List<CompanyInfoRes> companyInfoRes = companyClient.queryByTypeCompany(2);
- model.addAttribute("companyList",companyInfoRes);
-
- Integer roleType = 1;
- model.addAttribute("roleType",roleType);
- if (2 == roleType){
- List<CompanyInfoRes> franchiseeList = companyClient.getFranchiseeList(new FranchiseeListReq(3, 1, 1, 3));
- model.addAttribute("franchiseeList",franchiseeList);
- }else{
- model.addAttribute("franchiseeList",null);
- }
- //查询当前用户所属分公司/加盟商
- model.addAttribute("objectName",companyClient.queryById(1).getName());
-
- //查询线路列表
-// List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
-// model.addAttribute("lineList",lineList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver_add.html";
- }
-
- /**
- * 跳转到修改审核司机
- */
- @RequestMapping("/tDriver_immediately/{tDriverId}")
- public String tDriver_immediately(@PathVariable Integer tDriverId, Model model) {
- DriverInfoRes tDriver = driverClient.getDriver(tDriverId);
- model.addAttribute("item",tDriver);
- Integer carId = tDriver.getCarId();
- List<DriverService> tCarServices = driverClient.getDriverService(tDriverId);
- String a= "";
- Integer language = UserExt.getLanguage();
- if(tCarServices.size()>0){
- if(tCarServices.size()==1){
- Integer type = tCarServices.get(0).getType();
- if(type==1){
- if(language==1){
- a="摩托车";
- }else if(language==2){
- a="Motorcycle";
- }else {
- a="Motosikal";
- }
- }else if(type==4){
- if(language==1){
- a="同城快送";
- }else if(language==2){
- a="Express in the same city";
- }else {
- a="Ekspres di kota yang sama";
- }
- }
- }else {
- for (int i = 0; i < tCarServices.size(); i++) {
- if(i==tCarServices.size()-1){
- Integer type = tCarServices.get(i).getType();
- if(type==1){
- if(language==1){
- a+="摩托车";
- }else if(language==2){
- a+="Motorcycle";
- }else {
- a+="Motosikal";
- }
- }else if(type==4){
- if(language==1){
- a+="同城快送";
- }else if(language==2){
- a+="Express in the same city";
- }else {
- a+="Ekspres di kota yang sama";
- }
- }
- }else {
- Integer type = tCarServices.get(i).getType();
- if(type==1){
- if(language==1){
- a+="摩托车、";
- }else if(language==2){
- a+="Motorcycle、";
- }else {
- a+="Motosikal、";
- }
- }else if(type==4){
- if(language==1){
- a+="同城快送、";
- }else if(language==2){
- a+="Express in the same city、";
- }else {
- a+="Ekspres di kota yang sama、";
- }
- }
- }
- }
- }
- }
- if(tDriver.getCompanyId()!=null) {
- CompanyInfoRes companyInfoRes = companyClient.queryById(tDriver.getCompanyId());
- model.addAttribute("companyName", companyInfoRes.getName());
- }else {
- model.addAttribute("companyName", null);
- }
- model.addAttribute("serverStr",a);
- if(tDriver.getAddType()==1){
- model.addAttribute("addTypeStr","司机注册");
- }else if(tDriver.getAddType()==1){
- model.addAttribute("addTypeStr","平台添加");
- }else if(tDriver.getAddType()==3){
- model.addAttribute("addTypeStr","分公司添加");
- }else {
- model.addAttribute("addTypeStr","加盟商添加");
- }
- LogObjectHolder.me().set(tDriver);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver_immediately.html";
- }
-
- /**
- * 跳转到选择车辆页面
- */
- @RequestMapping("/tDriver_changeCar/{tDriverId}")
- public String tDriver_changeCar(@PathVariable Integer tDriverId, Model model) {
- model.addAttribute("tDriverId",tDriverId);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver_changeCar.html";
- }
-
- /**
- * 跳转到冻结/解冻司机页面
- */
- @RequestMapping("/tDriver_optDriver/{tDriverId}/{optType}")
- public String tDriver_optDriver(@PathVariable Integer tDriverId,@PathVariable Integer optType, Model model) {
- model.addAttribute("tDriverId",tDriverId);
- model.addAttribute("optType",optType);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver_optDriver.html";
- }
- @RequestMapping("/without")
- public String tDriver_optDriver(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return "/system/tWithout/tWithout.html";
- }
-
- /**
- * 跳转到查看司机详情
- */
- @RequestMapping("/tDriver_look/{tDriverId}")
- public String tDriver_look(@PathVariable Integer tDriverId, Model model) {
- DriverInfoRes tDriver = driverClient.getDriver(tDriverId);
-
- if(tDriver.getAuthState()==1){
- model.addAttribute("status","待审核");
- }else
- if(tDriver.getAuthState()==2){
- model.addAttribute("status","正常");
- }else
- if(tDriver.getAuthState()==3){
- model.addAttribute("status","冻结");
- }else
- if(tDriver.getAuthState()==4){
- model.addAttribute("status","拒绝");
- }
-
- if(tDriver.getAddType()==1){
- model.addAttribute("addTypeStr","司机注册");
- }else if(tDriver.getAddType()==1){
- model.addAttribute("addTypeStr","平台添加");
- }else if(tDriver.getAddType()==3){
- model.addAttribute("addTypeStr","分公司添加");
- }else {
- model.addAttribute("addTypeStr","加盟商添加");
- }
- model.addAttribute("item",tDriver);
-
- if(tDriver.getCompanyId()!=null) {
- CompanyInfoRes companyInfoRes = companyClient.queryById(tDriver.getCompanyId());
- model.addAttribute("companyName", companyInfoRes.getName());
- }else {
- model.addAttribute("companyName", null);
- }
- Integer language = UserExt.getLanguage();
- Integer carId = tDriver.getCarId();
- List<DriverService> tCarServices = driverClient.getDriverService(tDriverId);
- String a= "";
- if(tCarServices.size()>0){
- if(tCarServices.size()==1){
- Integer type = tCarServices.get(0).getType();
- if(type==1){
- if(language==1){
- a="摩托车";
- }else if(language==2){
- a="Motorcycle";
- }else {
- a="Motosikal";
- }
-
- }else if(type==4){
- if(language==1){
- a="同城快送";
- }else if(language==2){
- a="Express in the same city";
- }else {
- a="Ekspres di kota yang sama";
- }
-
- }
- }else {
- for (int i = 0; i < tCarServices.size(); i++) {
- if(i==tCarServices.size()-1){
- Integer type = tCarServices.get(i).getType();
- if(type==1){
- if(language==1){
- a+="摩托车";
- }else if(language==2){
- a+="Motorcycle";
- }else {
- a+="Motosikal";
- }
-
- }else if(type==4){
- if(language==1){
- a+="同城快送";
- }else if(language==2){
- a+="Express in the same city";
- }else {
- a+="Ekspres di kota yang sama";
- }
-
- }
- }else {
- Integer type = tCarServices.get(i).getType();
- if(type==1){
- if(language==1){
- a+="摩托车、";
- }else if(language==2){
- a+="Motorcycle、";
- }else {
- a+="Motosikal、";
- }
-
- }else if(type==4){
- if(language==1){
- a+="同城快送、";
- }else if(language==2){
- a+="Express in the same city、";
- }else {
- a+="Ekspres di kota yang sama、";
- }
-
- }
- }
- }
- }
- }
-
- model.addAttribute("serverStr",a);
- LogObjectHolder.me().set(tDriver);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver_look.html";
- }
-
- /**
- * 跳转到修改司机
- */
- @RequestMapping("/tDriver_update/{tDriverId}")
- public String tDriverUpdate(@PathVariable Integer tDriverId, Model model) {
-// TDriver tDriver = tDriverService.selectById(tDriverId);
- DriverInfoRes tDriver = driverClient.getDriver(tDriverId);
- model.addAttribute("item",tDriver);
- LogObjectHolder.me().set(tDriver);
- User user = UserExt.getUser();
- Integer roleType = 1;
- model.addAttribute("roleType",roleType);
- model.addAttribute("objectName",companyClient.queryById(1));
-
- if (1 == roleType){
-// List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
- List<CompanyInfoRes> companyList = companyClient.queryByTypeCompany(2);
- model.addAttribute("companyList",companyList);
- List<Company> franchiseeList = companyClient.selectList1(new DriverUpdateReq(3,tDriver.getCompanyId()));
- model.addAttribute("franchiseeList",franchiseeList);
- }else if (2 == roleType){
- List<Company> franchiseeList = companyClient.selectList1(new DriverUpdateReq(3,user.getObjectId()));
- model.addAttribute("franchiseeList",franchiseeList);
- }
-
- //查询平台ID
- CompanyInfoRes company = companyClient.queryByTypeCompany(1).get(0);
- //判断是平台司机还是加盟司机
- if ((SinataUtil.isEmpty(tDriver.getCompanyId()) || tDriver.getCompanyId() == 0 || tDriver.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tDriver.getFranchiseeId()) || tDriver.getFranchiseeId() == 0)){
- model.addAttribute("companyType",1);
- }else{
- model.addAttribute("companyType",2);
- }
-
- //获取经营业务
-// List<TDriverService> serviceList = tDriverServiceService.selectList(new EntityWrapper<TDriverService>().eq("driverId", tDriverId));
- List<TDriverService> serviceList = driverServiceClient.getListByDriverId(tDriverId);
- Integer one = 1;
- Integer two = 1;
- Integer three = 1;
- Integer four = 1;
- Integer five = 1;
- Integer six = 1;
- for (TDriverService obj : serviceList){
- if (obj.getType() == 1){
- one = 2;
- }
- if (obj.getType() == 2){
- two = 2;
- }
- if (obj.getType() == 3){
- three = 2;
- }
- if (obj.getType() == 4){
- four = 2;
- }
- if (obj.getType() == 5){
- five = 2;
- }
- if (obj.getType() == 6){
- six = 2;
- }
- }
- model.addAttribute("one",one);
- model.addAttribute("two",two);
- model.addAttribute("three",three);
- model.addAttribute("four",four);
- model.addAttribute("five",five);
- model.addAttribute("six",six);
-
- //查询线路列表
-// List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
-// model.addAttribute("lineList",lineList);
- //查询驾驶员已添加的线路列表
-// List<Map<String, Object>> driverLineList = tDriverLineService.getDriverLineListByDriverId(tDriverId);
-// model.addAttribute("driverLineList",driverLineList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriver_edit.html";
- }
-
- /**
- * 跳转到添加培训页
- * @param id
- * @param model
- * @return
- */
- @RequestMapping("/showTraining")
- public String showTraining(Integer id, Model model){
- model.addAttribute("id", id);
- return PREFIX + "training.html";
- }
-
-
- /**
- * 保存培训数据
- * @param train
- * @param driverId
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/saveTrain", method = RequestMethod.POST)
- public ResultUtil saveTrain(String train, Integer driverId){
- if(Objects.isNull(train)){
- return ResultUtil.error("请添加有效的培训记录");
- }
- String[] split = train.split(",");
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- try {
- List<DriverTrain> update = new ArrayList<>();
- List<DriverTrain> add = new ArrayList<>();
- for(String s : split){
- String[] s1 = s.split("_");
- if(!StringUtils.isEmpty(s1[0])){//修改
- DriverTrain driverTrain = driverTrainClient.queryDriverTrainById(Integer.valueOf(s1[0]));
- driverTrain.setDriverId(driverId);
- driverTrain.setCourseName(s1[1]);
- driverTrain.setCourseDate(sdf.parse(s1[2]));
- driverTrain.setStartTime(s1[3]);
- driverTrain.setStopTime(s1[4]);
- driverTrain.setDuration(Integer.valueOf(s1[5]));
- update.add(driverTrain);
- }else{//添加
- DriverTrain driverTrain = new DriverTrain();
- driverTrain.setDriverId(driverId);
- driverTrain.setCourseName(s1[1]);
- driverTrain.setCourseDate(sdf.parse(s1[2]));
- driverTrain.setStartTime(s1[3]);
- driverTrain.setStopTime(s1[4]);
- driverTrain.setDuration(Integer.valueOf(s1[5]));
- add.add(driverTrain);
- }
- }
- List<DriverTrain> driverTrains = driverTrainClient.queryAllTrain(driverId);
- for(DriverTrain driverTrain : driverTrains){
- boolean b = true;
- for(String s : split){
- String[] s1 = s.split("_");
- if(!StringUtils.isEmpty(s1[0]) && driverTrain.getId() == Integer.valueOf(s1[0])){
- b = false;
- break;
- }
- }
- if(b){
- driverTrainClient.deleteById(driverTrain.getId());
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoDriverEducate(driverTrain.getId(), 3);
-// }
-// }
-// }).start();
- }
- }
- if(update.size() > 0){
- for(DriverTrain driverTrain : update){
- driverTrainClient.updateById(driverTrain);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoDriverEducate(driverTrain.getId(), 2);
-// }
-// }
-// }).start();
- }
- }
- if(add.size() > 0){
- for(DriverTrain driverTrain : add){
- driverTrainClient.insert(driverTrain);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoDriverEducate(driverTrain.getId(), 1);
-// }
-// }
-// }).start();
- }
- }
-
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- return ResultUtil.success();
- }
-
- /**
- * 获取司机的所有培训数据
- * @param driverId
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/queryAllTrain", method = RequestMethod.POST)
- public ResultUtil queryAllTrain(Integer driverId){
- List<DriverTrain> driverTrains = driverTrainClient.queryAllTrain(driverId);
- return ResultUtil.success(driverTrains);
- }
-
-
- /**
- * 跳转到处罚页
- * @param id
- * @param model
- * @return
- */
- @RequestMapping("/showPunish")
- public String showPunish(Integer id, Model model){
- model.addAttribute("id", id);
- return PREFIX + "punish.html";
- }
-
-
- /**
- * 保存处罚数据
- * @param punish
- * @param driverId
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/savePunish", method = RequestMethod.POST)
- public ResultUtil savePunish(String punish, Integer driverId){
- if(Objects.isNull(punish)){
- return ResultUtil.error("请添加有效的培训记录");
- }
- String[] split = punish.split(",");
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- try {
- List<DriverPunish> update = new ArrayList<>();
- List<DriverPunish> add = new ArrayList<>();
- for(String s : split){
- String[] s1 = s.split("_");
- if(!StringUtils.isEmpty(s1[0])){//修改
- DriverPunish driverPunish = driverPunishMapper.selectById(s1[0]);
- driverPunish.setDriverId(driverId);
- driverPunish.setPunishTime(sdf.parse(s1[1]));
- driverPunish.setPunishReason(s1[2]);
- driverPunish.setPunishReault(s1[3]);
- update.add(driverPunish);
- }else{//添加
- DriverPunish driverPunish = new DriverPunish();
- driverPunish.setDriverId(driverId);
- driverPunish.setPunishTime(sdf.parse(s1[1]));
- driverPunish.setPunishReason(s1[2]);
- driverPunish.setPunishReault(s1[3]);
- add.add(driverPunish);
- }
- }
- List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
- for(DriverPunish driverTrain : driverPunishes){
- boolean b = true;
- for(String s : split){
- String[] s1 = s.split("_");
- if(!StringUtils.isEmpty(s1[0]) && driverTrain.getId() == Integer.valueOf(s1[0])){
- b = false;
- break;
- }
- }
- if(b){
- driverTrainClient.deleteById(driverTrain.getId());
- }
- }
- if(update.size() > 0){
- for(DriverPunish driverTrain : update){
- driverPunishMapper.updateById(driverTrain);
- }
- }
- if(add.size() > 0){
- for(DriverPunish driverTrain : add){
- driverPunishMapper.insert(driverTrain);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.ratedDriverPunish(driverTrain.getId());
-// }
-// }
-// }).start();
- }
- }
-
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- return ResultUtil.success();
- }
-
-
- /**
- * 获取所有处罚数据
- * @param driverId
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/queryAllPunish", method = RequestMethod.POST)
- public ResultUtil queryAllPunish(Integer driverId){
- List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
- return ResultUtil.success(driverPunishes);
- }
-
-
- /**
- * 根据分公司ID获取加盟商
- * @param oneId
- * @return
- */
- @RequestMapping(value = "/oneChange")
- @ResponseBody
- public Object oneChange(@RequestParam Integer oneId) {
- List<Company> list = new ArrayList<>();
- if (SinataUtil.isNotEmpty(oneId)){
- list = companyClient.selectListOneChange(oneId);
-// new QueryWrapper<Company>()
-// .eq("type", 3)
-// .eq("superiorId", oneId)
-// .notIn("flag",3)
-// .notIn("state",1)
- }
- return list;
- }
-
- /**
- * 获取司机审核列表列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String companyName,
- String phone,
- String account,
- Integer addType,
- Integer authState) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- if (UserExt.getUser().getRoleType() != 1){
- return super.packForBT(new Page<>().setRecords(null));
- }
- return super.packForBT(driverClient.getAuthDriverList(new QueryAuthDriverReq(limit,offset,beginTime,endTime,companyName,phone,account,addType,authState)));
- }
-
-
-
-
- /**
- * 获取审核通过的司机列表
- */
- @RequestMapping(value = "/listYesDriver")
- @ResponseBody
- public Object listYesDriver(String insertTime,
- String companyName,
- String phone,
- String name,
- Integer addType,
- Integer authState) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- return super.packForBT(driverClient.getDriverList(new QueryDriverListReq(limit,offset,UserExt.getUser().getRoleType(),UserExt.getUser().getObjectId(),beginTime,endTime,companyName,phone,name,addType,authState)));
- }
- @RequestMapping(value = "/withoutList")
- @ResponseBody
- public Object withoutList(String name,
- String phone) {
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- return super.packForBT(driverClient.getWithoutList(new WithoutListReq(limit,offset,name,phone)));
- }
-
- /**
- * 获取可被选择的车辆列表
- */
- @RequestMapping(value = "/selectCarList/{tDriverId}")
- @ResponseBody
- public Object selectCarList(@PathVariable Integer tDriverId,
- String carLicensePlate,
- String brandName,
- String modelName,
- String color,
- String serverStr) {
-// TDriver driver = tDriverService.selectById(tDriverId);
- /*String useCarIdStr = null;
- //查询已被使用的车辆ID
- if (SinataUtil.isNotEmpty(driver.getCarId())){
- useCarIdStr = tDriverService.getUseCarIdStr(driver.getCarId());
- }else{
- useCarIdStr = tDriverService.getUseCarIdStr(null);
- }*/
- //2020-08-21:新需求,已被绑定的车辆可以被继续绑定
- User user = UserExt.getUser();
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- String groupConcat = driverClient.getGroupConcat(user.getObjectId());
- page.setRecords(driverPunishMapper.getCanSelectCarList(page,user.getRoleType(),user.getObjectId(),null,carLicensePlate,brandName,modelName,color,serverStr,groupConcat));
- return super.packForBT(page);
-
- }
-
- /**
- * 审核操作 1=通过 2=不通过
- */
- @RequestMapping(value = "/authOpt")
- @ResponseBody
- public Object authOpt(Integer id,Integer authState) {
- if (SinataUtil.isNotEmpty(id) && SinataUtil.isNotEmpty(authState)){
- DriverInfoRes tDriver = driverClient.getDriver(id);
- Integer type = 0;
- if (1 == authState){
- type = 5;
- tDriver.setAuthState(2);
-
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoCompanyStat();
-// pushMinistryOfTransportUtil.baseInfoDriver(id);
-// pushMinistryOfTransportUtil.baseInfoDriverApp(id);
-// }
-// }
-// }).start();
- }else{
- type = 6;
- tDriver.setAuthState(4);
- }
-
- Map<String,String> map = new HashMap<>();
- map.put("uid", String.valueOf(tDriver.getId()));
- map.put("type", String.valueOf(type));
- String result = HttpRequestUtil.postRequest(PushURL.driver_auth_url, map);
- System.out.println("司机注册审核发送短信 :【driverId="+tDriver.getId().toString()+"】,调用接口:"+result);
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(tDriver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- }
- return SUCCESS_TIP;
- }
- @RequestMapping(value = "/withholding")
- @ResponseBody
- public Object withholding(Double money,Integer id,String time) {
- driverClient.withholding(new WithholdingDto(money,id,time));
- return SUCCESS_TIP;
- }
-
- @Autowired
- private ITCarService carService;
-
- @Autowired
- private ITCarServiceService carServiceService;
-
- @Autowired
- private DriverVerifyMapper driverVerifyMapper;
-
- /**
- * 更换车辆操作
- */
- @RequestMapping(value = "/selectCarOpt")
- @ResponseBody
- public Object selectCarOpt(Integer tDriverId,Integer carId) {
- if (SinataUtil.isNotEmpty(tDriverId) && SinataUtil.isNotEmpty(carId)){
- List<DriverVerify> driverVerifies = driverVerifyMapper.selectList(new LambdaQueryWrapper<DriverVerify>().eq(DriverVerify::getDriverId, tDriverId).eq(DriverVerify::getState, 1));
- if(driverVerifies.size()>0){
- return "501";
- }
- DriverInfoRes tDriver = driverClient.getDriver(tDriverId);
- DriverVerify driverVerify = new DriverVerify();
- driverVerify.setAccount(tDriver.getAccount());
- driverVerify.setAddress(tDriver.getDriverAddress());
- driverVerify.setAge(tDriver.getDriverAge());
-
-
- List<DriverService> driverService = driverClient.getDriverService(tDriverId);
- Integer carId1 = tDriver.getCarId();
- TCar tCar = carService.getById1(carId1);
- List<TCarService> tCarServices = carServiceService.getBaseMapper().selectList(new LambdaQueryWrapper<TCarService>().eq(TCarService::getCarId, carId1));
- String carServer = null;
- for (DriverService tCarService : driverService) {
- if(tCarServices.size()>1){
- carServer = "3";
- }
- else {
- carServer = tCarService.getType().toString();
- }
- }
- driverVerify.setCarServer(carServer);
- CompanyInfoRes companyInfoRes = companyClient.queryById(tDriver.getCompanyId());
- driverVerify.setCompany(companyInfoRes.getName());
- driverVerify.setCreateTime(new Date());
- driverVerify.setDriverId(tDriverId);
- driverVerify.setDriverNum(tDriver.getDriveCard());
- driverVerify.setDriverNumImg(tDriver.getDriveCardImgUrl());
- driverVerify.setIdCards(tDriver.getIdCard());
- if(tCar==null){
- driverVerify.setOldCarId(null);
- }else {
- driverVerify.setOldCarId(tCar.getCarLicensePlate());
- driverVerify.setOldId(tCar.getId());
- }
- driverVerify.setPhone(tDriver.getPhone());
- TCar byId = carService.getById1(carId);
- driverVerify.setNewCarId(byId.getCarLicensePlate());
- driverVerify.setNewId(byId.getId());
- driverVerify.setSource(tDriver.getAddType().toString());
- driverVerifyMapper.insert(driverVerify);
-
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 新增司机审核列表
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TDriver tDriver,@RequestParam String serverBox,@RequestParam String lineStr,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
- //判断登录账户是否重复
-// int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3").ne("flag", 3));
-
-
- int count = driverClient.selectCount(new DriverSelectCountReq(tDriver.getPhone(),new Integer[]{1,2,3},3,null,null,null));
- if (count > 0){
- return "error";
- }
- if (1 == roleType){ //平台
- if (2 == companyType.intValue()){
- if (SinataUtil.isNotEmpty(oneId)){
- tDriver.setCompanyId(oneId);
- }
- if (SinataUtil.isNotEmpty(twoId)){
- tDriver.setFranchiseeId(twoId);
- }
- }else if (1 == companyType.intValue()){
- CompanyInfoRes company = companyClient.queryByTypeCompany(1).get(0);
-
-// TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
- tDriver.setCompanyId(UserExt.getUser().getObjectId());
- tDriver.setFranchiseeId(franchiseeId);
- }
- tDriver.setAddType(2);
- tDriver.setIsPlatCar(1);
- tDriver.setAuthState(2);
- }else if (2 == roleType){ //分公司
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tDriver.setCompanyId(UserExt.getUser().getObjectId());
- }
- if (SinataUtil.isNotEmpty(franchiseeId)){
- tDriver.setFranchiseeId(franchiseeId);
- }
- tDriver.setAddType(3);
- tDriver.setIsPlatCar(2);
- tDriver.setAuthState(1);
- tDriver.setAddObjectId(UserExt.getUser().getObjectId());
- }else if (3 == roleType){ //加盟商
- CompanyInfoRes tCompany = companyClient.queryById(UserExt.getUser().getObjectId());
-
- if (SinataUtil.isNotEmpty(tCompany)){
- tDriver.setCompanyId(tCompany.getSuperiorId());
- }
- if (SinataUtil.isNotEmpty(UserExt.getUser().getId())){
- tDriver.setFranchiseeId(UserExt.getUser().getId());
- }
- tDriver.setAddType(4);
- tDriver.setIsPlatCar(2);
- tDriver.setAuthState(1);
- tDriver.setAddObjectId(UserExt.getUser().getId());
- }
- tDriver.setInsertTime(new Date());
- // TODO getId
- tDriver.setInsertUser(UserExt.getUser().getId());
-// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
- // TODO ShiroKit.md5(tDriver.getPassword()
-
- tDriver.setPassword(SecureUtil.md5(tDriver.getPassword()));
- Driver driver = new Driver();
- BeanUtils.copyProperties(tDriver,driver);
- driver.setAccount(tDriver.getPhone());
- Integer insert = driverClient.insert(driver);
-
-// tDriverService.insert(tDriver);
-
- //添加经营业务
- String[] serverArray = serverBox.split(",");
- for (int i=0;i<serverArray.length;i++){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(Integer.valueOf(serverArray[i]));
- driverServiceClient.insert(service);
-
- if (3 == Integer.valueOf(serverArray[i])){
- //添加线路
-// if (SinataUtil.isNotEmpty(lineStr)){
-// addLine(lineStr,tDriver.getId());
-// }
- }
- }
-
- return SUCCESS_TIP;
- }
-
-// /**
-// * 添加线路
-// * @param subArr
-// * @param id
-// */
-// public void addLine(String subArr,Integer id){
-// JSONArray jsonArray = JSON.parseArray(subArr);
-// int size = jsonArray.size();
-// for (int i = 0; i < size; i++){
-// JSONObject jsonObject = jsonArray.getJSONObject(i);
-// TDriverLine line = new TDriverLine();
-// line.setCreateTime(new Date());
-// line.setAddTime(jsonObject.getString("time"));
-// line.setLineId(jsonObject.getInteger("lineId"));
-// line.setDriverId(id);
-// tDriverLineService.insert(line);
-// }
-// }
-
-
- /**
- * 删除司机审核列表
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tDriverId) {
- DriverInfoRes driver = driverClient.getDriver(tDriverId);
- driver.setFlag(3);
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- return SUCCESS_TIP;
- }
- /**
- * 操作司机状态
- */
- @RequestMapping(value = "/optDriver")
- @ResponseBody
- public Object optDriver(@RequestParam Integer driverId,@RequestParam String remark,@RequestParam Integer optType) {
- if (SinataUtil.isNotEmpty(driverId) && SinataUtil.isNotEmpty(optType)){
- DriverInfoRes tDriver = driverClient.getDriver(driverId);
-// TDriver tDriver = tDriverService.selectById(driverId);
- if (1 == optType){ //解冻
- tDriver.setAuthState(2);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoCompanyStat();
-// pushMinistryOfTransportUtil.baseInfoDriver(driverId);
-// }
-// }
-// }).start();
- }else if (2 == optType){ //冻结
- tDriver.setAuthState(3);
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoCompanyStat();
-// pushMinistryOfTransportUtil.baseInfoDriver(driverId);
-// }
-// }
-// }).start();
- }
- tDriver.setRemark(remark);
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(tDriver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 修改司机审核列表
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TDriverReqs tDrivers, String serverBox, Integer sex, String lineStr, Integer roleType, Integer companyType, Integer oneId, Integer twoId, Integer franchiseeId) throws ParseException {
-// TDriver obj = tDriverService.selectById(tDriver.getId());
-
- TDriver tDriver = new TDriver();
- BeanUtils.copyProperties(tDrivers,tDriver);
-
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-
-// tDriver.setGetDriverLicenseDate(simpleDateFormat.parse(tDrivers.getGetDriverLicenseDate()));
-// tDriver.setDriverLicenseOn(simpleDateFormat.parse(tDrivers.getDriverLicenseOn()));
-// tDriver.setDriverLicenseOff(simpleDateFormat.parse(tDrivers.getDriverLicenseOff()));
-// tDriver.setNetworkCarlssueDate(simpleDateFormat.parse(tDrivers.getNetworkCarlssueDate()));
-//
-// tDriver.setGetNetworkCarProofDate(simpleDateFormat.parse(tDrivers.getGetNetworkCarProofDate()));
-//
-// tDriver.setNetworkCarProofOn(simpleDateFormat.parse(tDrivers.getNetworkCarProofOn()));
-// tDriver.setNetworkCarProofOff(simpleDateFormat.parse(tDrivers.getNetworkCarProofOff()));
-// tDriver.setRegisterDate(simpleDateFormat.parse(tDrivers.getRegisterDate()));
-// tDriver.setContractOn(simpleDateFormat.parse(tDrivers.getContractOn()));
-// tDriver.setContractOff(simpleDateFormat.parse(tDrivers.getContractOff()));
-
-
-
-
- DriverInfoRes obj = driverClient.getDriver(tDriver.getId());
-
- if (!obj.getPhone().equals(tDriver.getPhone())){
- //判断登录账户是否重复
-// int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3"));
- int count = driverClient.selectCount(new DriverSelectCountReq(tDriver.getPhone(),new Integer[]{1,2,3},null,null,null,null));
- if (count > 0){
- return "error";
- }
- }
- if (1 == roleType){ //平台
- if (2 == companyType.intValue()){
- if (SinataUtil.isNotEmpty(oneId)){
- tDriver.setCompanyId(oneId);
- }
- if (SinataUtil.isNotEmpty(twoId)){
- tDriver.setFranchiseeId(twoId);
- }
- }else if (1 == companyType.intValue()){
-// TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
- CompanyInfoRes company = companyClient.queryByTypeCompany(1).get(0);
- tDriver.setCompanyId(company.getId());
- tDriver.setFranchiseeId(franchiseeId);
- }
- }else if (2 == roleType){ //分公司
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tDriver.setCompanyId(UserExt.getUser().getObjectId());
- }
- if (SinataUtil.isNotEmpty(franchiseeId)){
- tDriver.setFranchiseeId(franchiseeId);
- }
- }else if (3 == roleType){ //加盟商
-// TCompany tCompany = tCompanyService.selectById();
- CompanyInfoRes tCompany = companyClient.queryById(UserExt.getUser().getObjectId());
-
- if (SinataUtil.isNotEmpty(tCompany)){
- tDriver.setCompanyId(tCompany.getSuperiorId());
- }
- if (SinataUtil.isNotEmpty(UserExt.getUser().getObjectId())){
- tDriver.setFranchiseeId(UserExt.getUser().getObjectId());
- }
- }
- tDriver.setUpdateTime(new Date());
- tDriver.setUpdateUser(UserExt.getUser().getId());
- tDriver.setPassword(SecureUtil.md5(tDriver.getPassword()));
-// tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(tDriver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
-// tDriverService.updateById(tDriver);
-
- //删除业务
-// tDriverServiceService.delete(new EntityWrapper<TDriverService>().eq("driverId",tDriver.getId()));
- driverServiceClient.deleteById(tDriver.getId());
- //删除线路
-// tDriverLineService.delete(new EntityWrapper<TDriverLine>().eq("driverId",tDriver.getId()));
-
- //添加经营业务
- String[] serverArray = serverBox.split(",");
- for (int i=0;i<serverArray.length;i++){
- TDriverService service = new TDriverService();
- service.setDriverId(tDriver.getId());
- service.setType(Integer.valueOf(serverArray[i]));
-// tDriverServiceService.insert(service);
- driverServiceClient.insert(service);
-
- if (3 == Integer.valueOf(serverArray[i])){
- //添加线路
- if (SinataUtil.isNotEmpty(lineStr)){
-// addLine(lineStr,tDriver.getId());
- }
- }
- }
-
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.baseInfoDriver(tDriver.getId());
-// }
-// }
-// }).start();
-
- return SUCCESS_TIP;
- }
-
- /**
- * 下载模板
- * @param request
- * @param response
- */
- @RequestMapping(value = "/uploadDriverModel")
- public void uploadDriverModel(HttpServletRequest request, HttpServletResponse response) {
- // 表格数据【封装】
- List<List<String>> dataList = new ArrayList<List<String>>();
-
- String title = "";
-
- // 首行【封装】
- List<String> shellList = new ArrayList<String>();
- if (UserExt.getUser().getRoleType() == 1){
- title = "平台导入司机模板";
-
- shellList.add("司机名称");
- shellList.add("所属机构[平台司机/加盟司机]");
- shellList.add("所属分公司[提示:加盟司机选填]");
- shellList.add("所属加盟商[提示:加盟司机选填]");
- shellList.add("性别[男/女]");
- shellList.add("驾驶证号码");
- shellList.add("驾龄");
- shellList.add("身份证号");
- shellList.add("居住地址");
- shellList.add("经营业务:摩托车[是/否]");
- shellList.add("经营业务:同城快送[是/否]");
- shellList.add("登录账号[手机号]");
- shellList.add("登录密码[密码长度为6-18]");
- }else if (UserExt.getUser().getRoleType() == 2){
- title = "分公司导入司机模板";
- shellList.add("司机名称");
- shellList.add("所属加盟商[选填]");
- shellList.add("性别[男/女]");
- shellList.add("驾驶证号码");
- shellList.add("驾龄");
- shellList.add("身份证号");
- shellList.add("居住地址");
- shellList.add("经营业务:摩托车[是/否]");
- shellList.add("经营业务:同城快送[是/否]");
- shellList.add("登录账号[手机号]");
- shellList.add("登录密码[密码长度为6-18]");
- }else if (UserExt.getUser().getRoleType() == 3){
- title = "加盟商导入司机模板";
-
- shellList.add("司机名称");
- shellList.add("性别[男/女]");
- shellList.add("驾驶证号码");
- shellList.add("驾龄");
- shellList.add("身份证号");
- shellList.add("居住地址");
- shellList.add("经营业务:摩托车[是/否]");
- shellList.add("经营业务:同城快送[是/否]");
- shellList.add("登录账号[手机号]");
- shellList.add("登录密码[密码长度为6-18]");
- }
- dataList.add(shellList);
-
- try {
- // 调用工具类进行导出
- ExcelExportUtil.easySheet(title+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), title, dataList, request, response);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 导入操作
- * @param request
- * @return
- */
- @RequestMapping(value="/exportDriver",method = RequestMethod.POST)
- @ResponseBody
- public Object exportDriver(HttpServletRequest request){
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
- try {
- if (UserExt.getUser().getRoleType() == 1){
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //司机名称
- String zero = null;
- if (SinataUtil.isNotEmpty(cell0)){
- zero = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell1 = row.getCell(1); //所属机构[平台司机/加盟司机]
- String one = null;
- if (SinataUtil.isNotEmpty(cell1)){
- one = String.valueOf(cell1.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(2); //所属分公司[提示:加盟司机选填]
- String two = null;
- if (SinataUtil.isNotEmpty(cell2)){
- two = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(3); //所属加盟商[提示:加盟司机选填]
- String three = null;
- if (SinataUtil.isNotEmpty(cell3)){
- three = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(4); //性别[男/女]
- String four = null;
- if (SinataUtil.isNotEmpty(cell4)){
- four = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(5); //驾驶证号码
- String five = null;
- if (SinataUtil.isNotEmpty(cell5)){
- cell5.setCellType(Cell.CELL_TYPE_STRING);
- five = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(6); //驾龄
- String six = null;
- if (SinataUtil.isNotEmpty(cell6)){
- cell6.setCellType(Cell.CELL_TYPE_STRING);
- six = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
- Cell cell7 = row.getCell(7); //身份证号
- String seven = null;
- if (SinataUtil.isNotEmpty(cell7)){
- cell7.setCellType(Cell.CELL_TYPE_STRING);
- seven = String.valueOf(cell7.getStringCellValue()).trim();
- }
-
- Cell cell8 = row.getCell(8); //居住地址
- String eight = null;
- if (SinataUtil.isNotEmpty(cell8)){
- cell8.setCellType(Cell.CELL_TYPE_STRING);
- eight = String.valueOf(cell8.getStringCellValue()).trim();
- }
-
-
- Cell cell11 = row.getCell(9); //经营业务:专车[是/否]
- String eleven = null;
- if (SinataUtil.isNotEmpty(cell11)){
- cell11.setCellType(Cell.CELL_TYPE_STRING);
- eleven = String.valueOf(cell11.getStringCellValue()).trim();
- }
-
- Cell cell12 = row.getCell(10); //经营业务:专车[是/否]
- String twelve = null;
- if (SinataUtil.isNotEmpty(cell12)){
- cell12.setCellType(Cell.CELL_TYPE_STRING);
- twelve = String.valueOf(cell12.getStringCellValue()).trim();
- }
-
- Cell cell13 = row.getCell(11); //经营业务:跨城出行[是/否]
- String thirteen = null;
- if (SinataUtil.isNotEmpty(cell13)){
- cell13.setCellType(Cell.CELL_TYPE_STRING);
- thirteen = String.valueOf(cell13.getStringCellValue()).trim();
- }
-
- Cell cell14 = row.getCell(12); //经营业务:小件同城物流[是/否]
- String fourteen = null;
- if (SinataUtil.isNotEmpty(cell14)){
- cell14.setCellType(Cell.CELL_TYPE_STRING);
- fourteen = String.valueOf(cell14.getStringCellValue()).trim();
- }
-
-
-
- if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six)
- || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
- || SinataUtil.isEmpty(fourteen) ){
- return new ErrorTip(500, "单元格不能为空");
- }else{
- //判断账号是否存在
-// int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", seventeen).in("authState", "1,2,3").ne("flag", 3));
- int count = driverClient.selectCount(new DriverSelectCountReq(thirteen,new Integer[]{1,2,3},3,null,null,null));
- if (count > 0){
- continue;
- }
-
- //判断所属机构
- if (!one.equals("平台司机") && !one.equals("加盟司机")){
- return new ErrorTip(500, "所属机构内容不正确");
- }
- //判断性别
- if (!four.equals("男") && !four.equals("女")){
- return new ErrorTip(500, "性别内容不正确");
- }
- //判断经营业务【摩托车】
- if (!eleven.equals("是") && !eleven.equals("否")){
- return new ErrorTip(500, "经营业务【摩托车】内容不正确");
- }
- //判断经营业务【同城快送】
- if (!twelve.equals("是") && !twelve.equals("否")){
- return new ErrorTip(500, "经营业务【同城快送】内容不正确");
- }
- //判断驾龄
- if (!isInteger(six)){
- return new ErrorTip(500, "驾龄格式不正确");
- }
- //判断手机号
- //判断登录密码
-
- //查找平台公司
-// TCompany platCompany = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", "3").last(" limit 1"));
-// Company platCompany =companyClient.selectList(new QueryWrapper<Company>().eq("type", 1).notIn("flag", "3").last(" limit 1")).get(0);
- Company platCompany =companyClient.getCompanyByTypeAndFlag(new CompanyQueryStateAndFlgReq(1,3));
- Integer companyId = platCompany.getId();
- Integer franchiseeId = 0;
- if ("加盟司机".equals(one)){
- //判断所属分公司是否存在
- if (SinataUtil.isNotEmpty(two)){
- Company company = companyClient.selectList(new QueryWrapper<Company>().eq("name", two).eq("type", 2).notIn("flag", "3").last(" limit 1")).get(0);
- if (SinataUtil.isNotEmpty(company)){
- companyId = company.getId();
- //判断加盟商是否存在
- if (SinataUtil.isNotEmpty(three)){
- Company franchisee = companyClient.selectList(new QueryWrapper<Company>().eq("superiorId",company.getId()).eq("name", three).eq("type", 3).notIn("flag", "3").last(" limit 1")).get(0);
- if (SinataUtil.isNotEmpty(franchisee)){
- franchiseeId = franchisee.getId();
- }
- }
- }
- }
- }
- TDriver driver = new TDriver();
- driver.setAccount(thirteen);
- driver.setPhone(thirteen);
-
- driver.setPassword(SecureUtil.md5(fourteen));
-
- driver.setName(zero);
- if ("男".equals(four)){
- driver.setSex(1);
- }else if ("女".equals(four)){
- driver.setSex(2);
- }
- driver.setIdCard(seven);
- driver.setDriverAge(Integer.valueOf(six));
- driver.setDriveCard(five);
- if ("平台司机".equals(one)){
- driver.setIsPlatCar(1);
- }else if ("加盟司机".equals(one)){
- driver.setIsPlatCar(2);
- }
- driver.setCompanyId(companyId);
- driver.setFranchiseeId(franchiseeId);
- driver.setState(2);
- driver.setAuthState(2);
- driver.setFlag("1");
- driver.setInsertUser(UserExt.getUser().getId());
- driver.setInsertTime(new Date());
- driver.setAddType(2);
- driver.setAddObjectId(UserExt.getUser().getObjectId());
- if(SinataUtil.isNotEmpty(eight)){
- driver.setDriverAddress(eight);
- }
- Driver driver1 = new Driver();
- BeanUtils.copyProperties(driver,driver1);
- Integer insert = driverClient.insert(driver1);
-
- //添加专车服务模式
- if ("是".equals(eleven)){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(1);
- driverServiceClient.insert(service);
- }
- //添加跨城出行服务模式
- if ("是".equals(twelve)){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(4);
- driverServiceClient.insert(service);
- }
- }
- }
- }else if (UserExt.getUser().getRoleType() == 2){
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //司机名称
- String zero = null;
- if (SinataUtil.isNotEmpty(cell0)){
- zero = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell1 = row.getCell(1); //所属加盟商[选填]
- String one = null;
- if (SinataUtil.isNotEmpty(cell1)){
- one = String.valueOf(cell1.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(2); //性别[男/女]
- String two = null;
- if (SinataUtil.isNotEmpty(cell2)){
- two = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(3); //驾驶证号码
- String three = null;
- if (SinataUtil.isNotEmpty(cell3)){
- three = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(4); //驾龄
- String four = null;
- if (SinataUtil.isNotEmpty(cell4)){
- four = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(5); //身份证号
- String five = null;
- if (SinataUtil.isNotEmpty(cell5)){
- five = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(6); //居住地址
- String six = null;
- if (SinataUtil.isNotEmpty(cell6)){
- six = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
-
- Cell cell9 = row.getCell(9); //经营业务:专车[是/否]
- String nine = null;
- if (SinataUtil.isNotEmpty(cell9)){
- nine = String.valueOf(cell9.getStringCellValue()).trim();
- }
-
- Cell cell10 = row.getCell(10); //经营业务:出租车[是/否]
- String ten = null;
- if (SinataUtil.isNotEmpty(cell10)){
- ten = String.valueOf(cell10.getStringCellValue()).trim();
- }
-
- Cell cell11 = row.getCell(11); //经营业务:跨城出行[是/否]
- String eleven = null;
- if (SinataUtil.isNotEmpty(cell11)){
- eleven = String.valueOf(cell11.getStringCellValue()).trim();
- }
-
- Cell cell12 = row.getCell(12); //经营业务:小件同城物流[是/否]
- String twelve = null;
- if (SinataUtil.isNotEmpty(cell12)){
- twelve = String.valueOf(cell12.getStringCellValue()).trim();
- }
-
-
-
-
- if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(five)
- || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) ){
- return new ErrorTip(500, "单元格不能为空");
- }else{
- //判断账号是否存在
-// int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fifteen).in("authState", "1,2,3").ne("flag", 3));
- int count = driverClient.selectCount(new DriverSelectCountReq(eleven,new Integer[]{1,2,3},3,null,null,null));
- if (count > 0){
- continue;
- }
- //判断性别
- if (!two.equals("男") && !two.equals("女")){
- return new ErrorTip(500, "性别内容不正确");
- }
- //判断经营业务【专车】
- if (!nine.equals("是") && !nine.equals("否")){
- return new ErrorTip(500, "经营业务【摩托车】内容不正确");
- }
- //判断经营业务【出租车】
- if (!ten.equals("是") && !ten.equals("否")){
- return new ErrorTip(500, "经营业务【同城快送】内容不正确");
- }
- //判断驾龄
- if (!isInteger(four)){
- return new ErrorTip(500, "驾龄格式不正确");
- }
- //判断手机号
- //判断登录密码
- if (!isPassword(twelve)){
- return new ErrorTip(500, "登录密码格式不正确");
- }
- //查找平台公司
- Integer companyId = UserExt.getUser().getObjectId();
- Integer franchiseeId = 0;
- //判断所属分公司是否存在
- if (SinataUtil.isNotEmpty(one)){
- Company franchisee = companyClient.selectList(new QueryWrapper<Company>().eq("superiorId",companyId).eq("name", one).eq("type", 3).notIn("flag", "3").last(" limit 1")).get(0);
-// TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",companyId).eq("name", one).eq("type", 3).notIn("flag", "3").last(" limit 1"));
- if (SinataUtil.isNotEmpty(franchisee)){
- franchiseeId = franchisee.getId();
- }
- }
-
- TDriver driver = new TDriver();
- driver.setAccount(eleven);
- driver.setPhone(eleven);
- driver.setPassword(SecureUtil.md5(twelve));
- driver.setName(zero);
- if ("男".equals(two)){
- driver.setSex(1);
- }else if ("女".equals(two)){
- driver.setSex(2);
- }
- driver.setIdCard(five);
- driver.setDriverAge(Integer.valueOf(four));
- driver.setDriveCard(three);
- driver.setIsPlatCar(2);
- driver.setCompanyId(companyId);
- driver.setFranchiseeId(franchiseeId);
- driver.setState(1);
- driver.setAuthState(1);
- driver.setFlag("1");
- driver.setInsertUser(UserExt.getUser().getId());
- driver.setInsertTime(new Date());
- driver.setAddType(3);
- driver.setAddObjectId(UserExt.getUser().getObjectId());
- if (SinataUtil.isNotEmpty(six)){
- driver.setDriverAddress(six);
- }
- Driver driver1 = new Driver();
- BeanUtils.copyProperties(driver,driver1);
- Integer insert = driverClient.insert(driver1);
-
- //添加专车服务模式
- if ("是".equals(nine)){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(1);
- driverServiceClient.insert(service);
- }
- //添加出租车服务模式
- if ("是".equals(ten)){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(4);
- driverServiceClient.insert(service);
- }
-
- }
- }
- }else if (UserExt.getUser().getRoleType() == 3){
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //司机名称
- String zero = null;
- if (SinataUtil.isNotEmpty(cell0)){
- zero = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(1); //性别[男/女]
- String one = null;
- if (SinataUtil.isNotEmpty(cell2)){
- one = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(2); //驾驶证号码
- String two = null;
- if (SinataUtil.isNotEmpty(cell3)){
- two = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(3); //驾龄
- String three = null;
- if (SinataUtil.isNotEmpty(cell4)){
- three = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(4); //身份证号
- String four = null;
- if (SinataUtil.isNotEmpty(cell5)){
- four = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(5); //居住地址
- String five = null;
- if (SinataUtil.isNotEmpty(cell6)){
- five = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
-
- Cell cell9 = row.getCell(8); //经营业务:专车[是/否]
- String eight = null;
- if (SinataUtil.isNotEmpty(cell9)){
- eight = String.valueOf(cell9.getStringCellValue()).trim();
- }
-
- Cell cell10 = row.getCell(9); //经营业务:出租车[是/否]
- String nine = null;
- if (SinataUtil.isNotEmpty(cell10)){
- nine = String.valueOf(cell10.getStringCellValue()).trim();
- }
-
- Cell cell11 = row.getCell(10); //经营业务:跨城出行[是/否]
- String ten = null;
- if (SinataUtil.isNotEmpty(cell11)){
- ten = String.valueOf(cell11.getStringCellValue()).trim();
- }
-
- Cell cell12 = row.getCell(11); //经营业务:小件同城物流[是/否]
- String eleven = null;
- if (SinataUtil.isNotEmpty(cell12)){
- eleven = String.valueOf(cell12.getStringCellValue()).trim();
- }
-
-
- if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
- || SinataUtil.isEmpty(eight)
- || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
- || SinataUtil.isEmpty(eleven) ){
- return new ErrorTip(500, "单元格不能为空");
- }else{
- //判断账号是否存在
- int count = driverClient.selectCount(new DriverSelectCountReq(ten,new Integer[]{1,2,3},3,null,null,null));
- if (count > 0){
- continue;
- }
- //判断性别
- if (!one.equals("男") && !one.equals("女")){
- return new ErrorTip(500, "性别内容不正确");
- }
- //判断经营业务【专车】
- if (!eight.equals("是") && !eight.equals("否")){
- return new ErrorTip(500, "经营业务【摩托车】内容不正确");
- }
- //判断经营业务【出租车】
- if (!nine.equals("是") && !nine.equals("否")){
- return new ErrorTip(500, "经营业务【同城快送】内容不正确");
- }
- //判断驾龄
- if (!isInteger(three)){
- return new ErrorTip(500, "驾龄格式不正确");
- }
- //判断手机号
- //判断登录密码
- if (!isPassword(eleven)){
- return new ErrorTip(500, "登录密码格式不正确");
- }
- //查找平台公司
- Integer companyId = 0;
- Integer franchiseeId = 0;
- CompanyInfoRes franchisee = companyClient.queryById(11);
- if (SinataUtil.isNotEmpty(franchisee)){
- companyId = franchisee.getSuperiorId();
- franchiseeId = franchisee.getId();
- }
- if (companyId == 0 && franchiseeId == 0){
- return new ErrorTip(500, "当前登录账户上级分公司不能为空");
- }
-
- TDriver driver = new TDriver();
- driver.setAccount(ten);
- driver.setPhone(ten);
- driver.setPassword(SecureUtil.md5(eleven));
- driver.setName(zero);
- if ("男".equals(one)){
- driver.setSex(1);
- }else if ("女".equals(one)){
- driver.setSex(2);
- }
- driver.setIdCard(four);
- driver.setDriverAge(Integer.valueOf(three));
- driver.setDriveCard(two);
- driver.setIsPlatCar(2);
- driver.setCompanyId(companyId);
- driver.setFranchiseeId(franchiseeId);
- driver.setState(1);
- driver.setAuthState(1);
- driver.setFlag("1");
- driver.setInsertUser(UserExt.getUser().getId());
- driver.setInsertTime(new Date());
- driver.setAddType(4);
- driver.setAddObjectId(UserExt.getUser().getObjectId());
- if (SinataUtil.isNotEmpty(five)){
- driver.setDriverAddress(five);
- }
- Driver driver1 = new Driver();
- BeanUtils.copyProperties(driver,driver1);
- Integer insert = driverClient.insert(driver1);
-
-// tDriverService.insert(driver);
-
- //添加专车服务模式
- if ("是".equals(eight)){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(1);
- driverServiceClient.insert(service);
- }
- //添加出租车服务模式
- if ("是".equals(nine)){
- TDriverService service = new TDriverService();
- service.setDriverId(insert);
- service.setType(4);
- driverServiceClient.insert(service);
- }
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return SUCCESS_TIP;
- }
-
-
-
-
-
- /**
- * 验证是否可以字符转为整数
- * @param str
- * @return
- */
- public static boolean isInteger(String str) {
- try{
- String reg = "^[0-9]\\d*$";
- boolean flag = str.matches(reg);
- return flag;
- }catch(NumberFormatException e) {
- System.out.println("异常：\"" + str + "\"...");
- return false;
- }
- }
- /**
- * 验证手机号格式是否正确
- * @param str
- * @return
- */
- /**
- * 验证密码长度是否正确
- * @param str
- * @return
- */
- public static boolean isPassword(String str) {
- try{
- String reg = "^.{6,18}$";
- boolean flag = str.matches(reg);
- return flag;
- }catch(NumberFormatException e) {
- System.out.println("异常：\"" + str + "\"...");
- return false;
- }
- }
-
- /**
- * 导出司机信息
- */
- @RequestMapping(value = "/outDriver")
- public void outDriver(HttpServletRequest request, HttpServletResponse response) {
- User user = UserExt.getUser();
-// List<Map<String,Object>> listMap = driverClient.getDriverListNoPage(new QueryDriverNoPageReq(user.getRoleType(),user.getObjectId()));
- Page<Map<String, Object>> driverList = driverClient.getDriverList(new QueryDriverListReq(100000000, 0, user.getRoleType(), user.getObjectId(), null, null, null, null, null, null, null));
- List<Map<String, Object>> listMap = driverList.getRecords();
- // 表格数据【封装】
- List<List<String>> dataList = new ArrayList<>();
-
- //第一行显示【封装】
- List<String> twoList = new ArrayList<String>();
- twoList.add("总计:");
- twoList.add(String.valueOf(listMap.size())+"条");
- dataList.add(twoList);
-
-
-
- // 列【封装】
- List<String> shellList = new ArrayList<String>();
- shellList.add("添加时间");
- shellList.add("姓名");
- shellList.add("头像");
- shellList.add("手机号");
- shellList.add("性别");
- shellList.add("所属机构");
- shellList.add("当前车辆");
- shellList.add("服务模式");
- shellList.add("评分");
- shellList.add("司机等级");
- shellList.add("历史接单数");
- shellList.add("历史订单总金额");
- shellList.add("当前钱包余额");
- shellList.add("状态");
- dataList.add(shellList);
-
- for (Map<String,Object> object : listMap){
- // 详细数据列【封装】
- shellList = new ArrayList<String>();
- if(SinataUtil.isNotEmpty(object.get("insertTime"))){
- Date insertTime1 = new Date((Long) object.get("insertTime"));
- System.out.println(insertTime1);
- shellList.add(DateUtil.formatDate(insertTime1, "YYYY-MM-dd HH:mm:ss"));
- }else{
- shellList.add("-");
- }
-
- if(SinataUtil.isNotEmpty(object.get("driverName"))){
- shellList.add(object.get("driverName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("headImgUrl"))){
- shellList.add(object.get("headImgUrl").toString());
- }else{
- shellList.add("-");
- }
-
-
- if(SinataUtil.isNotEmpty(object.get("phone"))){
- shellList.add(object.get("phone").toString());
- }else{
- shellList.add("-");
- }
-
-
- if(SinataUtil.isNotEmpty(object.get("sex"))){
- shellList.add((object.get("sex").toString()).equals("1")?"男":"女");
- }else{
- shellList.add("-");
- }
-
- if(SinataUtil.isNotEmpty(object.get("name"))){
- shellList.add(object.get("name").toString());
- }else{
- shellList.add("-");
- }
-
-
-
- if(SinataUtil.isNotEmpty(object.get("carId"))){
- shellList.add(object.get("carId").toString());
- }else{
- shellList.add("-");
- }
-
- if(SinataUtil.isNotEmpty(object.get("types"))){
- shellList.add(object.get("types").toString());
- }else{
- shellList.add("-");
- }
-
-
-
- if(SinataUtil.isNotEmpty(object.get("score"))){
- shellList.add(object.get("score").toString());
- }else{
- shellList.add("-");
- }
-
-
-
- if(SinataUtil.isNotEmpty(object.get("level"))){
- shellList.add(object.get("level").toString());
- }else{
- shellList.add("0");
- }
-
-
- if(SinataUtil.isNotEmpty(object.get("orderNum"))){
- shellList.add(object.get("orderNum").toString());
- }else{
- shellList.add("0");
- }
-
-
-
- if(SinataUtil.isNotEmpty(object.get("money"))){
- shellList.add(object.get("money").toString());
- }else{
- shellList.add("0");
- }
-
-
-
- if(SinataUtil.isNotEmpty(object.get("balance"))){
- shellList.add(object.get("balance").toString());
- }else{
- shellList.add("0");
- }
- if(SinataUtil.isNotEmpty(object.get("authState"))){
- shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));
- }else{
- shellList.add("-");
- }
- dataList.add(shellList);
- }
- try {
- // 调用工具类进行导出
- ExcelExportUtil.easySheet("司机信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "司机信息导出记录", dataList,request, response);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverVerifyVerifyController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverVerifyVerifyController.java
deleted file mode 100644
index 691bf4c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TDriverVerifyVerifyController.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoReq;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.mapper.DriverVerifyMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.DriverVerify;
-import com.dsh.guns.modular.system.model.TCar;
-import com.dsh.guns.modular.system.model.TCarService;
-import com.dsh.guns.modular.system.service.ITCarService;
-import com.dsh.guns.modular.system.service.ITCarServiceService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 司机审核列表控制器
- *
- * @author fengshuonan
- * @Date 2020-06-04 17:35:28
- */
-@Controller
-@RequestMapping("/tDriverVerify")
-public class TDriverVerifyVerifyController extends BaseController {
-
- private String PREFIX = "/system/tDriver/";
-
-
- @Autowired
- private DriverVerifyMapper driverVerifyMapper;
-
-
-
- /**
- * 跳转到司机审核列表首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tDriverVerify.html";
- }
-
- /**
- * 跳转到审核通过司机首页
- */
- @RequestMapping("/DriverVerify")
- public String yesDriverVerify() {
- return PREFIX + "DriverVerify.html";
- }
-
-
- @Autowired
- private ITCarServiceService carServiceService;
-
- @Autowired
- private ITCarService carService;
- /**
- * 跳转到修改审核司机
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String companyName,
- String phone,
- String account,
- Integer state) {
- String sTime=null;
- String eTime=null;
- if(insertTime!=null && !"".equals(insertTime)){
- sTime=insertTime.split(" - ")[0]+" 00:01";
- eTime=insertTime.split(" - ")[1]+" 23:59";
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-
- List<Map<String,Object>> list = driverVerifyMapper.getList(page,sTime,eTime,companyName,phone,account,state);
- for (Map<String, Object> stringObjectMap : list) {
- Integer driverId = (Integer) stringObjectMap.get("driverId");
- DriverInfoRes driver = driverClient.getDriver(driverId);
- stringObjectMap.put("driverName",driver.getName());
- stringObjectMap.put("headImg",driver.getHeadImgUrl());
- stringObjectMap.put("sex",driver.getSex());
- stringObjectMap.put("age",driver.getDriverAge());
- stringObjectMap.put("driverNumImg",driver.getDriveCardImgUrl());
- Integer newId = (Integer) stringObjectMap.get("newId");
- TCar byId = carService.getById(newId);
- List<TCarService> tCarServices = carServiceService.getBaseMapper().selectList(new LambdaQueryWrapper<TCarService>().eq(TCarService::getCarId, byId.getId()));
- String carServer = null;
- if(tCarServices.size()>1){
- carServer = "3";
- }
- else {
- carServer =tCarServices.get(0).getType().toString();
- }
- stringObjectMap.put("carServer",carServer);
- stringObjectMap.put("newCarId",byId.getCarLicensePlate());
- Integer oldId = (Integer) stringObjectMap.get("oldId");
- if(oldId!=null){
- TCar oldId1 = carService.getById(oldId);
- stringObjectMap.put("oldCarId",oldId1.getCarLicensePlate());
- }else {
- stringObjectMap.put("oldCarId",null);
- }
-
- }
- page.setRecords(list);
- return super.packForBT(page);
- }
-
-
- @RequestMapping(value = "/tDriverVerify_immediately/{id}")
- public Object immediately(@PathVariable Integer id, Model model) {
- DriverVerify driverVerify = driverVerifyMapper.selectById(id);
- String carServer = driverVerify.getCarServer();
- Integer newId1 = driverVerify.getNewId();
- List<TCarService> list = carServiceService.list(new LambdaQueryWrapper<TCarService>().eq(TCarService::getCarId, newId1));
- if(list.size()>1){
- carServer="3";
- }else {
- carServer = list.get(0).getType().toString();
- }
- if(carServer.equals("1")){
- model.addAttribute("carServer","摩托车");
- }else if(carServer.equals("2")){
- model.addAttribute("carServer","同城快送");
- }else if(carServer.equals("3")){
- model.addAttribute("carServer","摩托车、同城快送");
- }
- Integer driverId = driverVerify.getDriverId();
- DriverInfoRes driver = driverClient.getDriver(driverId);
- driverVerify.setDriverName(driver.getName());
- driverVerify.setHeadImg(driver.getHeadImgUrl());
- driverVerify.setSex(driver.getSex()==1?"男":"女");
- driverVerify.setAge(driver.getDriverAge());
- driverVerify.setDriverNumImg(driver.getDriveCardImgUrl());
- Integer newId = driverVerify.getNewId();
- TCar byId = carService.getById(newId);
- driverVerify.setNewCarId(byId.getCarLicensePlate());
- Integer oldId = driverVerify.getOldId();
- if(oldId!=null) {
- TCar oldId1 = carService.getById(oldId);
- driverVerify.setOldCarId(oldId1.getCarLicensePlate());
- }
-
- model.addAttribute("item",driverVerify);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tDriverVerify_edit.html";
- }
-
-
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete( Integer tDriverVerifyId ) {
- DriverVerify driverVerify = driverVerifyMapper.selectById(tDriverVerifyId);
- driverVerify.setState(4);
- driverVerifyMapper.updateById(driverVerify);
- return SUCCESS_TIP;
- }
-
- @Autowired
- private DriverClient driverClient;
- @RequestMapping(value = "/submit")
- @ResponseBody
- public Object submit(Integer id,Integer authState) {
- if (SinataUtil.isNotEmpty(id) && SinataUtil.isNotEmpty(authState)){
- DriverVerify driverVerify = driverVerifyMapper.selectById(id);
- driverVerify.setState(authState);
- if(authState==2){
- TCar tCar = carService.getById(driverVerify.getNewId());
- DriverInfoRes tDriver = driverClient.getDriver(driverVerify.getDriverId());
- tDriver.setCarId(tCar.getId());
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(tDriver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- }
- driverVerifyMapper.updateById(driverVerify);
- }
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeFoundationController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeFoundationController.java
deleted file mode 100644
index c1d5bd7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeFoundationController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TEnsureIncomeFoundation;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeFoundationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2023-04-20 11:04:25
- */
-@Controller
-@RequestMapping("/tEnsureIncomeFoundation")
-public class TEnsureIncomeFoundationController extends BaseController {
-
- private String PREFIX = "/system/tEnsureIncomeFoundation/";
-
- @Autowired
- private ITEnsureIncomeFoundationService tEnsureIncomeFoundationService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tEnsureIncomeFoundation.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tEnsureIncomeFoundation_add")
- public String tEnsureIncomeFoundationAdd() {
- return PREFIX + "tEnsureIncomeFoundation_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tEnsureIncomeFoundation_update/{tEnsureIncomeFoundationId}")
- public String tEnsureIncomeFoundationUpdate(@PathVariable Integer tEnsureIncomeFoundationId, Model model) {
- TEnsureIncomeFoundation tEnsureIncomeFoundation = tEnsureIncomeFoundationService.getById(tEnsureIncomeFoundationId);
- model.addAttribute("item",tEnsureIncomeFoundation);
- LogObjectHolder.me().set(tEnsureIncomeFoundation);
- return PREFIX + "tEnsureIncomeFoundation_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return tEnsureIncomeFoundationService.list(null);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TEnsureIncomeFoundation tEnsureIncomeFoundation) {
- tEnsureIncomeFoundationService.save(tEnsureIncomeFoundation);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tEnsureIncomeFoundationId) {
- tEnsureIncomeFoundationService.removeById(tEnsureIncomeFoundationId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TEnsureIncomeFoundation tEnsureIncomeFoundation) {
- tEnsureIncomeFoundationService.updateById(tEnsureIncomeFoundation);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tEnsureIncomeFoundationId}")
- @ResponseBody
- public Object detail(@PathVariable("tEnsureIncomeFoundationId") Integer tEnsureIncomeFoundationId) {
- return tEnsureIncomeFoundationService.getById(tEnsureIncomeFoundationId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeRuleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeRuleController.java
deleted file mode 100644
index b4536a6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeRuleController.java
+++ /dev/null
@@ -1,519 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsh.course.feignClient.activity.DriverActivityClient;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.SuccessTip;
-import com.dsh.guns.core.exception.ServiceException;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.enums.ActivityTypeEnum;
-import com.dsh.guns.modular.system.enums.RuleStatusEnum;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import com.dsh.guns.modular.system.util.DateUtil;
-import com.dsh.guns.modular.system.util.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2023-04-20 10:57:51
- */
-@Controller
-@RequestMapping("/tEnsureIncomeRule")
-public class TEnsureIncomeRuleController extends BaseController {
-
- private String PREFIX = "/system/tEnsureIncomeRule/";
-
- @Autowired
- private ITEnsureIncomeRuleService tEnsureIncomeRuleService;
- @Autowired
- private ITEnsureIncomeFoundationService tEnsureIncomeFoundationService;
- @Autowired
- private ITEnsureIncomeSpecialService tEnsureIncomeSpecialService;
- @Autowired
- private ITEnsureIncomeSpecialTimeSoltService tEnsureIncomeSpecialTimeSoltService;
- @Autowired
- private DriverActivityClient driverActivityClient;
- @Autowired
- private DriverClient driverClient;
- @Autowired
- private ITAuditRecordService auditRecordService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tEnsureIncomeRule.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tEnsureIncomeRule_add")
- public String tEnsureIncomeRuleAdd(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tEnsureIncomeRule_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tEnsureIncomeRule_update/{tEnsureIncomeRuleId}")
- public String tEnsureIncomeRuleUpdate(@PathVariable Integer tEnsureIncomeRuleId, Model model) {
- TEnsureIncomeRule tEnsureIncomeRule = tEnsureIncomeRuleService.getById(tEnsureIncomeRuleId);
- model.addAttribute("item",tEnsureIncomeRule);
- LogObjectHolder.me().set(tEnsureIncomeRule);
- return PREFIX + "tEnsureIncomeRule_edit.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/tEnsureIncomeRule_immediately/{id}")
- public String sysCouponActivityImmediately(@PathVariable Integer id, Model model) {
- model.addAttribute("id",id);
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tEnsureIncomeRule_immediately.html";
- }
-
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @Transactional(rollbackFor = Exception.class)
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
- TEnsureIncomeRule tEnsureIncomeRule = tEnsureIncomeRuleService.getById(id);
- if (SinataUtil.isNotEmpty(tEnsureIncomeRule)){
- tEnsureIncomeRule.setState(state);
- tEnsureIncomeRule.setRemark(remark);
-
- if(state == 3){
- if(LocalDateTime.now().isBefore(TimeUtil.getDayStart(tEnsureIncomeRule.getStartTime()))){
- tEnsureIncomeRule.setStatus(RuleStatusEnum.NOT_START.getCode());
- }
- if(LocalDateTime.now().isAfter(TimeUtil.getDayStart(tEnsureIncomeRule.getStartTime())) && LocalDateTime.now().isBefore(TimeUtil.getDayEnd(tEnsureIncomeRule.getEndTime()))){
- tEnsureIncomeRule.setStatus(RuleStatusEnum.STARTED.getCode());
- }
- }
-
- tEnsureIncomeRuleService.updateById(tEnsureIncomeRule);
-
- // 添加审核记录
- TAuditRecord tAuditRecord = new TAuditRecord();
- tAuditRecord.setActivityId(id);
- tAuditRecord.setActivityName(tEnsureIncomeRule.getRuleName());
- if(state == 2){
- tAuditRecord.setAuditStatus(3);
- }
- if(state == 3){
- tAuditRecord.setAuditStatus(2);
- }
- tAuditRecord.setAuditTime(new Date());
- tAuditRecord.setAuditUserId(Objects.requireNonNull(UserExt.getUser()).getId());
- tAuditRecord.setRemark(remark);
- tAuditRecord.setActivityType(ActivityTypeEnum.INCOME_RULE.getCode());
- auditRecordService.save(tAuditRecord);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 跳转到详情
- */
- @RequestMapping("/tEnsureIncomeRuleDetail/{tEnsureIncomeRuleId}")
- public String tEnsureIncomeRuleDetail(@PathVariable Integer tEnsureIncomeRuleId, Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- model.addAttribute("tEnsureIncomeRuleId", tEnsureIncomeRuleId);
- TEnsureIncomeRule tEnsureIncomeRule = tEnsureIncomeRuleService.getById(tEnsureIncomeRuleId);
- tEnsureIncomeRule.setExpireTime(tEnsureIncomeRule.getStartTime().toLocalDate() + "-" +tEnsureIncomeRule.getEndTime().toLocalDate());
- model.addAttribute("item",tEnsureIncomeRule);
- LogObjectHolder.me().set(tEnsureIncomeRule);
- // 查询基础时间段配置
- List<TEnsureIncomeFoundation> foundationList = tEnsureIncomeFoundationService.list(Wrappers.lambdaQuery(TEnsureIncomeFoundation.class)
- .eq(TEnsureIncomeFoundation::getEnsureIncomeId, tEnsureIncomeRuleId));
- model.addAttribute("foundationList",foundationList);
- // 查询特殊时间段配置
- List<TEnsureIncomeSpecial> specialList = tEnsureIncomeSpecialService.list(Wrappers.lambdaQuery(TEnsureIncomeSpecial.class)
- .eq(TEnsureIncomeSpecial::getEnsureIncomeId, tEnsureIncomeRuleId));
- for (TEnsureIncomeSpecial tEnsureIncomeSpecial : specialList) {
- tEnsureIncomeSpecial.setStartTimeString(new SimpleDateFormat("yyyy-MM-dd").format(tEnsureIncomeSpecial.getStartTime()));
- List<TEnsureIncomeSpecialTimeSolt> specialTimeSoltList = tEnsureIncomeSpecialTimeSoltService.list(Wrappers.lambdaQuery(TEnsureIncomeSpecialTimeSolt.class)
- .eq(TEnsureIncomeSpecialTimeSolt::getEnsureIncomeSpecialId, tEnsureIncomeSpecial.getId()));
- tEnsureIncomeSpecial.setSpecialTimeSoltList(specialTimeSoltList);
- }
- model.addAttribute("specialList",specialList);
- return PREFIX + "tEnsureIncomeRuleDetail.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String ruleName,String createTime) {
- LambdaQueryWrapper<TEnsureIncomeRule> wrapper = new LambdaQueryWrapper<>();
- if(StringUtils.hasLength(ruleName)){
- wrapper.like(TEnsureIncomeRule::getRuleName,ruleName);
- }
- Date startTimes = null;
- Date endTimes = null;
- if (StringUtils.hasLength(createTime)){
- String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
- wrapper.between(TEnsureIncomeRule::getCreateTime,startTimes,endTimes);
- }
- Integer objectId = Objects.requireNonNull(UserExt.getUser()).getObjectId();
- if(objectId != 1){
- wrapper.eq(TEnsureIncomeRule::getCompanyId, Objects.requireNonNull(UserExt.getUser()).getObjectId());
- }
- wrapper.orderByDesc(TEnsureIncomeRule::getCreateTime);
- List<TEnsureIncomeRule> list = tEnsureIncomeRuleService.list(wrapper);
- for (TEnsureIncomeRule tEnsureIncomeRule : list) {
- tEnsureIncomeRule.setExpireTime(tEnsureIncomeRule.getStartTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd"))
- + "-" + tEnsureIncomeRule.getEndTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")));
- // 计算参与人次
- Integer count = driverActivityClient.queryJoinCount(tEnsureIncomeRule.getId());
- tEnsureIncomeRule.setJoinCount(count);
- }
- return list;
- }
-
- /**
- * 获取司机保底收入列表
- */
- @RequestMapping(value = "/incomeList")
- @ResponseBody
- public Object incomeList(Integer tEnsureIncomeRuleId) {
- if(Objects.isNull(tEnsureIncomeRuleId)){
- return null;
- }
- List<Map<String, Object>> list = driverActivityClient.queryDriverIncomeMoney(tEnsureIncomeRuleId);
- for (Map<String, Object> map : list) {
- DriverInfoRes driver = driverClient.getDriver(Integer.valueOf(String.valueOf(map.get("driverId"))));
- map.put("driverName",driver.getName());
- map.put("driverPhone",driver.getPhone());
- }
- return list;
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @Transactional(rollbackFor = Exception.class)
- @ResponseBody
- public Object add(TEnsureIncomeRule tEnsureIncomeRule,String incomeFoundation,String incomeSpecial){
- Integer language = UserExt.getLanguage();
- if(Objects.isNull(language)){
- language = 1;
- }
-
- int count = tEnsureIncomeRuleService.count(Wrappers.lambdaQuery(TEnsureIncomeRule.class)
- .eq(TEnsureIncomeRule::getRuleName, tEnsureIncomeRule.getRuleName()));
- if(count > 0){
- if(1 == language){
- throw new ServiceException(500,"该活动名称已存在!");
- }
- if(2 == language){
- throw new ServiceException(500,"The activity name already exists!");
- }
- if(3 == language){
- throw new ServiceException(500,"Nama aktivitas sudah ada!");
- }
- }
-
- tEnsureIncomeRule.setStartTime(TimeUtil.getDayStart(TimeUtil.getLocalDateTime(tEnsureIncomeRule.getStartTimeString())));
- Date date_str3 = new Date();
- try {
- Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(tEnsureIncomeRule.getEndTimeString());
- Map<String, Date> monthDate = TimeUtil.getMonthDate(parse);
- Date last = monthDate.get("last");
- String format = new SimpleDateFormat("yyyy-MM-dd").format(last);
- date_str3 = DateUtil.getDate_str3(format + " 23:59:59");
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- tEnsureIncomeRule.setEndTime(TimeUtil.dateToLocalDateTime(date_str3));
-
- tEnsureIncomeRule.setCreateTime(LocalDateTime.now());
-
-// if(LocalDateTime.now().isBefore(TimeUtil.getDayStart(tEnsureIncomeRule.getStartTime()))){
-// tEnsureIncomeRule.setStatus(RuleStatusEnum.NOT_START.getCode());
-// }
-// if(LocalDateTime.now().isAfter(TimeUtil.getDayStart(tEnsureIncomeRule.getStartTime())) && LocalDateTime.now().isBefore(TimeUtil.getDayEnd(tEnsureIncomeRule.getEndTime()))){
-// tEnsureIncomeRule.setStatus(RuleStatusEnum.STARTED.getCode());
-// }
- if(LocalDateTime.now().isAfter(TimeUtil.getDayEnd(tEnsureIncomeRule.getEndTime()))){
- if(1 == language){
- throw new ServiceException(500,"有效期无效,请选择正确的有效期!");
- }
- if(2 == language){
- throw new ServiceException(500,"The validity period is invalid. Please select the correct validity period!");
- }
- if(3 == language){
- throw new ServiceException(500,"Periode validitas tidak valid. Please select the correct validity period!");
- }
- }
- tEnsureIncomeRule.setCompanyId(UserExt.getUser().getObjectId());
- // 活动主数据
- tEnsureIncomeRuleService.save(tEnsureIncomeRule);
-
- // 活动基础时间配置
- JSONArray jsonArray = JSONObject.parseArray(incomeFoundation);
- List<TEnsureIncomeFoundation> foundationList = new ArrayList<>();
- Map<String,String> incomeMap = new HashMap<>();
- Map<String,LocalTime> incomeTimeMap = new HashMap<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- String startTime1 = jsonArray.getJSONObject(i).getString("startTime");
- String endTime1 = jsonArray.getJSONObject(i).getString("endTime");
- String startTime = incomeMap.get(startTime1);
- String endTime = incomeMap.get(endTime1);
-
- if(StringUtils.hasLength(startTime) && StringUtils.hasLength(endTime)){
- if(1 == language){
- throw new ServiceException(500,"基础时间段配置存在重复时间段!");
- }
- if(2 == language){
- throw new ServiceException(500,"There are duplicate time periods in the basic time period configuration!");
- }
- if(3 == language){
- throw new ServiceException(500,"Ada periode waktu duplikasi dalam konfigurasi periode waktu dasar!");
- }
- }
-
- LocalTime localStart= LocalTime.parse(startTime1+":00");
- LocalTime localEnd= LocalTime.parse(endTime1+":00");
- for (int j = 0; j < incomeTimeMap.entrySet().size(); j++) {
- LocalTime localStartTime = incomeTimeMap.get("startTime" + j);
- LocalTime localEndTime = incomeTimeMap.get("endTime" + j);
- if(Objects.nonNull(localStartTime) && Objects.nonNull(localEndTime)){
- if((localStart.isAfter(localStartTime) && localStart.isBefore(localEndTime))
- || (localEnd.isAfter(localStartTime) && localEnd.isBefore(localEndTime))
- || (localStart.isAfter(localStartTime) && localEnd.isBefore(localEndTime))
- || (localStart.isBefore(localStartTime) && localEnd.isAfter(localEndTime))
- || (localStart.compareTo(localStartTime) == 0)
- || (localEnd.compareTo(localEndTime) == 0)){
- if(1 == language){
- throw new ServiceException(500,"基础时间段配置存在重合时间段!");
- }
- if(2 == language){
- throw new ServiceException(500,"The basic time period configuration has overlapping time periods!");
- }
- if(3 == language){
- throw new ServiceException(500,"Konfigurasi peristiwa waktu dasar memiliki peristiwa waktu yang meliputi!");
- }
- }
- }
- }
-
- TEnsureIncomeFoundation tEnsureIncomeFoundation = new TEnsureIncomeFoundation();
- tEnsureIncomeFoundation.setEnsureIncomeId(tEnsureIncomeRule.getId());
- tEnsureIncomeFoundation.setCreateTime(new Date());
- tEnsureIncomeFoundation.setStartTime(jsonArray.getJSONObject(i).getString("startTime"));
- tEnsureIncomeFoundation.setEndTime(jsonArray.getJSONObject(i).getString("endTime"));
- tEnsureIncomeFoundation.setAmount(jsonArray.getJSONObject(i).getBigDecimal("amount"));
- tEnsureIncomeFoundation.setOnLineTime(jsonArray.getJSONObject(i).getInteger("onLineTime"));
- foundationList.add(tEnsureIncomeFoundation);
-
- incomeMap.put(jsonArray.getJSONObject(i).getString("startTime"),jsonArray.getJSONObject(i).getString("startTime"));
- incomeMap.put(jsonArray.getJSONObject(i).getString("endTime"),jsonArray.getJSONObject(i).getString("endTime"));
- incomeTimeMap.put("startTime"+i,localStart);
- incomeTimeMap.put("endTime"+i,localEnd);
- }
- tEnsureIncomeFoundationService.saveBatch(foundationList);
-
- // 活动特殊时间配置
- if(StringUtils.hasLength(incomeSpecial)){
- JSONArray jsonArray1 = JSONObject.parseArray(incomeSpecial);
- Map<String,String> specialMap = new HashMap<>();
- for (int i = 0; i < jsonArray1.size(); i++) {
- String dayTime = specialMap.get(jsonArray1.getJSONObject(i).getString("dayTime"));
- if(StringUtils.hasLength(dayTime)){
- if(1 == language){
- throw new ServiceException(500,"特殊时间段基础配置存在重复日期!");
- }
- if(2 == language){
- throw new ServiceException(500,"Special time period basic configuration has duplicate dates!");
- }
- if(3 == language){
- throw new ServiceException(500,"Konfigurasi dasar periode waktu khusus memiliki tanggal duplikasi!");
- }
- }
-
- TEnsureIncomeSpecial tEnsureIncomeSpecial = new TEnsureIncomeSpecial();
- tEnsureIncomeSpecial.setEnsureIncomeId(tEnsureIncomeRule.getId());
- tEnsureIncomeSpecial.setCreateTime(new Date());
- tEnsureIncomeSpecial.setStartTime(DateUtil.parse(jsonArray1.getJSONObject(i).getString("dayTime"),"yyyy-MM-dd"));
- tEnsureIncomeSpecial.setPeriodDayAmount(jsonArray1.getJSONObject(i).getBigDecimal("periodDaySpecialAmount"));
- tEnsureIncomeSpecialService.save(tEnsureIncomeSpecial);
-
- JSONArray incomeSpecialTimeArr = jsonArray1.getJSONObject(i).getJSONArray("incomeSpecialTimeArr");
- List<TEnsureIncomeSpecialTimeSolt> specialTimeSoltList = new ArrayList<>(incomeSpecialTimeArr.size());
- Map<String,String> specialSoltMap = new HashMap<>();
- Map<String,LocalTime> incomeTimeSpecialMap = new HashMap<>();
- for (int j = 0; j < incomeSpecialTimeArr.size(); j++) {
- String startSpecialTime1 = incomeSpecialTimeArr.getJSONObject(j).getString("startSpecialTime");
- String endSpecialTime1 = incomeSpecialTimeArr.getJSONObject(j).getString("endSpecialTime");
- String startSpecialTime = specialSoltMap.get(startSpecialTime1);
- String endSpecialTime = specialSoltMap.get(endSpecialTime1);
- if(StringUtils.hasLength(startSpecialTime) && StringUtils.hasLength(endSpecialTime)){
- if(1 == language){
- throw new ServiceException(500,"特殊时间段日期为-"+jsonArray1.getJSONObject(i).getString("dayTime")+"-存在重复时间段!");
- }
- if(2 == language){
- throw new ServiceException(500,"Special time period dates are-"+jsonArray1.getJSONObject(i).getString("dayTime")+"-There are duplicate time periods!");
- }
- if(3 == language){
- throw new ServiceException(500,"Tanggal periode waktu khusus adalah-"+jsonArray1.getJSONObject(i).getString("dayTime")+"-Ada periode waktu duplikasi!");
- }
- }
-
- LocalTime localStart= LocalTime.parse(startSpecialTime1+":00");
- LocalTime localEnd= LocalTime.parse(endSpecialTime1+":00");
- for (int a = 0; a < incomeTimeSpecialMap.entrySet().size(); a++) {
- LocalTime localStartTime = incomeTimeSpecialMap.get("startSpecialTime" + a);
- LocalTime localEndTime = incomeTimeSpecialMap.get("endSpecialTime" + a);
- if(Objects.nonNull(localStartTime) && Objects.nonNull(localEndTime)){
- if((localStart.isAfter(localStartTime) && localStart.isBefore(localEndTime))
- || (localEnd.isAfter(localStartTime) && localEnd.isBefore(localEndTime))
- || (localStart.isAfter(localStartTime) && localEnd.isBefore(localEndTime))
- || (localStart.isBefore(localStartTime) && localEnd.isAfter(localEndTime))
- || (localStart.compareTo(localStartTime) == 0)
- || (localEnd.compareTo(localEndTime) == 0)){
- if(1 == language){
- throw new ServiceException(500,"特殊时间段配置存在重合时间段!");
- }
- if(2 == language){
- throw new ServiceException(500,"Special time period configuration with overlapping time periods!");
- }
- if(3 == language){
- throw new ServiceException(500,"Konfigurasi peristiwa waktu khusus dengan peristiwa waktu yang saling bertindak!");
- }
- }
- }
- }
-
- incomeTimeSpecialMap.put("startSpecialTime"+j,localStart);
- incomeTimeSpecialMap.put("endSpecialTime"+j,localEnd);
-
- TEnsureIncomeSpecialTimeSolt specialTimeSolt = new TEnsureIncomeSpecialTimeSolt();
- specialTimeSolt.setEnsureIncomeSpecialId(tEnsureIncomeSpecial.getId());
- specialTimeSolt.setCreateTime(new Date());
- specialTimeSolt.setStartTime(incomeSpecialTimeArr.getJSONObject(j).getString("startSpecialTime"));
- specialTimeSolt.setEndTime(incomeSpecialTimeArr.getJSONObject(j).getString("endSpecialTime"));
- specialTimeSolt.setAmount(incomeSpecialTimeArr.getJSONObject(j).getBigDecimal("specialAmount"));
- specialTimeSolt.setOnLineTime(incomeSpecialTimeArr.getJSONObject(j).getInteger("specialOnLineTime"));
- specialTimeSoltList.add(specialTimeSolt);
-
- specialSoltMap.put(incomeSpecialTimeArr.getJSONObject(j).getString("startSpecialTime"),incomeSpecialTimeArr.getJSONObject(j).getString("startSpecialTime"));
- specialSoltMap.put(incomeSpecialTimeArr.getJSONObject(j).getString("endSpecialTime"),incomeSpecialTimeArr.getJSONObject(j).getString("endSpecialTime"));
- }
- specialMap.put(jsonArray1.getJSONObject(i).getString("dayTime"),jsonArray1.getJSONObject(i).getString("dayTime"));
- tEnsureIncomeSpecialTimeSoltService.saveBatch(specialTimeSoltList);
- }
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tEnsureIncomeRuleId) {
- tEnsureIncomeRuleService.removeById(tEnsureIncomeRuleId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TEnsureIncomeRule tEnsureIncomeRule) {
- tEnsureIncomeRuleService.updateById(tEnsureIncomeRule);
- return SUCCESS_TIP;
- }
-
- /**
- * 暂停，开启
- */
- @RequestMapping(value = "/stopOrStart")
- @ResponseBody
- public Object stopOrStart(@RequestParam Integer tEnsureIncomeRuleId) {
- Integer language = UserExt.getLanguage();
- if(Objects.isNull(language)){
- language = 1;
- }
- TEnsureIncomeRule tEnsureIncomeRule = tEnsureIncomeRuleService.getById(tEnsureIncomeRuleId);
- if(tEnsureIncomeRule.getState() == 1){
- if(1==language){
- return new SuccessTip(500,"请先审核该数据!");
- }
- if(2==language){
- return new SuccessTip(500,"Please review the data first!");
- }
- if(3==language){
- return new SuccessTip(500,"Please review the data first!");
- }
- }
- if(RuleStatusEnum.PAUSED.getCode() != tEnsureIncomeRule.getStatus()){
- // 不是暂停中的状态，点击按钮变为暂停中的状态
- tEnsureIncomeRule.setStatus(RuleStatusEnum.PAUSED.getCode());
- tEnsureIncomeRuleService.updateById(tEnsureIncomeRule);
- return SUCCESS_TIP;
- }
- if(RuleStatusEnum.PAUSED.getCode() == tEnsureIncomeRule.getStatus()){
- // 是暂停中的状态，判断单签时间是否在有效期内已开始
- if(LocalDateTime.now().isBefore(TimeUtil.getDayStart(tEnsureIncomeRule.getStartTime()))){
- tEnsureIncomeRule.setStatus(RuleStatusEnum.NOT_START.getCode());
- }
- if(LocalDateTime.now().isAfter(TimeUtil.getDayStart(tEnsureIncomeRule.getStartTime())) && LocalDateTime.now().isBefore(TimeUtil.getDayEnd(tEnsureIncomeRule.getEndTime()))){
- tEnsureIncomeRule.setStatus(RuleStatusEnum.STARTED.getCode());
- }
- if(LocalDateTime.now().isAfter(TimeUtil.getDayEnd(tEnsureIncomeRule.getEndTime()))){
- return new SuccessTip(500,"已结束活动不可开启!");
- }
- tEnsureIncomeRuleService.updateById(tEnsureIncomeRule);
- return SUCCESS_TIP;
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tEnsureIncomeRuleId}")
- @ResponseBody
- public Object detail(@PathVariable("tEnsureIncomeRuleId") Integer tEnsureIncomeRuleId) {
- return tEnsureIncomeRuleService.getById(tEnsureIncomeRuleId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialController.java
deleted file mode 100644
index 36883eb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecial;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeSpecialService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2023-04-20 11:04:29
- */
-@Controller
-@RequestMapping("/tEnsureIncomeSpecial")
-public class TEnsureIncomeSpecialController extends BaseController {
-
- private String PREFIX = "/system/tEnsureIncomeSpecial/";
-
- @Autowired
- private ITEnsureIncomeSpecialService tEnsureIncomeSpecialService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tEnsureIncomeSpecial.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tEnsureIncomeSpecial_add")
- public String tEnsureIncomeSpecialAdd() {
- return PREFIX + "tEnsureIncomeSpecial_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tEnsureIncomeSpecial_update/{tEnsureIncomeSpecialId}")
- public String tEnsureIncomeSpecialUpdate(@PathVariable Integer tEnsureIncomeSpecialId, Model model) {
- TEnsureIncomeSpecial tEnsureIncomeSpecial = tEnsureIncomeSpecialService.getById(tEnsureIncomeSpecialId);
- model.addAttribute("item",tEnsureIncomeSpecial);
- LogObjectHolder.me().set(tEnsureIncomeSpecial);
- return PREFIX + "tEnsureIncomeSpecial_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return tEnsureIncomeSpecialService.list(null);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TEnsureIncomeSpecial tEnsureIncomeSpecial) {
- tEnsureIncomeSpecialService.save(tEnsureIncomeSpecial);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tEnsureIncomeSpecialId) {
- tEnsureIncomeSpecialService.removeById(tEnsureIncomeSpecialId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TEnsureIncomeSpecial tEnsureIncomeSpecial) {
- tEnsureIncomeSpecialService.updateById(tEnsureIncomeSpecial);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tEnsureIncomeSpecialId}")
- @ResponseBody
- public Object detail(@PathVariable("tEnsureIncomeSpecialId") Integer tEnsureIncomeSpecialId) {
- return tEnsureIncomeSpecialService.getById(tEnsureIncomeSpecialId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialTimeSoltController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialTimeSoltController.java
deleted file mode 100644
index b354100..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TEnsureIncomeSpecialTimeSoltController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecialTimeSolt;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeSpecialTimeSoltService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2023-04-20 11:04:33
- */
-@Controller
-@RequestMapping("/tEnsureIncomeSpecialTimeSolt")
-public class TEnsureIncomeSpecialTimeSoltController extends BaseController {
-
- private String PREFIX = "/system/tEnsureIncomeSpecialTimeSolt/";
-
- @Autowired
- private ITEnsureIncomeSpecialTimeSoltService tEnsureIncomeSpecialTimeSoltService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tEnsureIncomeSpecialTimeSolt.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tEnsureIncomeSpecialTimeSolt_add")
- public String tEnsureIncomeSpecialTimeSoltAdd() {
- return PREFIX + "tEnsureIncomeSpecialTimeSolt_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tEnsureIncomeSpecialTimeSolt_update/{tEnsureIncomeSpecialTimeSoltId}")
- public String tEnsureIncomeSpecialTimeSoltUpdate(@PathVariable Integer tEnsureIncomeSpecialTimeSoltId, Model model) {
- TEnsureIncomeSpecialTimeSolt tEnsureIncomeSpecialTimeSolt = tEnsureIncomeSpecialTimeSoltService.getById(tEnsureIncomeSpecialTimeSoltId);
- model.addAttribute("item",tEnsureIncomeSpecialTimeSolt);
- LogObjectHolder.me().set(tEnsureIncomeSpecialTimeSolt);
- return PREFIX + "tEnsureIncomeSpecialTimeSolt_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return tEnsureIncomeSpecialTimeSoltService.list(null);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TEnsureIncomeSpecialTimeSolt tEnsureIncomeSpecialTimeSolt) {
- tEnsureIncomeSpecialTimeSoltService.save(tEnsureIncomeSpecialTimeSolt);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tEnsureIncomeSpecialTimeSoltId) {
- tEnsureIncomeSpecialTimeSoltService.removeById(tEnsureIncomeSpecialTimeSoltId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TEnsureIncomeSpecialTimeSolt tEnsureIncomeSpecialTimeSolt) {
- tEnsureIncomeSpecialTimeSoltService.updateById(tEnsureIncomeSpecialTimeSolt);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tEnsureIncomeSpecialTimeSoltId}")
- @ResponseBody
- public Object detail(@PathVariable("tEnsureIncomeSpecialTimeSoltId") Integer tEnsureIncomeSpecialTimeSoltId) {
- return tEnsureIncomeSpecialTimeSoltService.getById(tEnsureIncomeSpecialTimeSoltId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TFeedbackController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TFeedbackController.java
deleted file mode 100644
index ad84b0d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TFeedbackController.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TFeedback;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.service.ITFeedbackService;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 反馈管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-10 10:24:59
- */
-@Controller
-@RequestMapping("/tFeedback")
-public class TFeedbackController extends BaseController {
-
- private String PREFIX = "/system/tFeedback/";
-
- @Autowired
- private ITFeedbackService tFeedbackService;
-
- @Autowired
- private ITSystemNoticeService tSystemNoticeService;
-
- /**
- * 跳转到司机反馈管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tFeedback.html";
- }
-
- /**
- * 跳转到用户反馈管理首页
- */
- @RequestMapping("/userFeedback")
- public String userFeedback(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "userFeedback.html";
- }
-
- /**
- * 跳转到添加反馈管理
- */
- @RequestMapping("/tFeedback_add")
- public String tFeedbackAdd() {
- return PREFIX + "tFeedback_add.html";
- }
-
- /**
- * 跳转到修改反馈管理
- */
- @RequestMapping("/tFeedback_immediately/{tFeedbackId}/{type}")
- public String tFeedbackUpdate(@PathVariable Integer tFeedbackId, @PathVariable Integer type, Model model) {
- model.addAttribute("tFeedbackId",tFeedbackId);
- model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("type",type);
- return PREFIX + "tFeedback_immediately.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TFeedback tFeedback = tFeedbackService.getById(id);
- String str = "";
- if (1 == type){
- str = tFeedback.getContent();
- }else if (2 == type){
- str = tFeedback.getRemark();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 获取司机反馈管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String driverName,
- String driverPhone,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tFeedbackService.getFeedbackList(page,beginTime,endTime,2,driverName,driverPhone,state));
- }
- return super.packForBT(page);
- }
-
- /**
- * 获取用户反馈管理列表
- */
- @RequestMapping(value = "/listUser")
- @ResponseBody
- public Object listUser(String insertTime,
- String userName,
- String userPhone,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tFeedbackService.getFeedbackList(page,beginTime,endTime,1,userName,userPhone,state));
- }
- return super.packForBT(page);
- }
-
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam String remark) {
- TFeedback tFeedback = tFeedbackService.getById(id);
- if (SinataUtil.isNotEmpty(tFeedback)){
- tFeedback.setCldate(new Date());
- tFeedback.setRemark(remark);
- tFeedback.setHandleUserId(UserExt.getUser().getId());
- tFeedback.setState(2);
- tFeedbackService.updateById(tFeedback);
-
- //增加系统消息
- TSystemNotice notice = new TSystemNotice();
- notice.setType(2);
- notice.setUserType(tFeedback.getType());
- notice.setContent("反馈处理结果:【"+remark+"】。");
- notice.setUserId(tFeedback.getUserId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- tSystemNoticeService.save1(notice);
- }
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TGuidePageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TGuidePageController.java
deleted file mode 100644
index beaf667..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TGuidePageController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TbGuidePage;
-import com.dsh.guns.modular.system.service.ITbGuidePageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/TGuidePage")
-public class TGuidePageController extends BaseController {
-
- private String PREFIX = "/system/tGuidePage/";
-
- @Autowired
- private ITbGuidePageService tbGuidePageService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tbGuidePage.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbGuidePage_add")
- public String tbGuidePageAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tbGuidePage_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbGuidePage_update/{tbGuidePageId}")
- public String tbGuidePageUpdate(@PathVariable Integer tbGuidePageId, Model model) {
- TbGuidePage tbGuidePage = tbGuidePageService.getById(tbGuidePageId);
- model.addAttribute("item",tbGuidePage);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(tbGuidePage);
- return PREFIX + "tbGuidePage_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list() {
- return tbGuidePageService.list();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer type,String name,Integer sort,String img) {
- TbGuidePage tbGuidePage = new TbGuidePage();
- tbGuidePage.setInsertTime(new Date());
- tbGuidePage.setName(name);
- tbGuidePage.setSort(sort);
- tbGuidePage.setType(2);
- tbGuidePage.setUrl(img);
- tbGuidePage.setType(type);
-// tbGuidePage.setPublisher(ShiroKit.getUser().getName());
- tbGuidePageService.save(tbGuidePage);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer TGuidePageId) {
- tbGuidePageService.removeById(TGuidePageId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer type,String name,Integer sort,String img,Integer id) {
- TbGuidePage byId = tbGuidePageService.getById(id);
- byId.setType(type);
- byId.setName(name);
- byId.setSort(sort);
- if(img!=null && !"".equals(img)){
- byId.setUrl(img);
- }
-
- tbGuidePageService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbGuidePageId}")
- @ResponseBody
- public Object detail(@PathVariable("tbGuidePageId") Integer tbGuidePageId) {
- return tbGuidePageService.getById(tbGuidePageId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/THotAddressController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/THotAddressController.java
deleted file mode 100644
index a1732c6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/THotAddressController.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.entity.City;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.course.util.GoogleMap.GoogleMapUtil;
-import com.dsh.course.util.GoogleMap.ReverseGeocodeVo;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TbHotAddress;
-import com.dsh.guns.modular.system.service.ITbHotAddressService;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/THotAddress")
-public class THotAddressController extends BaseController {
-
- private String PREFIX = "/system/tHotAddress/";
-
- @Autowired
- private ITbHotAddressService tbHotAddressService;
-
- @Autowired
- private CityMapper cityMapper;
-
- @Autowired
- private GoogleMapUtil googleMapUtil;
-
- @RequestMapping(value = "/change")
- @ResponseBody
- public Object change(@RequestParam Integer id) {
- List<City> list = new ArrayList<>();
- if (SinataUtil.isNotEmpty(id)){
- list = cityMapper.selectList(new QueryWrapper<City>().eq("pid", id));
- }
- if(UserExt.getLanguage()==2){
- for (City city : list) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(UserExt.getLanguage()==3){
- for (City city : list) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- return list;
- }
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tbHotAddress.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbHotAddress_add")
- public String tbHotAddressAdd(Model model) {
- List<City> pid = cityMapper.selectList(new QueryWrapper<City>().eq("pid", 0));
- if(UserExt.getLanguage()==2){
- for (City city : pid) {
- city.setChineseName(city.getEnglishName());
- }
- }else if(UserExt.getLanguage()==3){
- for (City city : pid) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("item",pid);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tbHotAddress_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbHotAddress_update/{tbHotAddressId}")
- public String tbHotAddressUpdate(@PathVariable Integer tbHotAddressId, Model model) {
- TbHotAddress tbHotAddress = tbHotAddressService.getById(tbHotAddressId);
- model.addAttribute("item",tbHotAddress);
- List<City> pid = cityMapper.selectList(new QueryWrapper<City>().eq("pid", 0));
- if(UserExt.getLanguage()==2){
- for (City city : pid) {
- city.setChineseName(city.getEnglishName());
- }
- }else if(UserExt.getLanguage()==3){
- for (City city : pid) {
- city.setChineseName(city.getIndonesianName());
- }
- }
-
- List<City> pid1 = cityMapper.selectList(new QueryWrapper<City>().eq("pid", tbHotAddress.getAreaId()));
- if(UserExt.getLanguage()==2){
- for (City city : pid1) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(UserExt.getLanguage()==3){
- for (City city : pid1) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("cityList",pid1);
- model.addAttribute("item1",pid);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(tbHotAddress);
- return PREFIX + "tbHotAddress_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String time,String name) {
- List<TbHotAddress> list = tbHotAddressService.getList(time,name);
- return list;
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer cityId,String address,Double lon,Double lat,String name,Integer sort,Integer cityId1) {
- TbHotAddress tbHotAddress = new TbHotAddress();
- tbHotAddress.setAddress(address);
- tbHotAddress.setHide(0);
- tbHotAddress.setCityId(cityId1);
- tbHotAddress.setCreateTime(new Date());
- tbHotAddress.setLat(lat);
- tbHotAddress.setAreaId(cityId);
- tbHotAddress.setLon(lon);
- tbHotAddress.setName(name);
- tbHotAddress.setSort(sort);
- tbHotAddressService.save(tbHotAddress);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer THotAddressId) {
- TbHotAddress byId = tbHotAddressService.getById(THotAddressId);
- byId.setHide(1);
- tbHotAddressService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TbHotAddress tbHotAddress,Integer cityId1) {
- tbHotAddress.setAreaId(tbHotAddress.getCityId());
- tbHotAddress.setCityId(cityId1);
- tbHotAddressService.updateById(tbHotAddress);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbHotAddressId}")
- @ResponseBody
- public Object detail(@PathVariable("tbHotAddressId") Integer tbHotAddressId) {
- return tbHotAddressService.getById(tbHotAddressId);
- }
-
-
-
- @ResponseBody
- @RequestMapping(value = "/queryPlaceInfo", produces = "application/json;charset=utf-8")
- public ResultUtil queryPlaceInfo(Double lat, Double lng){
- try {
- ReverseGeocodeVo reverseGeocode = googleMapUtil.getReverseGeocode(lat, lng);
- if(null != reverseGeocode){
- return ResultUtil.success(reverseGeocode.getAddress());
- }
- return ResultUtil.error("定位失败");
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TInvoiceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TInvoiceController.java
deleted file mode 100644
index e7fa007..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TInvoiceController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-//package com.dsh.guns.modular.system.controller.general;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.core.base.controller.BaseController;
-//import com.dsh.guns.core.common.constant.factory.PageFactory;
-//import com.dsh.guns.core.shiro.ShiroKit;
-//import com.dsh.guns.core.util.SinataUtil;
-//import com.dsh.guns.modular.system.model.TComplaint;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.dsh.guns.core.log.LogObjectHolder;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.dsh.guns.modular.system.model.TInvoice;
-//import com.dsh.guns.modular.system.service.ITInvoiceService;
-//
-//import java.util.Map;
-//
-///**
-// * 开发票列表控制器
-// *
-// * @author fengshuonan
-// * @Date 2020-06-09 10:55:26
-// */
-//@Controller
-//@RequestMapping("/tInvoice")
-//public class TInvoiceController extends BaseController {
-//
-// private String PREFIX = "/system/tInvoice/";
-//
-// @Autowired
-// private ITInvoiceService tInvoiceService;
-//
-// /**
-// * 跳转到开发票列表首页
-// */
-// @RequestMapping("")
-// public String index() {
-// return PREFIX + "tInvoice.html";
-// }
-//
-// /**
-// * 跳转到查看详情
-// */
-// @RequestMapping("/lookDetail/{id}/{type}")
-// public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
-// TInvoice tInvoice = tInvoiceService.selectById(id);
-// String str = "";
-// if (1 == type){
-// str = tInvoice.getContent();
-// }
-// model.addAttribute("str",str);
-// return "/system/tComplaint/lookDetail.html";
-// }
-//
-// /**
-// * 跳转到添加开发票列表
-// */
-// @RequestMapping("/tInvoice_add")
-// public String tInvoiceAdd() {
-// return PREFIX + "tInvoice_add.html";
-// }
-//
-// /**
-// * 跳转到修改开发票列表
-// */
-// @RequestMapping("/tInvoice_update/{tInvoiceId}")
-// public String tInvoiceUpdate(@PathVariable Integer tInvoiceId, Model model) {
-// TInvoice tInvoice = tInvoiceService.selectById(tInvoiceId);
-// model.addAttribute("item",tInvoice);
-// LogObjectHolder.me().set(tInvoice);
-// return PREFIX + "tInvoice_edit.html";
-// }
-//
-// /**
-// * 获取开发票列表列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String insertTime,
-// String email,
-// String name,
-// Integer type,
-// Integer state) {
-// String beginTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(insertTime)){
-// String[] timeArray = insertTime.split(" - ");
-// beginTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// if (ShiroKit.getUser().getRoleType() != 1){
-// page.setRecords(null);
-// }else{
-// page.setRecords(tInvoiceService.getInvoiceList(page,beginTime,endTime,email,name,type,state));
-// }
-// return super.packForBT(page);
-// }
-//
-// /**
-// * 重新开发票
-// */
-// @RequestMapping(value = "/again")
-// @ResponseBody
-// public Object again(@RequestParam Integer tInvoiceId) {
-// TInvoice tInvoice = tInvoiceService.selectById(tInvoiceId);
-//
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 删除开发票列表
-// */
-// @RequestMapping(value = "/delete")
-// @ResponseBody
-// public Object delete(@RequestParam Integer tInvoiceId) {
-// tInvoiceService.deleteById(tInvoiceId);
-// return SUCCESS_TIP;
-// }
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TMotorModelController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TMotorModelController.java
deleted file mode 100644
index 986a105..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TMotorModelController.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dsh.course.entity.MotorModel;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.service.ITMotorModelService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 车辆类型管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-05 14:31:28
- */
-@Controller
-@RequestMapping("/tMotorModel")
-public class TMotorModelController extends BaseController {
-
- private String PREFIX = "/system/tMotorModel/";
-
- @Autowired
- private ITMotorModelService tMotorModelService;
-
-
- /**
- * 跳转到车辆类型管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tMotorModel.html";
- }
-
- /**
- * 跳转到添加车辆类型管理
- */
- @RequestMapping("/tMotorModel_add")
- public String tMotorModelAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tMotorModel_add.html";
- }
-
- /**
- * 获取车辆类型管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(Integer yy) {
- LambdaQueryWrapper<MotorModel> motorModelLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(ToolUtil.isNotEmpty(yy)){
- motorModelLambdaQueryWrapper.eq(MotorModel::getLanguage,yy);
- }
- List<MotorModel> list = tMotorModelService.list(motorModelLambdaQueryWrapper);
- if(ToolUtil.isEmpty(yy)){
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (MotorModel motorModel : list) {
- motorModel.setName(motorModel.getEname());
- }
- }else if(language==3){
- for (MotorModel motorModel : list) {
- motorModel.setName(motorModel.getYname());
- }
- }
- }else {
- if(yy==2){
- for (MotorModel motorModel : list) {
- motorModel.setName(motorModel.getEname());
- }
- }else if(yy==3){
- for (MotorModel motorModel : list) {
- motorModel.setName(motorModel.getYname());
- }
- }
- }
- return list;
- }
-
- /**
- * 新增车辆类型管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(MotorModel tMotorModel,String img,Integer language) {
- tMotorModel.setInsertTime(new Date());
- tMotorModel.setState(1);
- tMotorModel.setImg(img);
- tMotorModel.setLanguage(language);
- tMotorModelService.save(tMotorModel);
- return SUCCESS_TIP;
- }
-
- @RequestMapping(value = "/updateState")
- @ResponseBody
- public Object updateState(Integer id,Integer state) {
- MotorModel byId = tMotorModelService.getById(id);
- byId.setState(state);
- tMotorModelService.updateById(byId);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TNoticesController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TNoticesController.java
deleted file mode 100644
index 74b1fb8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TNoticesController.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.TNotices;
-import com.dsh.course.feignClient.account.UserClient;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.Driver;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.model.TUser;
-import com.dsh.guns.modular.system.service.ITNoticesService;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import com.dsh.guns.modular.system.util.task.base.QuartzManager;
-import com.dsh.guns.modular.system.util.task.base.TimeJobType;
-import com.dsh.guns.modular.system.util.task.jobs.AddNotice;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.*;
-
-/**
- * 滚动消息设置控制器
- *
- * @author fengshuonan
- * @Date 2020-06-10 15:21:25
- */
-@Controller
-@RequestMapping("/tNotices")
-public class TNoticesController extends BaseController {
-
- private String PREFIX = "/system/tNotices/";
-
- @Autowired
- private ITNoticesService tNoticesService;
-
- /**
- * 跳转到滚动消息设置首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tNotices.html";
- }
-
- /**
- * 跳转到系统公告设置首页
- */
- @RequestMapping("/system")
- public String system(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "system.html";
- }
-
- /**
- * 跳转到添加滚动消息设置
- */
- @RequestMapping("/tNotices_add")
- public String tNoticesAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tNotices_add.html";
- }
-
- /**
- * 跳转到添加系统公告
- */
- @RequestMapping("/system_add")
- public String system_add(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "system_add.html";
- }
-
- /**
- * 跳转到修改滚动消息设置
- */
- @RequestMapping("/tNotices_update/{tNoticesId}")
- public String tNoticesUpdate(@PathVariable Integer tNoticesId, Model model) {
- TNotices tNotices = tNoticesService.getById(tNoticesId);
- model.addAttribute("item",tNotices);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(tNotices);
- return PREFIX + "tNotices_edit.html";
- }
-
- /**
- * 跳转到修改系统公告
- */
- @RequestMapping("/system_update/{tNoticesId}")
- public String system_update(@PathVariable Integer tNoticesId, Model model) {
- TNotices tNotices = tNoticesService.getById(tNoticesId);
- model.addAttribute("item",tNotices);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(tNotices);
- return PREFIX + "system_update.html";
- }
-
- /**
- * 获取滚动消息设置列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,String content,Integer yy) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tNoticesService.getRollingNoticeList(page,beginTime,endTime,1,content,yy));
- }
- return super.packForBT(page);
- }
-
- /**
- * 获取系统公告设置列表
- */
- @RequestMapping(value = "/listSystem")
- @ResponseBody
- public Object listSystem(String insertTime,String content,Integer yy) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tNoticesService.getRollingNoticeList(page,beginTime,endTime,2,content,yy));
- }
- return super.packForBT(page);
- }
-
- /**
- * 新增滚动消息设置
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TNotices tNotices,Integer language) {
- tNotices.setIsDelete(1);
- tNotices.setInsertTime(new Date());
- tNotices.setLanguage(language);
- tNotices.setInsertUser(UserExt.getUser().getId());
- tNotices.setType(1);
- tNoticesService.save(tNotices);
- return SUCCESS_TIP;
- }
-
- /**
- * 新增系统公告
- */
- @RequestMapping(value = "/addSystem")
- @ResponseBody
- public Object addSystem(TNotices tNotices,Integer language) {
- tNotices.setIsDelete(1);
- tNotices.setInsertTime(new Date());
- tNotices.setInsertUser(UserExt.getUser().getId());
- tNotices.setLanguage(language);
- tNotices.setType(2);
- tNoticesService.save(tNotices);
-
- if (tNotices.getIsShow() == 1){ //发布
- //定时1秒后执行
- Map<String,Object> maps=new HashMap<>();
- maps.put("noticeId",tNotices.getId());
- Timer timer = new Timer();
- timer.schedule(new timerTaskTest(tNotices.getId()),3*1000);
-// QuartzManager.addJob(AddNotice.class, (AddNotice.name+tNotices.getId()).toUpperCase(), TimeJobType.UNLOCK,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 发布系统公告
- */
- @RequestMapping(value = "/sendSystem")
- @ResponseBody
- public Object sendSystem(@RequestParam Integer tNoticesId) {
- TNotices tNotices = tNoticesService.getById(tNoticesId);
- if (tNotices.getIsShow() == 2){
- //定时1秒后执行
- Map<String,Object> maps=new HashMap<>();
- maps.put("noticeId",tNotices.getId());
- QuartzManager.addJob(AddNotice.class, (AddNotice.name+tNotices.getId()).toUpperCase(), TimeJobType.UNLOCK,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);
- }
- tNotices.setIsShow(1);
- tNotices.setUpdateTime(new Date());
- tNotices.setUpdateUser(UserExt.getUser().getId());
- tNoticesService.updateById(tNotices);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tNoticesId) {
- TNotices tNotices = tNoticesService.getById(tNoticesId);
- tNotices.setIsDelete(2);
- tNotices.setFlag(3);
- tNotices.setUpdateTime(new Date());
- tNotices.setUpdateUser(UserExt.getUser().getId());
- tNoticesService.updateById(tNotices);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改滚动消息设置
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TNotices tNotices,Integer language) {
- tNotices.setUpdateUser(UserExt.getUser().getId());
- tNotices.setUpdateTime(new Date());
- tNotices.setLanguage(language);
- tNoticesService.updateById(tNotices);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改系统公告
- */
- @RequestMapping(value = "/updateSystem")
- @ResponseBody
- public Object updateSystem(TNotices tNotices,Integer language) {
- tNotices.setUpdateUser(UserExt.getUser().getId());
- tNotices.setUpdateTime(new Date());
- tNotices.setLanguage(language);
- tNoticesService.updateById(tNotices);
-
- if (tNotices.getIsShow() == 1){ //发布
- //定时1秒后执行
- Map<String,Object> maps=new HashMap<>();
- maps.put("noticeId",tNotices.getId());
- QuartzManager.addJob(AddNotice.class, (AddNotice.name+tNotices.getId()).toUpperCase(), TimeJobType.UNLOCK, DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);
- }
- return SUCCESS_TIP;
- }
-
- @Autowired
- private UserClient userClient;
- @Autowired
- private ITSystemNoticeService tSystemNoticeService;
-
- @Autowired
- private DriverClient driverClient;
- private class timerTaskTest extends TimerTask {
- private Integer id;
- public timerTaskTest(Integer id) {
- this.id=id;
- }
-
- @Override
- public void run() {
- try {
- System.out.println("----定时1秒后生成公告记录-----");
- TNotices tNotices = tNoticesService.getById(id);
- if (SinataUtil.isNotEmpty(tNotices)){
- if (tNotices.getIsUser() == 2){
- List<TUser> tUsers = userClient.getUserList();
- //发送公告给用户
- for (TUser user : tUsers){
- TSystemNotice notice = new TSystemNotice();
- notice.setType(1);
- notice.setUserType(1);
- notice.setNoticesId(id);
- notice.setContent(tNotices.getContent());
- notice.setUserId(user.getId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- notice.setLanguage(tNotices.getLanguage());
- tSystemNoticeService.save1(notice);
-
- /*Map<String,Object> map = new HashMap<String,Object>();
- map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是
- map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是
- map.put("type", 2); //消息类型 1=互动 2=公告
- map.put("id", record.getId()); //对象ID
- JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
- }
- }
- if (tNotices.getIsDriver() == 2){
- List<Driver> tDrivers = driverClient.getStateList();
- //发送公告给用户
- for (Driver driver : tDrivers){
- TSystemNotice notice = new TSystemNotice();
- notice.setType(1);
- notice.setUserType(2);
- notice.setNoticesId(id);
- notice.setContent(tNotices.getContent());
- notice.setUserId(driver.getId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- notice.setLanguage(tNotices.getLanguage());
- tSystemNoticeService.save1(notice);
-
- /*Map<String,Object> map = new HashMap<String,Object>();
- map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是
- map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是
- map.put("type", 2); //消息类型 1=互动 2=公告
- map.put("id", record.getId()); //对象ID
- JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
-
-
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOpenCityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOpenCityController.java
deleted file mode 100644
index f5ee386..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOpenCityController.java
+++ /dev/null
@@ -1,427 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.City;
-import com.dsh.course.feignClient.activity.CompanyCityClient;
-import com.dsh.course.feignClient.app.OpenCityClinet;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.course.util.GoogleMap.GoogleMapUtil;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.SuccessTip;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ITOpenCityBusinessService;
-import com.dsh.guns.modular.system.service.ITOpenCityService;
-import com.dsh.guns.modular.system.service.ITRegionService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.*;
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 城市管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-02 11:40:31
- */
-@Controller
-@RequestMapping("/tOpenCity")
-public class TOpenCityController extends BaseController {
-
- private String PREFIX = "/system/tOpenCity/";
-
- @Autowired
- private ITOpenCityService tOpenCityService;
-
- @Autowired
- private CityMapper cityMapper;
-
- @Autowired
- private ITRegionService tRegionService;
-
- @Autowired
- private ITOpenCityBusinessService tOpenCityBusinessService;
-
- @Autowired
- private GoogleMapUtil googleMapUtil;
-
- @Resource
- private OpenCityClinet openCityClinet;
- @Autowired
- private CompanyCityClient companyCityClient;
-
-
- /**
- * 跳转到城市管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOpenCity.html";
- }
-
- /**
- * 跳转到添加城市管理
- */
- @RequestMapping("/tOpenCity_add")
- public String tOpenCityAdd(Model model) {
- List<City> pid = cityMapper.selectList(new QueryWrapper<City>().eq("pid", 0));
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (City city : pid) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : pid) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("provinceList",pid);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOpenCity_add.html";
- }
-
- /**
- * 跳转到修改城市管理
- */
- @RequestMapping("/tOpenCity_update/{tOpenCityId}")
- public String tOpenCityUpdate(@PathVariable Integer tOpenCityId, Model model) {
- TOpenCity tOpenCity = tOpenCityService.getById(tOpenCityId);
- model.addAttribute("item",tOpenCity);
- LogObjectHolder.me().set(tOpenCity);
- Integer language = UserExt.getLanguage();
- //省
- List<City> pid = cityMapper.selectList(new QueryWrapper<City>().eq("pid", 0));
- if(language==2){
- for (City city : pid) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : pid) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("provinceList",pid);
- //市
- List<City> pid1 = cityMapper.selectList(new QueryWrapper<City>().eq("pid", tOpenCity.getAreaId()));
- if(language==2){
- for (City city : pid1) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : pid1) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("cityList",pid1);
- //区
- List<TRegion> areaList = tRegionService.getBaseMapper().selectList(new QueryWrapper<TRegion>().eq("parent_id", tOpenCity.getCityId()));
- model.addAttribute("areaList",areaList);
- //经营业务
- List<Map<String,Object>> businessList = tOpenCityService.getBusinessByCityId(tOpenCityId);
- model.addAttribute("businessList",businessList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOpenCity_edit.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/tOpenCity_immediately/{id}")
- public String sysCouponActivityImmediately(@PathVariable Integer id, Model model) {
- TOpenCity tOpenCity = tOpenCityService.getById(id);
- model.addAttribute("item",tOpenCity);
- LogObjectHolder.me().set(tOpenCity);
- Integer language = UserExt.getLanguage();
- //省
- List<City> pid = cityMapper.selectList(new QueryWrapper<City>().eq("pid", 0));
- if(language==2){
- for (City city : pid) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : pid) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("provinceList",pid);
- //市
- List<City> pid1 = cityMapper.selectList(new QueryWrapper<City>().eq("pid", tOpenCity.getAreaId()));
- if(language==2){
- for (City city : pid1) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : pid1) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- model.addAttribute("cityList",pid1);
- //区
- List<TRegion> areaList = tRegionService.getBaseMapper().selectList(new QueryWrapper<TRegion>().eq("parent_id", tOpenCity.getCityId()));
- model.addAttribute("areaList",areaList);
- //经营业务
- List<Map<String,Object>> businessList = tOpenCityService.getBusinessListByCityId(id);
- model.addAttribute("businessList",businessList);
- model.addAttribute("id",id);
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tOpenCity_immediately.html";
- }
-
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @Transactional(rollbackFor = Exception.class)
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
- TOpenCity tOpenCity = tOpenCityService.getById(id);
- if (SinataUtil.isNotEmpty(tOpenCity)){
- if(Objects.nonNull(tOpenCity.getSuperId()) && state == 3){
- // 查询出上一条老的数据
- TOpenCity byId = tOpenCityService.getById(tOpenCity.getSuperId());
- //删除老数据经营业务
- TOpenCityBusiness business = new TOpenCityBusiness();
- business.setFlag("3");
- tOpenCityBusinessService.update(business,new LambdaQueryWrapper<TOpenCityBusiness>().eq(TOpenCityBusiness::getOpenCityId,byId.getId()));
-
- Integer byIdId = byId.getId();
- // 审核通过的新数据覆盖老的数据
- tOpenCity.setId(null);
- BeanUtils.copyProperties(tOpenCity,byId);
- byId.setId(byIdId);
- byId.setStatus(state);
- byId.setRemark(remark);
- tOpenCityService.updateById(byId);
-
- //添加到mongodb
- openCityClinet.saveMongodb(byId);
-
-
- // 查询新数据的经营业务，指向老数据
- List<TOpenCityBusiness> list = tOpenCityBusinessService.list(Wrappers.lambdaQuery(TOpenCityBusiness.class)
- .eq(TOpenCityBusiness::getOpenCityId, id));
- for (TOpenCityBusiness tOpenCityBusiness : list) {
- tOpenCityBusiness.setOpenCityId(byId.getId());
- }
- tOpenCityBusinessService.updateBatchById(list);
-
- tOpenCityService.removeById(id);
- }else {
- tOpenCity.setStatus(state);
- tOpenCity.setRemark(remark);
- tOpenCityService.updateById(tOpenCity);
-
- //添加到mongodb
- openCityClinet.saveMongodb(tOpenCity);
- }
- }
- return SUCCESS_TIP;
- }
-
-
- @RequestMapping(value = "/change")
- @ResponseBody
- public Object change(@RequestParam Integer id) {
- List<City> list = new ArrayList<>();
- if (SinataUtil.isNotEmpty(id)){
- list = cityMapper.selectList(new QueryWrapper<City>().eq("pid", id));
- }
-
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (City city : list) {
- city.setChineseName(city.getEnglishName());
- }
- }
- if(language==3){
- for (City city : list) {
- city.setChineseName(city.getIndonesianName());
- }
- }
- return list;
- }
-
- /**
- * 获取城市管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,String name) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- Integer language = UserExt.getLanguage();
- List<Map<String, Object>> openCityList = tOpenCityService.getOpenCityList(page, beginTime, endTime, name,language);
-// for (Map<String, Object> stringObjectMap : openCityList) {
-// Integer areaId = (Integer)stringObjectMap.get("areaId");
-// Integer cityId = (Integer)stringObjectMap.get("cityId");
-// City city = cityMapper.selectById(areaId);
-// City city1 = cityMapper.selectById(cityId);
-// if(UserExt.getLanguage()==1){
-// stringObjectMap.put("areaName",city.getChineseName());
-// stringObjectMap.put("cityName",city1.getChineseName());
-// }else if(UserExt.getLanguage()==2){
-// stringObjectMap.put("areaName",city.getEnglishName());
-// stringObjectMap.put("cityName",city1.getEnglishName());
-// }else {
-// stringObjectMap.put("areaName",city.getIndonesianName());
-// stringObjectMap.put("cityName",city1.getIndonesianName());
-// }
-// System.out.println(areaId);
-// }
- for (Map<String, Object> stringObjectMap : openCityList) {
- if(UserExt.getLanguage()==1){
- stringObjectMap.put("name",stringObjectMap.get("chineseName"));
- }else if(UserExt.getLanguage()==2){
- stringObjectMap.put("name",stringObjectMap.get("englishName"));
- }else {
- stringObjectMap.put("name",stringObjectMap.get("indonesianName"));
- }
- }
- page.setRecords(openCityList);
- return super.packForBT(page);
- }
-
- /**
- * 新增城市管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TOpenCity tOpenCity,@RequestParam String businessTypeStr,Integer areaId,Integer cityId,Integer provinceId) throws Exception {
- tOpenCity.setInsertTime(new Date());
- User user = UserExt.getUser();
- tOpenCity.setInsertUser(user.getId());
- tOpenCity.setAreaId(areaId);
- tOpenCity.setCityId(cityId);
- tOpenCity.setProvinceId(provinceId);
- tOpenCityService.save(tOpenCity);
-
- //添加经营业务
- testJSONStrToJSONArray(businessTypeStr,tOpenCity.getId());
- return SUCCESS_TIP;
- }
-
- public void testJSONStrToJSONArray(String subArr,Integer tOpenCityId){
- JSONArray jsonArray = JSON.parseArray(subArr);
- int size = jsonArray.size();
- for (int i = 0; i < size; i++){
- JSONObject jsonObject = jsonArray.getJSONObject(i);
- TOpenCityBusiness business = new TOpenCityBusiness();
- if (SinataUtil.isNotEmpty(jsonObject.getInteger("busId")) && jsonObject.getInteger("busId") != 0){
- business = tOpenCityBusinessService.getById(jsonObject.getInteger("busId"));
- business.setUpdateTime(new Date());
- business.setUpdateUser(UserExt.getUser().getId());
- business.setFlag("2");
- }else{
- business.setInsertTime(DateUtil.parse(jsonObject.getString("time")+" 00:00:00","yyyy-MM-dd HH:mm:ss"));
- business.setInsertUser(UserExt.getUser().getId());
- }
- business.setOpenCityId(tOpenCityId);
- String type = jsonObject.getString("type");
- Integer businessType = 0;
- if ("摩托车".equals(type)||"Motorcycle".equals(type) || "Motosikal".equals(type)){
- businessType = 1;
- }else if ("同城快送".equals(type)||"City express delivery".equals(type)||"Pengiriman ekspres kota".equals(type)){
- businessType = 4;
- }
- business.setBusinessType(businessType);
- business.setSort(jsonObject.getInteger("sort"));
- if (SinataUtil.isNotEmpty(jsonObject.getInteger("busId")) && jsonObject.getInteger("busId") != 0){
- tOpenCityBusinessService.updateById(business);
- }else{
- tOpenCityBusinessService.save(business);
- }
- }
- }
-
- /**
- * 删除城市管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tOpenCityId) {
- Boolean isBind = companyCityClient.isBindCompany(tOpenCityId);
- if(isBind){
- if(UserExt.getLanguage() == 1){
- return new SuccessTip(500,"该城市已绑定企业，无法删除!");
- }
- if(UserExt.getLanguage() == 2){
- return new SuccessTip(500,"This city is already bound to an enterprise and cannot be deleted!");
- }
- if(UserExt.getLanguage() == 3){
- return new SuccessTip(500,"Kota ini sudah terikat pada sebuah perusahaan dan tidak dapat dihapus!");
- }
- }
- TOpenCity tOpenCity = tOpenCityService.getById(tOpenCityId);
- tOpenCity.setFlag("3");
- tOpenCityService.updateById(tOpenCity);
- //添加到mongodb
- openCityClinet.delMongodb(tOpenCityId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改城市管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TOpenCity tOpenCity,@RequestParam String businessTypeStr,Integer areaId,Integer cityId,Integer provinceId) {
- Integer userId = UserExt.getUser().getId();
- tOpenCity.setUpdateTime(new Date());
- tOpenCity.setUpdateUser(userId);
- tOpenCityService.updateById(tOpenCity);
-
- TOpenCity city = new TOpenCity();
- BeanUtils.copyProperties(tOpenCity,city);
- city.setId(null);
- city.setInsertTime(new Date());
- city.setInsertUser(userId);
- city.setSuperId(tOpenCity.getId());
- tOpenCityService.save(city);
-
- testJSONStrToJSONArray(businessTypeStr,city.getId());
- return SUCCESS_TIP;
- }
-
- /**
- * 城市管理详情
- */
- @RequestMapping(value = "/detail/{tOpenCityId}")
- @ResponseBody
- public Object detail(@PathVariable("tOpenCityId") Integer tOpenCityId) {
- return tOpenCityService.getById(tOpenCityId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOrderEvaluateController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOrderEvaluateController.java
deleted file mode 100644
index 4315808..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TOrderEvaluateController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.evaluation.EvaluationClient;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TOrderEvaluate;
-import com.dsh.guns.modular.system.service.ITOrderEvaluateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Map;
-
-/**
- * 评价列表控制器
- *
- * @author fengshuonan
- * @Date 2020-06-09 11:44:36
- */
-@Controller
-@RequestMapping("/tOrderEvaluate")
-public class TOrderEvaluateController extends BaseController {
-
- private String PREFIX = "/system/tOrderEvaluate/";
-
- @Autowired
- private ITOrderEvaluateService tOrderEvaluateService;
-
- @Autowired
- private EvaluationClient evaluationClient;
-
- /**
- * 跳转到评价列表首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOrderEvaluate.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TOrderEvaluate tOrderEvaluate = tOrderEvaluateService.getById(id);
- String str = "";
- if (1 == type){
- str = tOrderEvaluate.getContent();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 跳转到添加评价列表
- */
- @RequestMapping("/tOrderEvaluate_add")
- public String tOrderEvaluateAdd() {
- return PREFIX + "tOrderEvaluate_add.html";
- }
-
- /**
- * 跳转到修改评价列表
- */
- @RequestMapping("/tOrderEvaluate_update/{tOrderEvaluateId}")
- public String tOrderEvaluateUpdate(@PathVariable Integer tOrderEvaluateId, Model model) {
- TOrderEvaluate tOrderEvaluate = tOrderEvaluateService.getById(tOrderEvaluateId);
- model.addAttribute("item",tOrderEvaluate);
- LogObjectHolder.me().set(tOrderEvaluate);
- return PREFIX + "tOrderEvaluate_edit.html";
- }
-
- /**
- * 获取评价列表列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String userName,
- String userPhone,
- String driverName,
- String driverPhone,
- String fraction,
- Integer orderType,String orderNum) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tOrderEvaluateService.getOrderEvaluateList(page, UserExt.getUser().getRoleType(), UserExt.getUser().getObjectId(),beginTime,endTime,userName,userPhone,driverName,driverPhone,fraction,orderType,orderNum));
- return super.packForBT(page);
- }
-
- /**
- * 新增评价列表
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TOrderEvaluate tOrderEvaluate) {
- tOrderEvaluateService.save(tOrderEvaluate);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除评价列表
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tOrderEvaluateId) {
- tOrderEvaluateService.removeById(tOrderEvaluateId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改评价列表
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TOrderEvaluate tOrderEvaluate) {
- tOrderEvaluateService.updateById(tOrderEvaluate);
- return SUCCESS_TIP;
- }
-
- /**
- * 评价列表详情
- */
- @RequestMapping(value = "/detail/{tOrderEvaluateId}")
- @ResponseBody
- public Object detail(@PathVariable("tOrderEvaluateId") Integer tOrderEvaluateId) {
- return tOrderEvaluateService.getById(tOrderEvaluateId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TProblemController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TProblemController.java
deleted file mode 100644
index 4f0961c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TProblemController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TProblem;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.service.ITProblemService;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 用户留言管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-24 11:20:23
- */
-@Controller
-@RequestMapping("/tProblem")
-public class TProblemController extends BaseController {
-
- private String PREFIX = "/system/tProblem/";
-
- @Autowired
- private ITProblemService tProblemService;
-
- @Autowired
- private ITSystemNoticeService itSystemNoticeService;
-
- /**
- * 跳转到用户留言管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tProblem.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TProblem tProblem = tProblemService.getById(id);
- String str = "";
- if (1 == type){
- str = tProblem.getContent();
- }else if (2 == type){
- str = tProblem.getAnswer();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/tProblem_immediately/{tProblemId}")
- public String tProblemUpdate(@PathVariable Integer tProblemId, Model model) {
- model.addAttribute("tProblemId",tProblemId);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tProblem_immediately.html";
- }
-
- /**
- * 获取用户留言管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String userName,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tProblemService.getProblemList(page,beginTime,endTime,userName,state));
- }
- return super.packForBT(page);
- }
-
- /**
- * 立即处理
- */
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public Object immediately(@RequestParam Integer tProblemId,@RequestParam String answer) {
- TProblem tProblem = tProblemService.getById(tProblemId);
- if (SinataUtil.isNotEmpty(tProblem)){
- tProblem.setAnswer(answer);
- tProblem.setHandleTime(new Date());
- tProblem.setHandleUserId(UserExt.getUser().getId());
- tProblem.setState(2);
- tProblemService.updateById(tProblem);
-
- //增加系统消息
- TSystemNotice notice = new TSystemNotice();
- notice.setType(2);
- notice.setUserType(1);
- notice.setContent("您的留言被回复啦:【"+answer+"】");
- notice.setUserId(tProblem.getUserId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- itSystemNoticeService.save1(notice);
- }
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TPubWithdrawalController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TPubWithdrawalController.java
deleted file mode 100644
index 1a2f675..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TPubWithdrawalController.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.TPubWithdrawalClient;
-import com.dsh.course.feignClient.account.model.QueryWithdrawalReq;
-import com.dsh.course.util.midtrans.Payouts;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TPubWithdrawal;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 提现列表控制器
- *
- * @author fengshuonan
- * @Date 2020-06-09 09:30:59
- */
-@Controller
-@RequestMapping("/tPubWithdrawal")
-public class TPubWithdrawalController extends BaseController {
-
- private String PREFIX = "/system/tPubWithdrawal/";
-
- @Autowired
- private TPubWithdrawalClient tPubWithdrawalClient;
-
- @Autowired
- private ITSystemNoticeService tSystemNoticeService;
-
- /**
- * 跳转到提现列表首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tPubWithdrawal.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TPubWithdrawal tPubWithdrawal = tPubWithdrawalClient.queryTPubWithdrawalId(id);
- String str = "";
- if (1 == type){
- str = tPubWithdrawal.getRemark();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/tPubWithdrawal_immediately/{tPubWithdrawalId}")
- public String tPubWithdrawalUpdate(@PathVariable Integer tPubWithdrawalId, Model model) {
- model.addAttribute("tPubWithdrawalId",tPubWithdrawalId);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tPubWithdrawal_immediately.html";
- }
-
- /**
- * 获取提现列表列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String name,
- Integer withdrawalType) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- if (UserExt.getUser().getObjectId() != 1){
- page.setRecords(null);
- return super.packForBT(page);
- }else{
- return super.packForBT(tPubWithdrawalClient.queryTPubWithdrawalList(new QueryWithdrawalReq(limit,offset,beginTime,endTime,name,withdrawalType)));
- }
-
- }
-
- /**
- * 新增提现列表
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TPubWithdrawal tPubWithdrawal) {
- tPubWithdrawalClient.add(tPubWithdrawal);
- return SUCCESS_TIP;
- }
-
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public ResultUtil immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
- TPubWithdrawal tPubWithdrawal = tPubWithdrawalClient.queryTPubWithdrawalId(id);
- if (SinataUtil.isNotEmpty(tPubWithdrawal)){
- if(state == 3){
- tPubWithdrawal.setState(state); //调用接口修改状态
- }
- tPubWithdrawal.setRemark(remark);
- tPubWithdrawal.setHandleTime(new Date());
-
- if(state == 2){//同意
- ResultUtil<String> payout = Payouts.payout(tPubWithdrawal.getName(), tPubWithdrawal.getCode(),
- tPubWithdrawal.getCode(), tPubWithdrawal.getBankCode(), "", tPubWithdrawal.getMoney().doubleValue(), remark);
- if(payout.getCode() == 200){
- tPubWithdrawalClient.update(tPubWithdrawal);
- }
- return payout;
- }
- tPubWithdrawalClient.update(tPubWithdrawal);
-
-
-// Map<String,String> map = new HashMap<>();
-// map.put("id", String.valueOf(tPubWithdrawal.getId()));
-// map.put("state", String.valueOf(stateObj));
-// String result = HttpRequestUtil.postRequest(PushURL.withdraw_auth_url, map);
-// System.out.println("提现审核接口 :【recordId="+tPubWithdrawal.getId().toString()+"】,调用接口:"+result);
-
-
-
- //增加系统消息
- TSystemNotice notice = new TSystemNotice();
- notice.setType(2);
- notice.setUserType(tPubWithdrawal.getUserType());
- Integer language = UserExt.getLanguage();
- notice.setContent("提现处理结果:【"+remark+"】。");
- if(language==2){
- notice.setContent("Withdrawal processing results:【"+remark+"】。");
- }
- if(language==3){
- notice.setContent("Hasil pemrosesan penarikan:【"+remark+"】。");
- }
- notice.setUserId(tPubWithdrawal.getUserId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- notice.setLanguage(1);
- try {
- tSystemNoticeService.save1(notice);
- }catch (Exception e){
- e.printStackTrace();
- }
- }
- return ResultUtil.success();
- }
-
- /**
- * 修改提现列表
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TPubWithdrawal tPubWithdrawal) {
- tPubWithdrawalClient.update(tPubWithdrawal);
- return SUCCESS_TIP;
- }
-
- /**
- * 提现列表详情
- */
- @RequestMapping(value = "/detail/{tPubWithdrawalId}")
- @ResponseBody
- public Object detail(@PathVariable("tPubWithdrawalId") Integer tPubWithdrawalId) {
- return tPubWithdrawalClient.queryTPubWithdrawalId(tPubWithdrawalId);
- }
-
-
- /**
- * 确认付款操作
- * @param id
- * @param reference_no
- * @param otp
- * @return
- */
- @RequestMapping(value = "/confirmationPayment")
- @ResponseBody
- public ResultUtil confirmationPayment(Integer id, String reference_no, String otp){
- TPubWithdrawal tPubWithdrawal = tPubWithdrawalClient.queryTPubWithdrawalId(id);
- if(null != tPubWithdrawal){
- ResultUtil approve = Payouts.approve(reference_no, otp);
- if(approve.getCode() != 200){
- return approve;
- }
-
- tPubWithdrawal.setState(2);
- tPubWithdrawalClient.update(tPubWithdrawal);
-
- //增加系统消息
- TSystemNotice notice = new TSystemNotice();
- notice.setType(2);
- notice.setUserType(tPubWithdrawal.getUserType());
- Integer language = UserExt.getLanguage();
- notice.setContent("提现处理结果:【"+tPubWithdrawal.getRemark()+"】。");
- if(language==2){
- notice.setContent("Withdrawal processing results:【"+tPubWithdrawal.getRemark()+"】。");
- }
- if(language==3){
- notice.setContent("Hasil pemrosesan penarikan:【"+tPubWithdrawal.getRemark()+"】。");
- }
- notice.setUserId(tPubWithdrawal.getUserId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- notice.setLanguage(1);
- try {
- tSystemNoticeService.save1(notice);
- }catch (Exception e){
- e.printStackTrace();
- }
- }
- return ResultUtil.success();
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSmsrecordController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSmsrecordController.java
deleted file mode 100644
index 7d21ef6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSmsrecordController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.SmsreordClient;
-import com.dsh.course.feignClient.account.model.SmsCodeReq;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TSmsrecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Map;
-
-/**
- * 短信记录控制器
- *
- * @author fengshuonan
- * @Date 2020-06-10 19:43:13
- */
-@Controller
-@RequestMapping("/tSmsrecord")
-public class TSmsrecordController extends BaseController {
-
- private String PREFIX = "/system/tSmsrecord/";
-
- @Autowired
- private SmsreordClient smsreordClient;
-
- /**
- * 跳转到短信记录首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tSmsrecord.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TSmsrecord tSmsrecord = smsreordClient.querySmsrecordById(id);
- String str = "";
- if (1 == type){
- str = tSmsrecord.getContent();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 获取短信记录列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String phone) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (33 != 1){
- page.setRecords(null);
- }else{
- page.setRecords(smsreordClient.querySmsrecordList(new SmsCodeReq(page,beginTime,endTime,phone)));
- }
- return super.packForBT(page);
- }
-
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TStartPageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TStartPageController.java
deleted file mode 100644
index c08cf48..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TStartPageController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TbStartPage;
-import com.dsh.guns.modular.system.service.ITbStartPageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/TStartPage")
-public class TStartPageController extends BaseController {
-
- private String PREFIX = "/system/tStartPage/";
-
- @Autowired
- private ITbStartPageService tbStartPageService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tbStartPage.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbStartPage_add")
- public String tbStartPageAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tbStartPage_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbStartPage_update/{tbStartPageId}")
- public String tbStartPageUpdate(@PathVariable Integer tbStartPageId, Model model) {
- TbStartPage tbStartPage = tbStartPageService.getById(tbStartPageId);
- model.addAttribute("item",tbStartPage);
- model.addAttribute("language",UserExt.getLanguage());
- LogObjectHolder.me().set(tbStartPage);
- return PREFIX + "tbStartPage_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list() {
- return tbStartPageService.list();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer usePort,String name,String time,String img) {
- TbStartPage tbStartPage = new TbStartPage();
- tbStartPage.setInsertTime(new Date());
- tbStartPage.setType(1);
- tbStartPage.setName(name);
-// tbStartPage.setPublisher(ShiroKit.getUser().getName());
- tbStartPageService.save(tbStartPage);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tbStartPageId) {
- TbStartPage byId = tbStartPageService.getById(tbStartPageId);
- byId.setState(3);
- tbStartPageService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer type,String name ,String img) {
- TbStartPage one = tbStartPageService.getOne(new LambdaQueryWrapper<TbStartPage>().eq(TbStartPage::getType, type));
- one.setName(name);
- if(img!=null && !"".equals(img)) {
- one.setUrl(img);
- }
- tbStartPageService.updateById(one);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbStartPageId}")
- @ResponseBody
- public Object detail(@PathVariable("tbStartPageId") Integer tbStartPageId) {
- return tbStartPageService.getById(tbStartPageId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysReformistController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysReformistController.java
deleted file mode 100644
index 9f43653..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysReformistController.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.math.BigDecimal;
-import java.text.Bidi;
-
-/**
- * 系统设置控制器
- *
- * @author fengshuonan
- * @Date 2020-06-09 13:43:1
- */
-@Controller
-@RequestMapping("/tSysReformist")
-public class TSysReformistController extends BaseController {
-
- private String PREFIX = "/system/tSysReformist/";
-
- @Autowired
- private ITSysReformistService tSysReformistService;
-
-// @Autowired
-// private ITSysIntegralService tSysIntegralService;
-
- @Autowired
- private ITSysFaceDistinguishService tSysFaceDistinguishService;
-
- @Autowired
- private ITSysPushOrderService tSysPushOrderService;
-
- @Autowired
- private ITSysCancleOrderService tSysCancleOrderService;
-
- @Autowired
- private ITPhoneService tPhoneService;
-
-
- /**
- * 跳转到系统设置首页
- */
- @RequestMapping("")
- public String index(Model model) {
- Integer companyId = UserExt.getUser().getObjectId();
- //改派设置
-// TSysReformist reformist = tSysReformistService.getOne(new QueryWrapper<TSysReformist>().eq("companyId", 1));
-// model.addAttribute("reformist",reformist);
-// //积分设置
-//// TSysIntegral integral = tSysIntegralService.getOne(new QueryWrapper<TSysIntegral>().eq("companyId", 1));
-//// model.addAttribute("integral",integral);
-// //人脸识别
-// TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.getOne(new QueryWrapper<TSysFaceDistinguish>().eq("companyId", 1));
-// model.addAttribute("faceDistinguish",faceDistinguish);
-//
- //专车推单(第一轮)摩托
-// TSysPushOrder zcOne = tSysPushOrderService.getOne(new QueryWrapper<TSysPushOrder>().eq("companyId", 1).eq("pushType", 1).eq("type", 1));
- TSysPushOrder zcOne = tSysPushOrderService.getOne(new QueryWrapper<TSysPushOrder>().eq("companyId", companyId).eq("pushType", 1));
- model.addAttribute("zcOne",JSON.parseObject(zcOne.getContent()));
-// //同城物流推单(第二轮)
- TSysPushOrder zcTwo = tSysPushOrderService.getOne(new QueryWrapper<TSysPushOrder>().eq("companyId", companyId).eq("pushType", 4));
- model.addAttribute("zcTwo",JSON.parseObject(zcTwo.getContent()));
-
- //普通取消设置(专车)
- TSysCancleOrder ptCancel1 = tSysCancleOrderService.getOne(new QueryWrapper<TSysCancleOrder>().eq("companyId", companyId).eq("type", 1).eq("orderType", 1));
- model.addAttribute("ptCancel1",ptCancel1);
-
- //预约取消设置(专车)
- TSysCancleOrder yyCancel1 = tSysCancleOrderService.getOne(new QueryWrapper<TSysCancleOrder>().eq("companyId", companyId).eq("type", 2).eq("orderType", 1));
- model.addAttribute("yyCancel1",yyCancel1);
-
- //报警电话
- TPhone phone1 = tPhoneService.getOne(new QueryWrapper<TPhone>().eq("companyId", companyId).eq("type", 1));
- model.addAttribute("phone1",phone1);
- //客服电话
- TPhone phone2 = tPhoneService.getOne(new QueryWrapper<TPhone>().eq("companyId", companyId).eq("type", 2));
- model.addAttribute("phone2",phone2);
-
-
-
- //保底
- TSysSet tSysSetmin = tPhoneService.getMin(companyId);
- model.addAttribute("min", tSysSetmin.getContent());
-
- TSysSet tSysSet1 = tPhoneService.getWaitOver(companyId);
- model.addAttribute("tSysSet1", JSON.parseObject(tSysSet1.getContent()));
-
- TSysSet tSysSet2 = tPhoneService.getRegister(companyId);
- String content = tSysSet2.getContent();
- JSONArray objects = JSON.parseArray(content);
- objects.getJSONObject(0).put("num10",1);
- model.addAttribute("tSysSet2", objects);
-
- TSysSet tSysSet3 = tPhoneService.getUserLevel(companyId);
- String content1 = tSysSet3.getContent();
- JSONArray objects1 = JSON.parseArray(content1);
- objects1.getJSONObject(0).put("num10",1);
- model.addAttribute("tSysSet3", objects1);
-
- TSysSet tSysSet10 = tPhoneService.getIntegral(companyId);
- String content10 = tSysSet10.getContent();
-
- BigDecimal minMoney = tPhoneService.getMinMoney();
- model.addAttribute("tSysSet10", JSON.parseObject(content10));
- model.addAttribute("language", UserExt.getLanguage());
- model.addAttribute("minMoney",minMoney);
- return PREFIX + "tSysReformist.html";
- }
-
-
- /**
- * 删除系统设置
- */
- @RequestMapping(value = "/setUp")
- @ResponseBody
- public Object setUp( String json0,String json1, String json2, String json3, String json4,
- String json5,
- Integer ptCancel1, BigDecimal ptCancel2,
- Integer yyCancel1, BigDecimal yyCancel2,
- String phone1, String phone2,BigDecimal min,Double minMoney) {
-
- try {
- Integer companyId = UserExt.getUser().getObjectId();
- //修改积分设置
- tPhoneService.updateIntegral(json0,companyId);
-
- // 修改等待超时
- tPhoneService.updateWait(json1,companyId);
-
-
- // 修改注册时长
- tPhoneService.updateRegister(json2,companyId);
-
- // 修改用户等级
- tPhoneService.updateUserLevel(json3,companyId);
-
- //修改摩托车退单
- tPhoneService.updateMotorPushOrder(json4,companyId);
-
- //修改同城快送推单
- tPhoneService.updateSendOrder(json5,companyId);
-
- // 修改 取消设置
- tPhoneService.updateCancel(ptCancel1,ptCancel2,companyId);
-
- // 修改预约取消设置
- tPhoneService.updateYyCancel(yyCancel1,yyCancel2,companyId);
-
- // 修改 报警电话
- tPhoneService.updatePolice(phone1,companyId);
-
- // 修改客服电话
- tPhoneService.updateTalk(phone2,companyId);
-
- //修改保底
- tPhoneService.updateMin(min,companyId);
-
- // 修改最低金额
- tPhoneService.updateMinMoney(minMoney);
-
-
- return SUCCESS_TIP;
- }catch (Exception e){
- e.printStackTrace();
- return ERROR;
- }
-
- }
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysSensitiveWordsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysSensitiveWordsController.java
deleted file mode 100644
index ca628ab..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TSysSensitiveWordsController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TSysSensitiveWords;
-import com.dsh.guns.modular.system.service.ITSysSensitiveWordsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 敏感词管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-09 19:45:29
- */
-@Controller
-@RequestMapping("/tSysSensitiveWords")
-public class TSysSensitiveWordsController extends BaseController {
-
- private String PREFIX = "/system/tSysSensitiveWords/";
-
- @Autowired
- private ITSysSensitiveWordsService tSysSensitiveWordsService;
-
- /**
- * 跳转到敏感词管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tSysSensitiveWords.html";
- }
-
- /**
- * 跳转到添加敏感词管理
- */
- @RequestMapping("/tSysSensitiveWords_add")
- public String tSysSensitiveWordsAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tSysSensitiveWords_add.html";
- }
-
- /**
- * 获取敏感词管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,
- String content,Integer yy) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
-
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (UserExt.getUser().getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tSysSensitiveWordsService.getSensitiveWordList(page,beginTime,endTime,content,yy));
- }
- return super.packForBT(page);
- }
-
- /**
- * 新增敏感词管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TSysSensitiveWords tSysSensitiveWords,Integer language) {
- tSysSensitiveWords.setCreateTime(new Date());
- tSysSensitiveWords.setLanguage(language);
- tSysSensitiveWordsService.save(tSysSensitiveWords);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除敏感词管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tSysSensitiveWordsId) {
- tSysSensitiveWordsService.removeById(tSysSensitiveWordsId);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserController.java
deleted file mode 100644
index 9bc552b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserController.java
+++ /dev/null
@@ -1,739 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import cn.hutool.crypto.SecureUtil;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.ErrorTip;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TPopularizeCode;
-import com.dsh.guns.modular.system.model.TUser;
-import com.dsh.guns.modular.system.service.TPopularizeCodeService;
-import com.dsh.guns.modular.system.util.ExcelExportUtil;
-import com.dsh.guns.modular.system.util.HttpRequestUtil;
-import com.dsh.guns.modular.system.util.PushURL;
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.dsh.guns.modular.system.util.DateUtil;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import com.dsh.guns.core.util.WoUtil;
-/**
- * 用户管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-01 15:47:58
- */
-@Controller
-@RequestMapping("/tUser")
-public class TUserController extends BaseController {
-
- private String PREFIX = "/system/tUser/";
-
- @Autowired
- private TUserClinet tUserClinet;
-
- @Autowired
- private CompanyClient companyClient;
-
- /**
- * 跳转到用户管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- Integer language = UserExt.getLanguage();
- model.addAttribute("language",language);
- return PREFIX + "tUser.html";
- }
-
- /**
- * 跳转到修改用户管理
- */
- @RequestMapping("/tUser_userDetail/{tUserId}")
- public String tUser_userDetail(@PathVariable Integer tUserId, Model model) {
- Map<String,Object> tUser = tUserClinet.getUserDetailById(tUserId);
- tUser.put("insertTimeStr",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.valueOf(tUser.get("insertTimeStr").toString()))));
- model.addAttribute("item",tUser);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tUser_userDetail.html";
- }
-
- /**
- * 跳转到修改用户余额页面
- */
- @RequestMapping("/tUser_updateBalance/{tUserId}")
- public String tUser_updateBalance(@PathVariable Integer tUserId, Model model) {
- model.addAttribute("tUserId",tUserId);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tUser_updateBalance.html";
- }
-
- /**
- * 跳转到修改用户密码页面
- */
- @RequestMapping("/tUser_updatePassword/{tUserId}")
- public String tUser_updatePassword(@PathVariable Integer tUserId, Model model) {
- model.addAttribute("tUserId",tUserId);
- return PREFIX + "tUser_updatePassword.html";
- }
-
- /**
- * 跳转到修改用户状态页面
- */
- @RequestMapping("/tUser_optUser/{tUserId}/{optType}")
- public String tUser_optUser(@PathVariable Integer tUserId,@PathVariable Integer optType, Model model) {
- model.addAttribute("tUserId",tUserId);
- model.addAttribute("optType",optType);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tUser_optUser.html";
- }
-
- /**
- * 获取用户管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String id,
- String nickName,
- String phone,
- Integer isAuth,
- Integer state,String companyName,Integer code) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- return super.packForBT(tUserClinet.getUserList(new QueryUserListReq(limit,offset,beginTime,endTime, UserExt.getUser().getRoleType(),UserExt.getUser().getObjectId(),isAuth,state,id,nickName,phone,companyName,code)));
- }
-
- /**
- * 修改余额操作
- */
- @RequestMapping(value = "/updateBalance")
- @ResponseBody
- public Object updateBalance(@RequestParam Integer tUserId,
- @RequestParam Integer updateType,
- @RequestParam BigDecimal money) {
-// TUser tUser = tUserService.selectById(tUserId);
- TUser tUser = tUserClinet.queryById(tUserId);
- if (SinataUtil.isNotEmpty(tUser)){
- if (1 == updateType.intValue()){ //增加
- tUser.setBalance(tUser.getBalance().add(money));
- }else if (2 == updateType.intValue()){ //减少
- if((tUser.getBalance().subtract(money)).compareTo(new BigDecimal(0)) == -1){
- tUser.setBalance(new BigDecimal(0));
- }else{
- tUser.setBalance(tUser.getBalance().subtract(money));
- }
- }
- tUser.setUpdateTime(new Date());
-// tUser.setUpdateUser(ShiroKit.getUser().getId());
- tUserClinet.updateById(tUser);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 修改密码操作
- */
- @RequestMapping(value = "/updatePassword")
- @ResponseBody
- public Object updatePassword(@RequestParam Integer tUserId,
- @RequestParam String password) {
- TUser tUser = tUserClinet.queryById(tUserId);
- if (SinataUtil.isNotEmpty(tUser)){
-// tUser.setPassWord(MD5Util.encrypt(password));
- tUser.setPassWord(SecureUtil.md5(password));
-
- tUser.setUpdateTime(new Date());
-// tUser.setUpdateUser(ShiroKit.getUser().getId());
- tUserClinet.updateById(tUser);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 操作用户
- */
- @RequestMapping(value = "/optUser")
- @ResponseBody
- public Object optUser(@RequestParam Integer tUserId,@RequestParam Integer optType,@RequestParam String remark) {
- TUser tUser = tUserClinet.queryById(tUserId);
- if (SinataUtil.isNotEmpty(tUser)){
- if (1 == optType.intValue()){ //冻结
- tUser.setState(2);
- tUser.setRemark(remark);
-
- //增加推送
- Map<String,String> map = new HashMap<>();
- map.put("uid", tUser.getId().toString());
- String result = HttpRequestUtil.postRequest(PushURL.freeze_user_url, map);
- System.out.println("冻结用户:【userId="+tUser.getId().toString()+"】,调用接口:"+result);
-
- }else if (2 == optType.intValue()){ //解冻
- tUser.setState(1);
- tUser.setRemark(remark);
- }
- tUser.setUpdateTime(new Date());
-// tUser.setUpdateUser(ShiroKit.getUser().getId());
- tUserClinet.updateById(tUser);
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 下载模板
- * @param request
- * @param response
- */
- @RequestMapping(value = "/uploadUserModel")
- public void uploadUserModel(HttpServletRequest request, HttpServletResponse response) {
- // 表格数据【封装】
- List<List<String>> dataList = new ArrayList<List<String>>();
-
- // 首行【封装】
- List<String> shellList = new ArrayList<String>();
- shellList.add("昵称");
- shellList.add("手机号");
- shellList.add("生日[例如:1995-09-09]");
- shellList.add("性别[男/女]");
- shellList.add("紧急联系人[选填]");
- shellList.add("紧急联系电话[选填]");
- shellList.add("是否实名认证[是/否]");
- shellList.add("真实姓名");
- shellList.add("身份证号");
- shellList.add("余额");
- shellList.add("密码[6-18个长度]");
- dataList.add(shellList);
-
- try {
- // 调用工具类进行导出
- ExcelExportUtil.easySheet("平台导入用户模板"+ DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "平台导入用户模板", dataList, request, response);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 导入操作
- * @param request
- * @return
- */
- @RequestMapping(value="/exportUser",method = RequestMethod.POST)
- @ResponseBody
- public Object exportUser(HttpServletRequest request){
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
- try {
- //定时五秒后执行
- /*Map<String,Object> maps=new HashMap<>();
- Workbook book = WoUtil.ImportFile(file);
- maps.put("book",book);
- QuartzManager.addJob(AddContract.class, (AddContract.name+new Date().getTime()).toUpperCase(), TimeJobType.ADMIN,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);*/
-
- Workbook book = WoUtil.ImportFile(file);
- Sheet sh = book.getSheetAt(0); //获取到第一个表
- for (int i = 1; i <= sh.getLastRowNum(); i++) {
- Row row = sh.getRow(i);
-
- Cell cell0 = row.getCell(0); //昵称
- String nickName = null;
- if (SinataUtil.isNotEmpty(cell0)){
- nickName = String.valueOf(cell0.getStringCellValue()).trim();
- }
-
- Cell cell1 = row.getCell(1); //手机号
- String phone = null;
- if (SinataUtil.isNotEmpty(cell1)){
- phone = String.valueOf(cell1.getStringCellValue()).trim();
- }
-
- Cell cell2 = row.getCell(2); //生日[例如:1995-09-09]
- String birthday = null;
- if (SinataUtil.isNotEmpty(cell2)){
- birthday = String.valueOf(cell2.getStringCellValue()).trim();
- }
-
- Cell cell3 = row.getCell(3); //性别[男/女]
- String sex = null;
- if (SinataUtil.isNotEmpty(cell3)){
- sex = String.valueOf(cell3.getStringCellValue()).trim();
- }
-
- Cell cell4 = row.getCell(4); //紧急联系人[选填]
- String emergencyContact = null;
- if (SinataUtil.isNotEmpty(cell4)){
- emergencyContact = String.valueOf(cell4.getStringCellValue()).trim();
- }
-
- Cell cell5 = row.getCell(5); //紧急联系电话[选填]
- String emergencyContactNumber = null;
- if (SinataUtil.isNotEmpty(cell5)){
- emergencyContactNumber = String.valueOf(cell5.getStringCellValue()).trim();
- }
-
- Cell cell6 = row.getCell(6); //是否实名认证[是/否]
- String isAuth = null;
- if (SinataUtil.isNotEmpty(cell6)){
- isAuth = String.valueOf(cell6.getStringCellValue()).trim();
- }
-
- Cell cell7 = row.getCell(7); //真实姓名
- String name = null;
- if (SinataUtil.isNotEmpty(cell7)){
- name = String.valueOf(cell7.getStringCellValue()).trim();
- }
-
- Cell cell8 = row.getCell(8); //身份证号
- String idCard = null;
- if (SinataUtil.isNotEmpty(cell8)){
- idCard = String.valueOf(cell8.getStringCellValue()).trim();
- }
-
- Cell cell9 = row.getCell(9); //余额
- String balance = null;
- if (SinataUtil.isNotEmpty(cell9)){
- balance = String.valueOf(cell9.getStringCellValue()).trim();
- }
-
- Cell cell10 = row.getCell(10); //密码
- String passWord = null;
- if (SinataUtil.isNotEmpty(cell10)){
- passWord = String.valueOf(cell10.getStringCellValue()).trim();
- }
-
- if (SinataUtil.isEmpty(nickName) || SinataUtil.isEmpty(phone) || SinataUtil.isEmpty(birthday)
- || SinataUtil.isEmpty(sex) || SinataUtil.isEmpty(isAuth) || SinataUtil.isEmpty(balance)
- || SinataUtil.isEmpty(passWord) ){
- return new ErrorTip(500, "单元格不能为空");
- }else{
- int count = tUserClinet.selectCountByPhone(new TUserReq(phone,3));
- if (count > 0){
- return new ErrorTip(500, "手机号已存在,请重新填写");
- }
- //判断性别
- if (!sex.equals("男") && !sex.equals("女")){
- return new ErrorTip(500, "性别内容不正确");
- }
- //判断是否实名认证
- if (!isAuth.equals("是") && !isAuth.equals("否")){
- return new ErrorTip(500, "是否实名认证内容不正确");
- }
- if ("是".equals(isAuth)){
- //判断紧急联系电话
- if (SinataUtil.isNotEmpty(emergencyContactNumber)){
- if (!isPhone(emergencyContactNumber)){
- return new ErrorTip(500, "紧急联系电话格式不正确");
- }
- }
- }
- //判断生日格式
- try {
- if (!isValidDate(birthday)) {
- birthday = importByExcelForDate(birthday);
- }
- }catch (Exception e){
- return new ErrorTip(500, "年检到期时间格式不正确");
- }
- //判断手机号
- if (!isPhone(phone)){
- return new ErrorTip(500, "手机号格式不正确");
- }
- //判断余额
- if (!isDouble(balance)){
- return new ErrorTip(500, "余额格式不正确");
- }
- //判断登录密码
- if (!isPassword(passWord)){
- return new ErrorTip(500, "登录密码格式不正确");
- }
- TUser user = new TUser();
- CompanyInfoRes company = companyClient.queryByStateAndFlgGetOne(new CompanyQueryStateAndFlgReq(1, 3));
-// TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", 3).last(" limit 1"));
- user.setCompanyId(company.getId());
- user.setPhone(phone);
- user.setNickName(nickName);
- user.setBirthday(DateUtil.parseDate(birthday));
- if (sex.equals("男")){
- user.setSex(1);
- }else if (sex.equals("女")){
- user.setSex(2);
- }
- user.setEmergencyContact(emergencyContact);
- user.setEmergencyContactNumber(emergencyContactNumber);
- if ("是".equals(isAuth)){
- user.setIsAuth(2);
- }else if ("否".equals(isAuth)){
- user.setIsAuth(1);
- }
- user.setName(name);
- user.setIdCard(idCard);
- user.setBalance(new BigDecimal(balance));
-// user.setPassWord(ShiroKit.md5(passWord, "&a.s"));
- user.setState(1);
- user.setFlag("1");
- user.setInsertTime(new Date());
-// user.setInsertUser(ShiroKit.getUser().getId());
- tUserClinet.save(user);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return SUCCESS_TIP;
- }
-
-
- /**
- * 判断日期是否满足yyyy-MM-dd格式
- * @param str
- * @return
- */
- public static boolean isValidDate(String str) {
- boolean convertSuccess=true;
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- try {
- format.setLenient(false);
- format.parse(str);
- } catch (Exception e) {
- convertSuccess=false;
- }
- return convertSuccess;
- }
-
-
- /**
- * 转换日期
- * @return
- */
- public static String importByExcelForDate(String value) {//value就是它的天数
- String currentCellValue = "";
- if(value != null && !value.equals("")){
- Calendar calendar = new GregorianCalendar(1900,0,-1);
- Date d = calendar.getTime();
- Date dd = DateUtils.addDays(d,Integer.valueOf(value));
- DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
- currentCellValue = formater.format(dd);
- }
- return currentCellValue;
- }
-
- /**
- * 验证手机号格式是否正确
- * @param str
- * @return
- */
- public static boolean isPhone(String str) {
- try{
- String reg = "^1\\d{10}$";
- boolean flag = str.matches(reg);
- return flag;
- }catch(NumberFormatException e) {
- System.out.println("异常：\"" + str + "\"...");
- return false;
- }
- }
-
- /**
- * 验证密码长度是否正确
- * @param str
- * @return
- */
- public static boolean isPassword(String str) {
- try{
- String reg = "^.{6,18}$";
- boolean flag = str.matches(reg);
- return flag;
- }catch(NumberFormatException e) {
- System.out.println("异常：\"" + str + "\"...");
- return false;
- }
- }
-
- /**
- * 验证是否可以字符转为金额值
- * @param str
- * @return
- */
- public static boolean isDouble(String str) {
- try{
- Double.parseDouble(str);
- return true;
- }catch(NumberFormatException e) {
- System.out.println("异常：\"" + str + "\"不是数字/整数/小数...");
- return false;
- }
- }
-
- @Resource
- private TPopularizeCodeService tPopularizeCodeService;
- @RequestMapping(value = "/getCode")
- @ResponseBody
- public void getCode(@RequestParam Integer num,
- @RequestParam String time,HttpServletRequest request, HttpServletResponse response) {
- Set<Integer> listMap = getFourCode(num);
- // 表格数据【封装】
- List<List<String>> dataList = new ArrayList<>();
-
- //第一行显示【封装】
- List<String> twoList = new ArrayList<String>();
-
- // 列【封装】
- List<String> shellList = new ArrayList<String>();
- shellList.add("Code");
- dataList.add(shellList);
- for (Integer object : listMap){
- // 详细数据列【封装】
- shellList = new ArrayList<String>();
- shellList.add(String.valueOf(object));
- dataList.add(shellList);
- }
- try {
- // 调用工具类进行导出
- ExcelExportUtil.easySheet("Code Table"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "Code Table", dataList,request, response);
- ArrayList<TPopularizeCode> tPopularizeCodes = new ArrayList<>();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- Date parse = dateFormat.parse(time);
- listMap.forEach(e->{
- TPopularizeCode tPopularizeCode = new TPopularizeCode();
- tPopularizeCode.setCode(e);
- tPopularizeCode.setExpire(parse);
- tPopularizeCodes.add(tPopularizeCode);
- });
- tPopularizeCodeService.saveBatch(tPopularizeCodes);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- private Set<Integer> getFourCode(Integer num){
- Set<Integer> set = new HashSet<>();
- Random random = new Random();
- int min = 1000; // 最小值为1000
- int max = 9999; // 最大值为9999
- while (set.size() < num) {
- int randomNumber = random.nextInt(max - min + 1) + min;
- set.add(randomNumber);
- }
- return set;
- }
- /**
- * 导出用户信息
- */
- @RequestMapping(value = "/outUser")
- public void outUser(HttpServletRequest request, HttpServletResponse response,String insertTime,
- String id,
- String nickName,
- String phone,
- Integer isAuth,
- Integer state,String companyName,Integer code) {
-// List<Map<String,Object>> listMap = tUserClinet.getUserListNoPage(new TUserOutUser(UserExt.getUser().getRoleType(),UserExt.getUser().getId()));
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- List<Map<String,Object>> listMap = tUserClinet.getUserList1(new QueryUserListReq(0, 0, beginTime, endTime, UserExt.getUser().getRoleType(), UserExt.getUser().getObjectId(), isAuth, state, id, nickName, phone, companyName, code));
- Integer language = UserExt.getLanguage();
- // 表格数据【封装】
- List<List<String>> dataList = new ArrayList<>();
-
- //第一行显示【封装】
- List<String> twoList = new ArrayList<String>();
- twoList.add("All:");
- twoList.add(String.valueOf(listMap.size())+"条");
- dataList.add(twoList);
-
- // 列【封装】
- List<String> shellList = new ArrayList<String>();
- if(language==1){
- shellList.add("注册时间");
- shellList.add("用户ID");
- shellList.add("注册地所属分公司");
- shellList.add("昵称");
- shellList.add("手机号");
- shellList.add("紧急联系人姓名");
- shellList.add("紧急联系人电话");
- shellList.add("是否实名认证");
- shellList.add("历史出行次数");
- shellList.add("历史消费");
- shellList.add("积分");
- shellList.add("用户等级");
- shellList.add("推广码");
- shellList.add("备注");
- shellList.add("状态");
- }else if(language==2){
- shellList.add("Registration date");
- shellList.add("User ID");
- shellList.add("Branch company of the place of registration");
- shellList.add("Nickname");
- shellList.add("Phone");
- shellList.add("Emergency contact name");
- shellList.add("Emergency contact number");
- shellList.add("Whether real-name authentication");
- shellList.add("Historical number of trips");
- shellList.add("Historical consumption");
- shellList.add("Integral");
- shellList.add("Level");
- shellList.add("Extension code");
- shellList.add("Remark");
- shellList.add("State");
- }else {
- shellList.add("Tanggal pendaftaran");
- shellList.add("ID Pengguna");
- shellList.add("Perusahaan Branch tempat pendaftaran");
- shellList.add("Nama");
- shellList.add("Telepon");
- shellList.add("Nama kontak darurat");
- shellList.add("Nomor kontak darurat");
- shellList.add("Apakah autentikasi nama asli");
- shellList.add("Jumlah perjalanan sejarah");
- shellList.add("Konsum sejarah");
- shellList.add("Integral");
- shellList.add("Tingkat");
- shellList.add("Kode ekstensi");
- shellList.add("Perhatian");
- shellList.add("Status");
- }
-
- dataList.add(shellList);
-
- for (Map<String,Object> object : listMap){
- // 详细数据列【封装】
- shellList = new ArrayList<String>();
- if(SinataUtil.isNotEmpty(object.get("insertTime"))){
- Object insertTime1 = object.get("insertTime");
- String date = DateUtil.getDate((Long) insertTime1);
- shellList.add(DateUtil.formatDate(DateUtil.parse(date,"YYYY-MM-dd"), "YYYY-MM-dd"));
- }else{
- shellList.add("-");
- }
- shellList.add(String.valueOf(object.get("id")));
- if(SinataUtil.isNotEmpty(object.get("companyName"))){
- shellList.add(object.get("companyName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("nickName"))){
- shellList.add(object.get("nickName").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("phone"))){
- shellList.add(object.get("phone").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("emergencyContact"))){
- shellList.add(object.get("emergencyContact").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("emergencyContactNumber"))){
- shellList.add(object.get("emergencyContactNumber").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("isAuth"))){
- if(language==1){
- shellList.add(object.get("isAuth").toString().equals("是")?"是":"否");
- }else if(language==2){
- shellList.add(object.get("isAuth").toString().equals("Yes")?"Yes":"No");
- }else {
- shellList.add(object.get("isAuth").toString().equals("Ya")?"Ya":"Tidak");
- }
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("historyNum"))){
- shellList.add(object.get("historyNum").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("consumption"))){
- shellList.add(object.get("consumption").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("integral"))){
- shellList.add(object.get("integral").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("level"))){
- shellList.add(object.get("level").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("code"))){
- shellList.add(object.get("code").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("remark"))){
- shellList.add(object.get("remark").toString());
- }else{
- shellList.add("-");
- }
- if(SinataUtil.isNotEmpty(object.get("state"))){
- if(language==1){
- shellList.add(Integer.valueOf(object.get("state").toString()) == 1?"正常":"冻结");
- }else if(language==2){
- shellList.add(Integer.valueOf(object.get("state").toString()) == 1?"Normal":"Freeze");
- }else {
- shellList.add(Integer.valueOf(object.get("state").toString()) == 1?"Normal":"Berhenti");
- }
-
- }else{
- shellList.add("-");
- }
- dataList.add(shellList);
- }
- try {
- // 调用工具类进行导出
-
- if(language==1){
- ExcelExportUtil.easySheet("用户信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "用户信息导出记录", dataList,request, response);
- }else if(language==2){
- ExcelExportUtil.easySheet("用户信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "User information export records", dataList,request, response);
- }else {
- ExcelExportUtil.easySheet("用户信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "Catatan eksport informasi pengguna", dataList,request, response);
- }
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserExitController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserExitController.java
deleted file mode 100644
index 719a1b4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserExitController.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TbUserExit;
-import com.dsh.guns.modular.system.service.ITbUserExitService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/userExit")
-public class TUserExitController extends BaseController {
-
- private String PREFIX = "/system/tUserExit/";
-
- @Autowired
- private ITbUserExitService tbUserExitService;
-
- @Autowired
- private TUserClinet tUserClinet;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model)
- {
- Integer language = UserExt.getLanguage();
- model.addAttribute("language",language);
- return PREFIX + "tbUserExit.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbUserExit_add")
- public String tbUserExitAdd() {
- return PREFIX + "tbUserExit_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbUserExit_update/{tbUserExitId}")
- public String tbUserExitUpdate(@PathVariable Integer tbUserExitId, Model model) {
- TbUserExit tbUserExit = tbUserExitService.getById(tbUserExitId);
- model.addAttribute("item", tbUserExit);
- LogObjectHolder.me().set(tbUserExit);
- return PREFIX + "tbUserExit_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public List<TbUserExit> list(String time, String name, Integer state) {
- return tbUserExitService.getList(time, name, state);
- }
-
-
- @RequestMapping(value = "/userExit")
- @ResponseBody
- @Transactional(propagation = Propagation.REQUIRES_NEW)
- public Object userExit(Integer id, String text) {
- TbUserExit byId = tbUserExitService.getById(id);
- byId.setState(2);
- byId.setRemark(text);
- tbUserExitService.updateById(byId);
- tUserClinet.userExit(byId.getUserId());
- return SUCCESS_TIP;
- }
-
- /**
- * 新增
- */
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer TUserExitId) {
- TbUserExit byId = tbUserExitService.getById(TUserExitId);
- byId.setState(3);
- tbUserExitService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- @RequestMapping(value = "/start")
- @ResponseBody
- public Object start(@RequestParam Integer TUserExitId) {
- TbUserExit byId = tbUserExitService.getById(TUserExitId);
- byId.setState(1);
- tbUserExitService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- @RequestMapping(value = "/stop")
- @ResponseBody
- public Object stop(@RequestParam Integer TUserExitId) {
- TbUserExit byId = tbUserExitService.getById(TUserExitId);
- byId.setState(2);
- tbUserExitService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TbUserExit tbUserExit) {
- tbUserExitService.updateById(tbUserExit);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbUserExitId}")
- @ResponseBody
- public Object detail(@PathVariable("tbUserExitId") Integer tbUserExitId) {
- return tbUserExitService.getById(tbUserExitId);
- }
-
-
- @ResponseBody
- @RequestMapping(value = "/saveUserExit")
- public void saveUserExit(@RequestBody TbUserExit tbUserExit) {
- tbUserExitService.save(tbUserExit);
- }
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserLargeController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserLargeController.java
deleted file mode 100644
index e473e94..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserLargeController.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.UserActivityClient;
-import com.dsh.course.feignClient.activity.model.LargeCouponUpdateReq;
-import com.dsh.course.feignClient.activity.model.UserLargeCouponReq;
-import com.dsh.course.feignClient.order.OrderPrivateCarClient;
-import com.dsh.course.feignClient.order.model.LargeListReq;
-import com.dsh.course.feignClient.order.model.LargerAllReq;
-import com.dsh.course.mapper.SysCouponRecordMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ITAuditRecordService;
-import com.dsh.guns.modular.system.service.ITUserLargeService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 大额优惠券
- *
- * @author fengshuonan
- * @Date 2020-06-05 14:31:28
- */
-@Controller
-@RequestMapping("/tUserLarge")
-public class TUserLargeController extends BaseController {
-
- private String PREFIX = "/system/tUserLargeCoupon/";
-
- @Autowired
- private ITUserLargeService userLargeService;
-
- @Autowired
- private UserActivityClient activityClient;
-
- @Resource
- private SysCouponRecordMapper sysCouponRecordMapper;
-
- @Autowired
- private OrderPrivateCarClient orderPrivateCarClient;
-
- @Autowired
- private ITAuditRecordService recordService;
-
- /**
- * 跳转到车辆类型管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- model.addAttribute("companyId", UserExt.getUser().getObjectId());
- return PREFIX + "tUserLargeCoupon.html";
- }
-
- /**
- * 跳转到添加车辆类型管理
- */
- @RequestMapping("/tUserLarge_add")
- public String tCarModelAdd(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tUserLargeCoupon_add.html";
- }
- @RequestMapping("/tUserLarge_audit/{tCarModelId}")
- public String tCarModelAudit(@PathVariable Integer tCarModelId,Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- model.addAttribute("id", tCarModelId);
- return PREFIX + "immediately.html";
- }
-
- /**
- * 跳转到修改车辆类型管理
- */
- @RequestMapping("/tUserLarge_update/{tCarModelId}")
- public String tCarModelUpdate(@PathVariable Integer tCarModelId, Model model) {
- TUserLargeCoupon tUserLargeCoupon = activityClient.getUserLargeCouponFromId(tCarModelId);
- model.addAttribute("item",tUserLargeCoupon);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("sTime",format.format(tUserLargeCoupon.getStartTime()));
- model.addAttribute("eTime",format.format(tUserLargeCoupon.getEndTime()));
- return PREFIX + "tUserLargeCoupon_edit.html";
- }
-
- @RequestMapping("/tUserLarge_all")
- public String tUserLargeAll(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
-// List<Integer> collect = sysCouponRecordMapper.selectList(new LambdaQueryWrapper<SysCouponRecord>().eq(SysCouponRecord::getCouponType, 3)).stream().map(SysCouponRecord::getId).collect(Collectors.toList());
- List<Integer> ids =activityClient.getLargeCouponIds();
- Map<String,Object> map = new HashMap<>();
- if(ids.size()>0){
- map = orderPrivateCarClient.tUserLargeAll(new LargerAllReq(ids,null,null));
- }else {
- map.put("allMoney",0);
- map.put("num",0);
- map.put("userNum",0);
- map.put("money",0);
- }
- model.addAttribute("map",map);
- return PREFIX + "tUserLargeCoupon_all.html";
- }
-
- /**
- * 获取车辆类型管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,
- String name,Integer status) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
-
- // 远程activity
- Page<Map<String, Object>> userLargeCoupons = activityClient.getUserLargeCoupon(new UserLargeCouponReq(limit,offset, beginTime, endTime, name, status,UserExt.getUser().getObjectId()));
- return super.packForBT(userLargeCoupons);
- }
- /**
- * 获取车辆类型管理列表
- */
- @RequestMapping(value = "/largeList")
- @ResponseBody
- public Object list(String useTime,
- String user,String phone,String couponName ,String number) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(useTime)){
- String[] timeArray = useTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- LambdaQueryWrapper<SysCouponRecord> like = new LambdaQueryWrapper<SysCouponRecord>().eq(SysCouponRecord::getCouponType, 3);
- if(Objects.nonNull(couponName)){
- like.like(SysCouponRecord::getName, couponName);
- }
- List<SysCouponRecord> sysCouponRecords = sysCouponRecordMapper.selectList(like);
-
-
- Page<Map<String, Object>> userLargeCoupons =new Page<>();
- if(sysCouponRecords.size()>0) {
- List<Integer> ids = sysCouponRecords.stream().map(SysCouponRecord::getId).collect(Collectors.toList());
- // 远程activity
- userLargeCoupons = orderPrivateCarClient.largeList(new LargeListReq(limit, offset, beginTime, endTime, user, phone, number,ids));
- List<Map<String, Object>> records = userLargeCoupons.getRecords();
- for (Map<String, Object> record : records) {
- for (SysCouponRecord sysCouponRecord : sysCouponRecords) {
- if(record.get("cId")!=null) {
- String couponId = record.get("cId").toString();
- if (couponId.equals(sysCouponRecord.getId().toString())) {
- record.put("couponName", sysCouponRecord.getName());
- }
- }
- }
- }
- }
- return super.packForBT(userLargeCoupons);
- }
-
- /**
- * 新增车辆类型管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TUserLargeCoupon tUserLargeCoupon,Integer type,String time) {
- String[] split = time.split(" - ");
- tUserLargeCoupon.setStartTime(DateUtil.parseDateOne(split[0]+" 00:00:00"));
- tUserLargeCoupon.setEndTime(DateUtil.parseDateOne(split[1]+" 23:59:59"));
- tUserLargeCoupon.setType(type);
- tUserLargeCoupon.setCompanyId(UserExt.getUser().getObjectId());
- activityClient.addLargeCoupon(tUserLargeCoupon);
- return SUCCESS_TIP;
- }
-
-
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public Object immediately(Integer id,String remark,Integer state) {
- TUserLargeCoupon tUserLargeCoupon = activityClient.updateLargeCounpon(new LargeCouponUpdateReq(id,state,remark));
- TAuditRecord tAuditRecord = new TAuditRecord();
- if(state==3){
- tAuditRecord.setAuditStatus(2);
- }else {
- tAuditRecord.setAuditStatus(3);
- }
- tAuditRecord.setActivityId(tUserLargeCoupon.getId());
- tAuditRecord.setActivityName(tUserLargeCoupon.getName());
- tAuditRecord.setActivityType(4);
- tAuditRecord.setAuditTime(new Date());
- tAuditRecord.setAuditUserId(UserExt.getUser().getId());
- tAuditRecord.setRemark(remark);
- recordService.save(tAuditRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除车辆类型管理
- */
- @RequestMapping(value = "/updateStatus")
- @ResponseBody
- public Object updateStatus(@RequestParam Integer tCarModelId) {
- activityClient.updateStatusFromId(tCarModelId);
- return SUCCESS_TIP;
- }
-
- @RequestMapping(value = "/updateTime")
- @ResponseBody
- public Object updateTime(@RequestParam String time) {
- String sTime=null;
- String eTime=null;
- if(time!=null && time !=""){
- sTime =time.split(" - ")[0];
- eTime =time.split(" - ")[1];
- }
-// List<Integer> collect = sysCouponRecordMapper.selectList(new LambdaQueryWrapper<SysCouponRecord>().eq(SysCouponRecord::getCouponType, 3)).stream().map(SysCouponRecord::getId).collect(Collectors.toList());
- List<Integer> ids =activityClient.getLargeCouponIds();
- Map<String,Object> map = new HashMap<>();
- if(ids.size()>0){
- map = orderPrivateCarClient.tUserLargeAll(new LargerAllReq(ids,sTime,eTime));
- }else {
- map.put("allMoney",0);
- map.put("num",0);
- map.put("userNum",0);
- map.put("money",0);
- }
- return map;
- }
-
- /**
- * 修改车辆类型管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TCarModel tCarModel,Integer language) {
- tCarModel.setLanguage(language);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserRedPacketRecordController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserRedPacketRecordController.java
deleted file mode 100644
index 85710e0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TUserRedPacketRecordController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.TUserRedPackerRecordClient;
-import com.dsh.course.feignClient.activity.UserCouponRecordClient;
-import com.dsh.course.feignClient.activity.model.GetRedListReq;
-import com.dsh.course.feignClient.activity.model.UpdateUserRedPacketRecordReq;
-import com.dsh.course.feignClient.activity.model.UserRedPacketRecordRes;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Map;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-07-10 15:33:49
- */
-@Controller
-@RequestMapping("/tUserRedPacketRecord")
-public class TUserRedPacketRecordController extends BaseController {
-
- private String PREFIX = "/system/tUserRedPacketRecord/";
-
- @Autowired
- private TUserRedPackerRecordClient tUserRedPackerRecordClient;
-
- @Autowired
- private UserCouponRecordClient userCouponRecordService;
-
-
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model,Integer couponActivityId) {
- model.addAttribute("couponActivityId",couponActivityId);
- return PREFIX + "tUserRedPacketRecord.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tUserRedPacketRecord_add")
- public String tUserRedPacketRecordAdd() {
- return PREFIX + "tUserRedPacketRecord_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tUserRedPacketRecord_update/{tUserRedPacketRecordId}")
- public String tUserRedPacketRecordUpdate(@PathVariable Integer tUserRedPacketRecordId, Model model) {
- UserRedPacketRecordRes userRedPacketRecordRes = tUserRedPackerRecordClient.queryUserRedPacketRecordById(tUserRedPacketRecordId);
- model.addAttribute("item",userRedPacketRecordRes);
- LogObjectHolder.me().set(userRedPacketRecordRes);
- return PREFIX + "tUserRedPacketRecord_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,String userName,String userPhone,Integer couponActivityId,Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(userCouponRecordService.getRedList(new GetRedListReq(page,beginTime,endTime,userName,userPhone,couponActivityId,state)));
- return super.packForBT(page);
- }
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserRedPacketRecordRes tUserRedPacketRecord) {
- tUserRedPackerRecordClient.saveUserRedPacketRecordById(tUserRedPacketRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tUserRedPacketRecordId) {
- tUserRedPackerRecordClient.deleteById(tUserRedPacketRecordId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UpdateUserRedPacketRecordReq tUserRedPacketRecord) {
- tUserRedPackerRecordClient.updateUserRedPacketRecord(tUserRedPacketRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tUserRedPacketRecordId}")
- @ResponseBody
- public Object detail(@PathVariable("tUserRedPacketRecordId") Integer tUserRedPacketRecordId) {
- return tUserRedPackerRecordClient.queryUserRedPacketRecordById(tUserRedPacketRecordId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVerifiedController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVerifiedController.java
deleted file mode 100644
index 42cdb52..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVerifiedController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.VerifyClient;
-import com.dsh.course.feignClient.activity.model.VerifiedReq;
-import com.dsh.course.feignClient.activity.model.VerifiedSearchReq;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Map;
-
-/**
- * 实名认证列表控制器
- *
- * @author fengshuonan
- * @Date 2020-06-09 08:46:44
- */
-@Controller
-@RequestMapping("/tVerified")
-public class TVerifiedController extends BaseController {
-
- private String PREFIX = "/system/tVerified/";
-
-
- @Autowired
- private VerifyClient verifyClient;
-
- /**
- * 跳转到实名认证列表首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tVerified.html";
- }
-
- /**
- * 跳转到添加实名认证列表
- */
- @RequestMapping("/tVerified_add")
- public String tVerifiedAdd() {
- return PREFIX + "tVerified_add.html";
- }
-
- /**
- * 跳转到修改实名认证列表
- */
- @RequestMapping("/tVerified_immediately/{tVerifiedId}")
- public String tVerifiedUpdate(@PathVariable Integer tVerifiedId, Model model) {
- model.addAttribute("tVerifiedId",tVerifiedId);
- return PREFIX + "tVerified_immediately.html";
- }
-
- /**
- * 获取实名认证列表列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String userName,
- String userPhone,
- String name,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (33!= 1){
- page.setRecords(null);
- }else{
- page.setRecords(verifyClient.queryVerifySearch(new VerifiedSearchReq(page,beginTime,endTime,userName,userPhone,name,state)));
- }
- return super.packForBT(page);
- }
-
- /**
- * 立即审核操作
- */
- @RequestMapping(value = "/immediately")
- @ResponseBody
- public Object immediately(@RequestParam Integer id,@RequestParam Integer state) {
- if (SinataUtil.isNotEmpty(id) && SinataUtil.isNotEmpty(state)){
- VerifiedReq tVerified = verifyClient.queryById(id);
- tVerified.setState(state);
- verifyClient.updateById(tVerified);
-
- //增加系统消息
- /*TSystemNotice notice = new TSystemNotice();
- notice.setType(2);
- notice.setUserType(2); //todo
- if (2 == state){
- notice.setContent("实名认证处理结果:【您的实名认证申请已通过审核】。");
- }else if (3 == state){
- notice.setContent("实名认证处理结果:【您的实名认证申请未通过审核】。");
- }
- notice.setUserId(tVerified.getUserId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- tSystemNoticeService.insert(notice);*/
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 删除实名认证列表
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tVerifiedId) {
- verifyClient.delete(tVerifiedId);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVersionManagementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVersionManagementController.java
deleted file mode 100644
index 6762b68..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVersionManagementController.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.config.properties.GunsProperties;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TVersionManagement;
-import com.dsh.guns.modular.system.model.User;
-import com.dsh.guns.modular.system.service.ITVersionManagementService;
-import com.dsh.guns.modular.system.util.OBSUploadUtil;
-import com.dsh.guns.modular.system.util.OssUploadUtil;
-import org.bouncycastle.math.raw.Mod;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 版本管理控制器
- *
- * @author fengshuonan
- * @Date 2020-06-10 18:43:26
- */
-@Controller
-@RequestMapping("/tVersionManagement")
-public class TVersionManagementController extends BaseController {
-
- private String PREFIX = "/system/tVersionManagement/";
-
- @Autowired
- private ITVersionManagementService tVersionManagementService;
-
-
- /**
- * 跳转到版本管理首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tVersionManagement.html";
- }
-
- /**
- * 跳转到查看详情
- */
- @RequestMapping("/lookDetail/{id}/{type}")
- public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
- TVersionManagement tVersionManagement = tVersionManagementService.getById(id);
- String str = "";
- if (1 == type){
- str = tVersionManagement.getContent();
- }
- model.addAttribute("str",str);
- return "/system/tComplaint/lookDetail.html";
- }
-
- /**
- * 跳转到添加版本管理
- */
- @RequestMapping("/tVersionManagement_add")
- public String tVersionManagementAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tVersionManagement_add.html";
- }
-
- /**
- * 跳转到修改版本管理
- */
- @RequestMapping("/tVersionManagement_update/{tVersionManagementId}")
- public String tVersionManagementUpdate(@PathVariable Integer tVersionManagementId, Model model) {
- TVersionManagement tVersionManagement = tVersionManagementService.getById(tVersionManagementId);
- model.addAttribute("item",tVersionManagement);
- LogObjectHolder.me().set(tVersionManagement);
- return PREFIX + "tVersionManagement_edit.html";
- }
-
- /**
- * 获取版本管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String version) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- User user = UserExt.getUser();
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (user.getRoleType() != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tVersionManagementService.getVersionList(page,beginTime,endTime,version));
- }
- return super.packForBT(page);
- }
-
- @Autowired
- private GunsProperties gunsProperties;
-
- /**
- * 异步上传包
- * @param myfile
- * @return
- */
- @ResponseBody
- @RequestMapping("/saveApk")
- public Map<String, Object> saveApk(@RequestPart("myfile") MultipartFile myfile, HttpServletRequest request){
- Map<String, Object> m = new HashMap<>();
- /*try {
- String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
- try {
- String fileSavePath = gunsProperties.getFileUploadPath()+"apk\\";
- file.transferTo(new File(fileSavePath + pictureName));
- } catch (Exception e) {
- e.printStackTrace();
- }
- m.put("imgUrl", gunsProperties.getPictureServerAddress()+"apk/"+pictureName);
- } catch (Exception e) {
- e.printStackTrace();
- }*/
- try {
- MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
- MultipartFile file = (MultipartFile) myfile;
-
- String pictureName = OBSUploadUtil.inputStreamUpload(file);
- m.put("imgUrl", pictureName);
- }catch (Exception e){
- e.printStackTrace();
- }
- return m;
- }
-
- /**
- * 新增版本管理
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TVersionManagement tVersionManagement) {
- //判断版本号是否相同
- int count = tVersionManagementService.getBaseMapper().selectCount(
- new QueryWrapper<TVersionManagement>()
- .eq("version", tVersionManagement.getVersion())
- .eq("type", tVersionManagement.getType()));
- if (count > 0){
- return "error";
- }
-
- tVersionManagement.setInsertTime(new Date());
- tVersionManagementService.save(tVersionManagement);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除版本管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tVersionManagementId) {
- tVersionManagementService.removeById(tVersionManagementId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改版本管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TVersionManagement tVersionManagement) {
- int count = tVersionManagementService.getBaseMapper().selectCount(
- new QueryWrapper<TVersionManagement>()
- .eq("version", tVersionManagement.getVersion())
- .eq("type", tVersionManagement.getType()));
- if (count > 0){
- return "error";
- }
- tVersionManagementService.updateById(tVersionManagement);
- return SUCCESS_TIP;
- }
-
- /**
- * 版本管理详情
- */
- @RequestMapping(value = "/detail/{tVersionManagementId}")
- @ResponseBody
- public Object detail(@PathVariable("tVersionManagementId") Integer tVersionManagementId) {
- return tVersionManagementService.getById(tVersionManagementId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVoiceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVoiceController.java
deleted file mode 100644
index 364515c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TVoiceController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TbVoice;
-import com.dsh.guns.modular.system.service.ITbVoiceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/TVoice")
-public class TVoiceController extends BaseController {
-
- private String PREFIX = "/system/tVoice/";
-
- @Autowired
- private ITbVoiceService tbVoiceService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tbVoice.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbVoice_add")
- public String tbVoiceAdd(Model model) {
- model.addAttribute("language1",UserExt.getLanguage());
- return PREFIX + "tbVoice_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbVoice_update/{tbVoiceId}")
- public String tbVoiceUpdate(@PathVariable Integer tbVoiceId, Model model) {
- TbVoice tbVoice = tbVoiceService.getById(tbVoiceId);
- model.addAttribute("item",tbVoice);
- model.addAttribute("language1",UserExt.getLanguage());
- LogObjectHolder.me().set(tbVoice);
- return PREFIX + "tbVoice_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public List<TbVoice> list(String name , Integer state) {
- return tbVoiceService.getList(name,state);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer language,String url,Integer userType, String name) {
- List<TbVoice> list = tbVoiceService.list(new LambdaQueryWrapper<TbVoice>().eq(TbVoice::getVoiceType, userType).eq(TbVoice::getLanguage,language).ne(TbVoice::getState,3));
- if(list.size()>0){
- return "504";
- }
-
- TbVoice tbVoice = new TbVoice();
- tbVoice.setState(1);
- tbVoice.setCreateTime(new Date());
- tbVoice.setLanguage(language);
- tbVoice.setVoiceType(userType);
- tbVoice.setUrl(url);
-// tbVoice.setInsertTime(new Date());
- tbVoice.setName(name);
-// tbVoice.setPublisher(ShiroKit.getUser().getName());
- tbVoiceService.save(tbVoice);
- return SUCCESS_TIP;
- }
-
-// public static void main(String[] args) {
-// String a ="C:\\fakepath\\998e5510ea7fc3d1733ec901e778988f.jpg";
-// String[] split = a.split("\\.");
-// String s = split[split.length-1];
-// int i = a.lastIndexOf("\\")+1;
-// int i1 = a.lastIndexOf(".");
-// String substring = a.substring(i, i1);
-// System.out.println(substring);
-// }
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer TVoiceId) {
- TbVoice byId = tbVoiceService.getById(TVoiceId);
- byId.setState(3);
- tbVoiceService.updateById(byId);
- return SUCCESS_TIP;
- }
- @RequestMapping(value = "/start")
- @ResponseBody
- public Object start(@RequestParam Integer TVoiceId) {
- TbVoice byId = tbVoiceService.getById(TVoiceId);
- byId.setState(1);
- tbVoiceService.updateById(byId);
- return SUCCESS_TIP;
- }
- @RequestMapping(value = "/stop")
- @ResponseBody
- public Object stop(@RequestParam Integer TVoiceId) {
- TbVoice byId = tbVoiceService.getById(TVoiceId);
- byId.setState(2);
- tbVoiceService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer id,Integer language,String url,Integer userType) {
- List<TbVoice> list = tbVoiceService.list(new LambdaQueryWrapper<TbVoice>().eq(TbVoice::getVoiceType, userType).eq(TbVoice::getLanguage,language).ne(TbVoice::getId, id).ne(TbVoice::getState,3));
- if(list.size()>0){
- return "504";
- }
-
-
- TbVoice byId = tbVoiceService.getById(id);
- byId.setLanguage(language);
- byId.setUrl(url);
- byId.setVoiceType(userType);
- int i = url.lastIndexOf("\\")+1;
- int i1 = url.lastIndexOf(".");
- String substring = url.substring(i, i1);
- byId.setName(substring);
- tbVoiceService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbVoiceId}")
- @ResponseBody
- public Object detail(@PathVariable("tbVoiceId") Integer tbVoiceId) {
- return tbVoiceService.getById(tbVoiceId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TbBannerController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TbBannerController.java
deleted file mode 100644
index 7114ea3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/TbBannerController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.TbBanner;
-import com.dsh.guns.modular.system.service.ITbBannerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2022-06-17 14:43:39
- */
-@Controller
-@RequestMapping("/tbBanner")
-public class TbBannerController extends BaseController {
-
- private String PREFIX = "/system/tbBanner/";
-
- @Autowired
- private ITbBannerService tbBannerService;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tbBanner.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tbBanner_add")
- public String tbBannerAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tbBanner_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/tbBanner_update/{tbBannerId}")
- public String tbBannerUpdate(@PathVariable Integer tbBannerId, Model model) {
- TbBanner tbBanner = tbBannerService.getById(tbBannerId);
- model.addAttribute("item",tbBanner);
- LogObjectHolder.me().set(tbBanner);
- return PREFIX + "tbBanner_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list() {
- List<TbBanner> list = tbBannerService.list(new LambdaQueryWrapper<TbBanner>().ne(TbBanner::getState,3).orderByDesc(TbBanner::getInsertTime));
- for (TbBanner tbBanner : list) {
- tbBanner.setShowStartTime(tbBanner.getShowStartTime()+"至"+tbBanner.getShowStopTime());
- }
- return list;
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer usePort,String name,String time,String img) {
- List<TbBanner> list = tbBannerService.list(new LambdaQueryWrapper<TbBanner>().eq(TbBanner::getUsePort, usePort).ne(TbBanner::getState,3));
- if(list.size()>0){
- return "504";
- }
- TbBanner tbBanner = new TbBanner();
- tbBanner.setInsertTime(new Date());
- tbBanner.setType(3);
- tbBanner.setName(name);
- tbBanner.setUsePort(usePort);
- tbBanner.setUrl(img);
- tbBanner.setShowStartTime(time.split(" - ")[0]);
- tbBanner.setShowStopTime(time.split(" - ")[1]);
-// tbBanner.setPublisher(ShiroKit.getUser().getName());
- tbBannerService.save(tbBanner);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tbBannerId) {
- TbBanner byId = tbBannerService.getById(tbBannerId);
- byId.setState(3);
- tbBannerService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TbBanner tbBanner) {
- tbBannerService.updateById(tbBanner);
- return SUCCESS_TIP;
- }
- @RequestMapping(value = "/updateState")
- @ResponseBody
- public Object update(Integer id,Integer state) {
- TbBanner byId = tbBannerService.getById(id);
- byId.setState(state);
- tbBannerService.updateById(byId);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{tbBannerId}")
- @ResponseBody
- public Object detail(@PathVariable("tbBannerId") Integer tbBannerId) {
- return tbBannerService.getById(tbBannerId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityBalanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityBalanceController.java
deleted file mode 100644
index 5a33d27..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityBalanceController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.UserActivityBalanceClient;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.UserActivityBalance;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:32:36
- */
-@Controller
-@RequestMapping("/userActivityBalance")
-public class UserActivityBalanceController extends BaseController {
-
- private String PREFIX = "/system/userActivityBalance/";
-
- @Autowired
- private UserActivityBalanceClient userActivityBalanceClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "userActivityBalance.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivityBalance_add")
- public String userActivityBalanceAdd() {
- return PREFIX + "userActivityBalance_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivityBalance_update/{userActivityBalanceId}")
- public String userActivityBalanceUpdate(@PathVariable Integer userActivityBalanceId, Model model) {
- UserActivityBalance userActivityBalance = userActivityBalanceClient.detail(userActivityBalanceId);
- model.addAttribute("item",userActivityBalance);
- LogObjectHolder.me().set(userActivityBalance);
- return PREFIX + "userActivityBalance_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return userActivityBalanceClient.list();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserActivityBalance userActivityBalance) {
- userActivityBalanceClient.add(userActivityBalance);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityBalanceId) {
- userActivityBalanceClient.delete(userActivityBalanceId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserActivityBalance userActivityBalance) {
- userActivityBalanceClient.update(userActivityBalance);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userActivityBalanceId}")
- @ResponseBody
- public Object detail(@PathVariable("userActivityBalanceId") Integer userActivityBalanceId) {
- return userActivityBalanceClient.detail(userActivityBalanceId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityController.java
deleted file mode 100644
index e2eab3d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityController.java
+++ /dev/null
@@ -1,502 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.*;
-import com.dsh.course.feignClient.activity.model.*;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.enums.ActivityTypeEnum;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ISysCouponRecordService;
-import com.dsh.guns.modular.system.service.ISysRedPacketRecordService;
-import com.dsh.guns.modular.system.service.ITAuditRecordService;
-import com.dsh.guns.modular.system.util.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:32:29
- */
-@Controller
-@RequestMapping("/userActivity")
-public class UserActivityController extends BaseController {
-
- private String PREFIX = "/system/userActivity/";
-
- @Autowired
- private UserActivityClient userActivityClient;
-
- @Autowired
- private UserActivityBalanceClient userActivityBalanceClient;
-
- @Autowired
- private UserActivityDiscount1Client userActivityDiscount1Client;
-
- @Autowired
- private UserActivityInviteClient userActivityInviteClient;
-
- @Autowired
- private UserActivityRedenvelpoeClient userActivityRedenvelpoeClient;
-
- @Autowired
- private UserActivityRegisteredClient userActivityRegisteredClient;
-
-
- @Autowired
- private ISysCouponRecordService sysCouponRecordService;
-
- @Autowired
- private ISysRedPacketRecordService sysRedPacketRecordService;
-
- @Autowired
- private UserCouponRecordClient userCouponRecordService;
- @Autowired
- private ITAuditRecordService auditRecordService;
-
-
- /**
- * 跳转领取统计
- *
- * @return
- */
- @RequestMapping("/receiveRecord")
- public String receiveRecord(Model model, Integer activityId) {
- model.addAttribute("activityId", activityId);
- UserActivity userActivity = userActivityClient.queryUserActivityById(activityId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
- model.addAttribute("endTime", sdf.format(userActivity.getEndTime()));
- UserActivityRegistered userActivityRegistered = userActivityRegisteredClient.queryUserActivityRegisteredByActivityId(activityId);
- UserActivityInvite userActivityInvite = userActivityInviteClient.queryUserActivityInviteByActivityId(activityId);
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Client.queryUserActivityDiscount1ByActivityId(activityId);
- UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelpoeClient.queryUserActivityRedenvelopeByActivityId(activityId);
- if (SinataUtil.isNotEmpty(userActivityRegistered)) {
- model.addAttribute("userActivityRegisteredId", userActivityRegistered.getId());
- } else {
- model.addAttribute("userActivityRegisteredId", 0);
- }
- if (SinataUtil.isNotEmpty(userActivityInvite)) {
- model.addAttribute("userActivityInviteId", userActivityInvite.getId());
- } else {
- model.addAttribute("userActivityInviteId", 0);
- }
- if (SinataUtil.isNotEmpty(userActivityDiscount1)) {
- model.addAttribute("userActivityDiscount1Id", userActivityDiscount1.getId());
- } else {
- model.addAttribute("userActivityDiscount1Id", 0);
- }
- if (SinataUtil.isNotEmpty(userActivityRedenvelope)) {
- model.addAttribute("userActivityRedenvelopeId", userActivityRedenvelope.getId());
- } else {
- model.addAttribute("userActivityRedenvelopeId", 0);
- }
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "receiveRecord.html";
- }
-
- @RequestMapping(value = "/receiveRecordDetail")
- @ResponseBody
- public Object receiveRecordDetail(String createTime, Integer activityId) {
- String startTimes = null;
- String endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)) {
- String[] timeArray = createTime.split(" - ");
- startTimes = timeArray[0];
- endTimes = timeArray[1];
- } else {
- UserActivity userActivity = userActivityClient.queryUserActivityById(activityId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- startTimes = sdf.format(userActivity.getStartTime());
- endTimes = sdf.format(userActivity.getEndTime());
- }
- Map<String, Object> map = new HashMap<>();
- Double totalMOney = 0d;
- UserActivityRegistered userActivityRegistered = userActivityRegisteredClient.queryUserActivityRegisteredByActivityId(activityId);
- UserActivityInvite userActivityInvite = userActivityInviteClient.queryUserActivityInviteByActivityId(activityId);
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Client.queryUserActivityDiscount1ByActivityId(activityId);
- UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelpoeClient.queryUserActivityRedenvelopeByActivityId(activityId);
- if (SinataUtil.isNotEmpty(userActivityRegistered)) {
- Map<String, Object> resultMap = userCouponRecordService.getCouponStatic(new GetCouponStaticReq(startTimes, endTimes, userActivityRegistered.getId(), 2));
- totalMOney += Double.parseDouble(resultMap.get("money").toString());
- map.put("userActivityRegisteredMoney", resultMap.get("money"));
- map.put("userActivityRegisteredNumber", resultMap.get("number"));
- map.put("userActivityRegisteredUseMoney", resultMap.get("useMoney"));
- } else {
- map.put("userActivityRegisteredMoney", 0);
- map.put("userActivityRegisteredNumber", 0);
- map.put("userActivityRegisteredUseMoney", 0);
- }
- if (SinataUtil.isNotEmpty(userActivityInvite)) {
- Map<String, Object> resultMap = userCouponRecordService.getCouponStatic(new GetCouponStaticReq(startTimes, endTimes, userActivityInvite.getId(), 3));
- totalMOney += Double.parseDouble(resultMap.get("money").toString());
- map.put("userActivityInviteMoney", resultMap.get("money"));
- map.put("userActivityInviteNumber", resultMap.get("number"));
- map.put("userActivityInviteUseMoney", resultMap.get("useMoney"));
- } else {
- map.put("userActivityInviteMoney", 0);
- map.put("userActivityInviteNumber", 0);
- map.put("userActivityInviteUseMoney", 0);
- }
- if (SinataUtil.isNotEmpty(userActivityDiscount1)) {
- Map<String, Object> resultMap = userCouponRecordService.getDiscountStatic(new GetDiscountStaticReq(startTimes, endTimes, userActivityDiscount1.getId()));
- if(resultMap!=null){
- map.put("userActivityDiscount1Money", resultMap.get("money"));
- map.put("userActivityDiscount1Number", resultMap.get("number"));
- }else {
- map.put("userActivityDiscount1Money", 0);
- map.put("userActivityDiscount1Number", 0);
- }
-
- } else {
- map.put("userActivityDiscount1Money", 0);
- map.put("userActivityDiscount1Number", 0);
- }
- if (SinataUtil.isNotEmpty(userActivityRedenvelope)) {
- Map<String, Object> resultMap = userCouponRecordService.getRedStatic(new GetDiscountStaticReq(startTimes, endTimes, userActivityRedenvelope.getId()));
- totalMOney += Double.parseDouble(resultMap.get("money").toString());
- map.put("userActivityRedenvelopeMoney", resultMap.get("money"));
- map.put("userActivityRedenvelopeNumber", resultMap.get("number"));
- map.put("userActivityRedenvelopeUseMoney", resultMap.get("useMoney"));
- } else {
- map.put("userActivityRedenvelopeMoney", 0);
- map.put("userActivityRedenvelopeNumber", 0);
- map.put("userActivityRedenvelopeUseMoney", 0);
- }
- Map<String, Object> resultMap = userCouponRecordService.getRegStatic(new GetDiscountStaticReq(startTimes, endTimes, activityId));
-
- totalMOney += Double.parseDouble(resultMap.get("money").toString());
- map.put("totalMOney", totalMOney);
- return map;
- }
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- model.addAttribute("id",UserExt.getUser().getObjectId());
- return PREFIX + "userActivity.html";
- }
-
- /**
- * 跳转添加注册送优惠券页面
- *
- * @return
- */
- @RequestMapping("addRegist")
- public String addRegist(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "addRegist.html";
- }
-
- /**
- * 跳转红包选择页面
- *
- * @return
- */
- @RequestMapping("/sysRedPacketRecord")
- public String sysRedPacketRecord() {
- return PREFIX + "sysRedPacketRecord.html";
- }
-
- /**
- * 跳转到选择优惠券页面
- *
- * @return
- */
- @RequestMapping("/sysCouponRecord")
- public String sysCouponRecord(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "sysCouponRecord.html";
- }
-
- @RequestMapping("/sysCouponRecord1")
- public String sysCouponRecord1(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "sysCouponRecord1.html";
- }
-
- @RequestMapping("/sysCouponRecord2")
- public String sysCouponRecord2(Model model, Integer type) {
- model.addAttribute("type", type);
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "sysCouponRecord2.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivity_add")
- public String userActivityAdd(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "userActivity_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivity_update/{userActivityId}")
- public String userActivityUpdate(@PathVariable Integer userActivityId, Model model) {
- UserActivity userActivity = userActivityClient.queryUserActivityById(userActivityId);
- model.addAttribute("item", userActivity);
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
- model.addAttribute("endTime", sdf.format(userActivity.getEndTime()));
- UserActivityRegistered userActivityRegistered = userActivityRegisteredClient.queryUserActivityRegisteredByActivityId(userActivity.getId());
-
- model.addAttribute("item1", userActivityRegistered);
- if (userActivityRegistered != null) {
- model.addAttribute("item1Coupon", sysCouponRecordService.getById(userActivityRegistered.getCouponId()));
- }
- UserActivityInvite userActivityInvite = userActivityInviteClient.queryUserActivityInviteByActivityId(userActivity.getId());
-
- model.addAttribute("item2", userActivityInvite);
- if (userActivityInvite != null) {
- model.addAttribute("item2Coupon", sysCouponRecordService.getById(userActivityInvite.getCouponId()));
- }
- List<UserActivityBalance> balanceInfoList = userActivityBalanceClient.queryUserActivityBalanceList(userActivity.getId());
- model.addAttribute("balanceInfoList", balanceInfoList);
- model.addAttribute("item4", userActivityDiscount1Client.queryUserActivityDiscount1ByActivityId(userActivity.getId()));
-
- UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelpoeClient.queryUserActivityRedenvelopeByActivityId(userActivity.getId());
- model.addAttribute("item5", userActivityRedenvelope);
- if (userActivityRedenvelope != null) {
- model.addAttribute("item5Red", sysRedPacketRecordService.getById(userActivityRedenvelope.getRedEnvelopeId()));
- }
- LogObjectHolder.me().set(userActivity);
- return PREFIX + "userActivity_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/blanceList")
- @ResponseBody
- public Object blanceList(String createTime, Integer activityId) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)) {
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(userCouponRecordService.getBlanceList(new GetBlanceListReq(page, beginTime, endTime, activityId)));
- return super.packForBT(page);
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime, String name, Integer status, Integer offset, Integer limit) {
- Date startTimes = null;
- Date endTimes = null;
- if (SinataUtil.isNotEmpty(createTime)) {
- String[] timeArray = createTime.split(" - ");
- startTimes = DateUtil.getDate_str3(timeArray[0] + " 00:00:00");
- endTimes = DateUtil.getDate_str3(timeArray[1] + " 23:59:59");
- }
- Integer uid = UserExt.getUser().getId();
- return userActivityClient.queryUserActivityList(new QueryUserActivityListReq(uid, startTimes, endTimes, name, status, offset, limit));
- }
-
- /**
- * @param name 活动时间
- * @param startTime 时间区间
- * @param registCouponId 注册活动-优惠券id
- * @param registEnable 注册活动-是否启动(1=不启动，2=启动)
- * @param registNumber 注册活动-优惠券数量
- * @param registEffective 注册活动-优惠券有效期
- * @param inviteCouponId 邀请活动-优惠券id
- * @param inviteEnable 邀请活动-是否启动(1=不启动，2=启动)
- * @param inviteNumber 邀请活动-优惠券数量
- * @param inviteEffective 邀请活动-优惠券有效期
- * @param balanceEnable 充值活动-是否启动(1=不启动，2=启动)
- * @param balanceInfo 充值活动-详情
- * @param discountEnable 折扣活动-是否启动(1=不启动，2=启动)
- * @param discountSpecial 折扣活动-专车
- * @param discountTaxi 折扣活动-出租车
- * @param discountLogistics 折扣活动-小件物流
- * @param redenvelopeId -红包活动-红包id
- * @param redenvelopeEnable 红包活动-是否启动(1=不启动，2=启动)
- * @return
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(String name, String startTime, Integer registCouponId,
- Integer registEnable, Integer registNumber, Integer registEffective,
- Integer inviteCouponId, Integer inviteEnable, Integer inviteNumber, Integer inviteEffective,
- Integer balanceEnable, String balanceInfo,
- Integer discountEnable, Double discountSpecial, Double discountTaxi, Double discountLogistics,
- Integer redenvelopeId, Integer redenvelopeEnable, Double registerPrice, Double invitationPrice, Double redPrice) {
- if(registEnable==1 && inviteEnable==1 && balanceEnable==1 && discountEnable==1){
- return "504";
- }
- userActivityClient.insertOrUpdate(new UserActivityInsertOrUpdateReq(null, name, startTime, registCouponId,
- registEnable, registNumber, registEffective,
- inviteCouponId, inviteEnable, inviteNumber, inviteEffective,
- balanceEnable, balanceInfo,
- discountEnable, discountSpecial, discountTaxi, discountLogistics,
- redenvelopeId, redenvelopeEnable, registerPrice, invitationPrice, redPrice, UserExt.getUser().getObjectId(), UserExt.getUser().getRoleType()));
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityId) {
- userActivityClient.deleteUserActivityById(userActivityId);
- return SUCCESS_TIP;
- }
-
- /**
- * @param name 活动时间
- * @param startTime 时间区间
- * @param registCouponId 注册活动-优惠券id
- * @param registEnable 注册活动-是否启动(1=不启动，2=启动)
- * @param registNumber 注册活动-优惠券数量
- * @param registEffective 注册活动-优惠券有效期
- * @param inviteCouponId 邀请活动-优惠券id
- * @param inviteEnable 邀请活动-是否启动(1=不启动，2=启动)
- * @param inviteNumber 邀请活动-优惠券数量
- * @param inviteEffective 邀请活动-优惠券有效期
- * @param balanceEnable 充值活动-是否启动(1=不启动，2=启动)
- * @param balanceInfo 充值活动-详情
- * @param discountEnable 折扣活动-是否启动(1=不启动，2=启动)
- * @param discountSpecial 折扣活动-专车
- * @param discountTaxi 折扣活动-出租车
- * @param discountLogistics 折扣活动-小件物流
- * @param redenvelopeId -红包活动-红包id
- * @param redenvelopeEnable 红包活动-是否启动(1=不启动，2=启动)
- * @return
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer id, String name, String startTime, Integer registCouponId,
- Integer registEnable, Integer registNumber, Integer registEffective,
- Integer inviteCouponId, Integer inviteEnable, Integer inviteNumber, Integer inviteEffective,
- Integer balanceEnable, String balanceInfo,
- Integer discountEnable, Double discountSpecial, Double discountTaxi, Double discountLogistics,
- Integer redenvelopeId, Integer redenvelopeEnable, Double registerPrice, Double invitationPrice, Double redPrice) {
- userActivityClient.insertOrUpdate(new UserActivityInsertOrUpdateReq(id, name, startTime, registCouponId,
- registEnable, registNumber, registEffective,
- inviteCouponId, inviteEnable, inviteNumber, inviteEffective,
- balanceEnable, balanceInfo,
- discountEnable, discountSpecial, discountTaxi, discountLogistics,
- redenvelopeId, redenvelopeEnable, registerPrice, invitationPrice, redPrice, 11, 33));
- return SUCCESS_TIP;
- }
-
- /**
- * 修改状态
- *
- * @param driverActivity
- * @return
- */
- @RequestMapping(value = "/updateStatus")
- @ResponseBody
- public Object updateStatus(UserActivity driverActivity) {
- userActivityClient.updateStatus(driverActivity);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/userActivity_detail/{userActivityId}")
- public Object detail(@PathVariable("userActivityId") Integer userActivityId, Model model) {
- UserActivity userActivity = userActivityClient.queryUserActivityById(userActivityId);
- model.addAttribute("item", userActivity);
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
- model.addAttribute("endTime", sdf.format(userActivity.getEndTime()));
- UserActivityRegistered userActivityRegistered = userActivityRegisteredClient.queryUserActivityRegisteredByActivityId(userActivity.getId());
-
- model.addAttribute("item1", userActivityRegistered);
- if (userActivityRegistered != null) {
- model.addAttribute("item1Coupon", sysCouponRecordService.getById(userActivityRegistered.getCouponId()));
- }
- UserActivityInvite userActivityInvite = userActivityInviteClient.queryUserActivityInviteByActivityId(userActivity.getId());
- model.addAttribute("item2", userActivityInvite);
- if (userActivityInvite != null) {
- model.addAttribute("item2Coupon", sysCouponRecordService.getById(userActivityInvite.getCouponId()));
- }
- List<UserActivityBalance> balanceInfoList = userActivityBalanceClient.queryUserActivityBalanceList(userActivity.getId());
- model.addAttribute("balanceInfoList", balanceInfoList==null?new ArrayList<UserActivityBalance>():balanceInfoList);
- model.addAttribute("item4", userActivityDiscount1Client.queryUserActivityDiscount1ByActivityId(userActivity.getId()));
-
- UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelpoeClient.queryUserActivityRedenvelopeByActivityId(userActivity.getId());
-
- model.addAttribute("item5", userActivityRedenvelope);
- if (userActivityRedenvelope != null) {
- model.addAttribute("item5Red", sysRedPacketRecordService.getById(userActivityRedenvelope.getRedEnvelopeId()));
- }
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "userActivity_detail.html";
- }
-
- /**
- * 跳转到立即处理页面
- */
- @RequestMapping("/userActivity_immediately/{id}")
- public String userActivityImmediately(@PathVariable Integer id, Model model) {
- model.addAttribute("id", id);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "userActivity_immediately.html";
- }
-
- /**
- * 立即处理操作
- */
- @RequestMapping(value = "/immediately")
- @Transactional(rollbackFor = Exception.class)
- @ResponseBody
- public Object immediately(@RequestParam Integer id, @RequestParam Integer state, @RequestParam String remark) {
- UserActivity userActivity = userActivityClient.queryUserActivityById(id);
- if (SinataUtil.isNotEmpty(userActivity)) {
- userActivity.setStatus(state);
- userActivity.setRemark(remark);
- userActivityClient.updateStatus(userActivity);
-
- // 添加审核记录
- TAuditRecord tAuditRecord = new TAuditRecord();
- tAuditRecord.setActivityId(id);
- tAuditRecord.setActivityName(userActivity.getName());
- if(state == 2){
- tAuditRecord.setAuditStatus(3);
- }
- if(state == 3){
- tAuditRecord.setAuditStatus(2);
- }
- tAuditRecord.setAuditTime(new Date());
- tAuditRecord.setAuditUserId(Objects.requireNonNull(UserExt.getUser()).getId());
- tAuditRecord.setRemark(remark);
- tAuditRecord.setActivityType(ActivityTypeEnum.USER_ACTIVITY.getCode());
- auditRecordService.save(tAuditRecord);
-
- }
- return SUCCESS_TIP;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount1Controller.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount1Controller.java
deleted file mode 100644
index 19e3795..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount1Controller.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.UserActivityDiscount1Client;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.UserActivityDiscount1;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:32:41
- */
-@Controller
-@RequestMapping("/userActivityDiscount1")
-public class UserActivityDiscount1Controller extends BaseController {
-
- private String PREFIX = "/system/userActivityDiscount1/";
-
- @Autowired
- private UserActivityDiscount1Client userActivityDiscount1Client;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "userActivityDiscount1.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivityDiscount1_add")
- public String userActivityDiscount1Add() {
- return PREFIX + "userActivityDiscount1_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivityDiscount1_update/{userActivityDiscount1Id}")
- public String userActivityDiscount1Update(@PathVariable Integer userActivityDiscount1Id, Model model) {
- UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Client.queryUserActivityDiscount1Id(userActivityDiscount1Id);
- model.addAttribute("item",userActivityDiscount1);
- LogObjectHolder.me().set(userActivityDiscount1);
- return PREFIX + "userActivityDiscount1_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return userActivityDiscount1Client.queryUserActivityDiscount1List();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserActivityDiscount1 userActivityDiscount1) {
- userActivityDiscount1Client.add(userActivityDiscount1);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityDiscount1Id) {
- userActivityDiscount1Client.delete(userActivityDiscount1Id);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserActivityDiscount1 userActivityDiscount1) {
- userActivityDiscount1Client.update(userActivityDiscount1);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userActivityDiscount1Id}")
- @ResponseBody
- public Object detail(@PathVariable("userActivityDiscount1Id") Integer userActivityDiscount1Id) {
- return userActivityDiscount1Client.queryUserActivityDiscount1Id(userActivityDiscount1Id);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount2Controller.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount2Controller.java
deleted file mode 100644
index 341bffc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityDiscount2Controller.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.UserActivityDiscount2Client;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.UserActivityDiscount2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:32:46
- */
-@Controller
-@RequestMapping("/userActivityDiscount2")
-public class UserActivityDiscount2Controller extends BaseController {
-
- private String PREFIX = "/system/userActivityDiscount2/";
-
- @Autowired
- private UserActivityDiscount2Client userActivityDiscount2Client;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "userActivityDiscount2.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivityDiscount2_add")
- public String userActivityDiscount2Add() {
- return PREFIX + "userActivityDiscount2_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivityDiscount2_update/{userActivityDiscount2Id}")
- public String userActivityDiscount2Update(@PathVariable Integer userActivityDiscount2Id, Model model) {
- UserActivityDiscount2 userActivityDiscount2 = userActivityDiscount2Client.queryUserActivityDiscount2Id(userActivityDiscount2Id);
- model.addAttribute("item",userActivityDiscount2);
- LogObjectHolder.me().set(userActivityDiscount2);
- return PREFIX + "userActivityDiscount2_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return userActivityDiscount2Client.list();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserActivityDiscount2 userActivityDiscount2) {
- userActivityDiscount2Client.add(userActivityDiscount2);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityDiscount2Id) {
- userActivityDiscount2Client.delete(userActivityDiscount2Id);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserActivityDiscount2 userActivityDiscount2) {
- userActivityDiscount2Client.update(userActivityDiscount2);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userActivityDiscount2Id}")
- @ResponseBody
- public Object detail(@PathVariable("userActivityDiscount2Id") Integer userActivityDiscount2Id) {
- return userActivityDiscount2Client.queryUserActivityDiscount2Id(userActivityDiscount2Id);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityInviteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityInviteController.java
deleted file mode 100644
index e2caa02..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityInviteController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.UserActivityInviteClient;
-import com.dsh.guns.core.base.controller.BaseController;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.dsh.guns.core.log.LogObjectHolder;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.dsh.guns.modular.system.model.UserActivityInvite;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:32:57
- */
-@Controller
-@RequestMapping("/userActivityInvite")
-public class UserActivityInviteController extends BaseController {
-
- private String PREFIX = "/system/userActivityInvite/";
-
- @Autowired
- private UserActivityInviteClient userActivityInviteClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "userActivityInvite.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivityInvite_add")
- public String userActivityInviteAdd() {
- return PREFIX + "userActivityInvite_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivityInvite_update/{userActivityInviteId}")
- public String userActivityInviteUpdate(@PathVariable Integer userActivityInviteId, Model model) {
- UserActivityInvite userActivityInvite = userActivityInviteClient.queryUserActivityInviteId(userActivityInviteId);
- model.addAttribute("item",userActivityInvite);
- LogObjectHolder.me().set(userActivityInvite);
- return PREFIX + "userActivityInvite_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return userActivityInviteClient.list();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserActivityInvite userActivityInvite) {
- userActivityInviteClient.add(userActivityInvite);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityInviteId) {
- userActivityInviteClient.delete(userActivityInviteId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserActivityInvite userActivityInvite) {
- userActivityInviteClient.update(userActivityInvite);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userActivityInviteId}")
- @ResponseBody
- public Object detail(@PathVariable("userActivityInviteId") Integer userActivityInviteId) {
- return userActivityInviteClient.queryUserActivityInviteId(userActivityInviteId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRedenvelopeController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRedenvelopeController.java
deleted file mode 100644
index 37b1052..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRedenvelopeController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.UserActivityRedenvelpoeClient;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.UserActivityRedenvelope;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:33:03
- */
-@Controller
-@RequestMapping("/userActivityRedenvelope")
-public class UserActivityRedenvelopeController extends BaseController {
-
- private String PREFIX = "/system/userActivityRedenvelope/";
-
- @Autowired
- private UserActivityRedenvelpoeClient userActivityRedenvelpoeClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "userActivityRedenvelope.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivityRedenvelope_add")
- public String userActivityRedenvelopeAdd() {
- return PREFIX + "userActivityRedenvelope_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivityRedenvelope_update/{userActivityRedenvelopeId}")
- public String userActivityRedenvelopeUpdate(@PathVariable Integer userActivityRedenvelopeId, Model model) {
- UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelpoeClient.queryUserActivityRedenvelopeId(userActivityRedenvelopeId);
- model.addAttribute("item",userActivityRedenvelope);
- LogObjectHolder.me().set(userActivityRedenvelope);
- return PREFIX + "userActivityRedenvelope_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return userActivityRedenvelpoeClient.queryUserActivityRedenvelopeAll();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserActivityRedenvelope userActivityRedenvelope) {
- userActivityRedenvelpoeClient.addUserActivityRedenvelope(userActivityRedenvelope);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityRedenvelopeId) {
- userActivityRedenvelpoeClient.deleteUserActivityRedenvelope(userActivityRedenvelopeId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserActivityRedenvelope userActivityRedenvelope) {
- userActivityRedenvelpoeClient.updateUserActivityRedenvelope(userActivityRedenvelope);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userActivityRedenvelopeId}")
- @ResponseBody
- public Object detail(@PathVariable("userActivityRedenvelopeId") Integer userActivityRedenvelopeId) {
- return userActivityRedenvelpoeClient.queryUserActivityRedenvelopeId(userActivityRedenvelopeId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRegisteredController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRegisteredController.java
deleted file mode 100644
index e074332..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserActivityRegisteredController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.dsh.course.feignClient.activity.UserActivityRegisteredClient;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.modular.system.model.UserActivityRegistered;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-19 14:33:09
- */
-@Controller
-@RequestMapping("/userActivityRegistered")
-public class UserActivityRegisteredController extends BaseController {
-
- private String PREFIX = "/system/userActivityRegistered/";
-
- @Autowired
- private UserActivityRegisteredClient userActivityRegisteredClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "userActivityRegistered.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userActivityRegistered_add")
- public String userActivityRegisteredAdd() {
- return PREFIX + "userActivityRegistered_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userActivityRegistered_update/{userActivityRegisteredId}")
- public String userActivityRegisteredUpdate(@PathVariable Integer userActivityRegisteredId, Model model) {
- UserActivityRegistered userActivityRegistered = userActivityRegisteredClient.queryUserActivityRegisteredById(userActivityRegisteredId);
- model.addAttribute("item",userActivityRegistered);
- LogObjectHolder.me().set(userActivityRegistered);
- return PREFIX + "userActivityRegistered_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String condition) {
- return userActivityRegisteredClient.queryUserCouponRecordList();
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserActivityRegistered userActivityRegistered) {
- userActivityRegisteredClient.addUserActivityRegistered(userActivityRegistered);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userActivityRegisteredId) {
- userActivityRegisteredClient.deleteUserActivityRegisteredById(userActivityRegisteredId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserActivityRegistered userActivityRegistered) {
- userActivityRegisteredClient.updateUserActivityRegisteredById(userActivityRegistered);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userActivityRegisteredId}")
- @ResponseBody
- public Object detail(@PathVariable("userActivityRegisteredId") Integer userActivityRegisteredId) {
- return userActivityRegisteredClient.queryUserActivityRegisteredById(userActivityRegisteredId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserCouponRecordController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserCouponRecordController.java
deleted file mode 100644
index c9711f5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/general/UserCouponRecordController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.dsh.guns.modular.system.controller.general;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.activity.UserCouponRecordClient;
-import com.dsh.course.feignClient.activity.model.UserCouponRecordQueryReq;
-import com.dsh.course.feignClient.activity.model.UserCouponRecordRes;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.UserCouponRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-
-/**
- * 控制器
- *
- * @author fengshuonan
- * @Date 2020-06-17 09:15:18
- */
-@Controller
-@RequestMapping("/userCouponRecord")
-public class UserCouponRecordController extends BaseController {
-
- private String PREFIX = "/system/userCouponRecord/";
-
- @Autowired
- private UserCouponRecordClient userCouponRecordClient;
-
- /**
- * 跳转到首页
- */
- @RequestMapping("")
- public String index( Model model,Integer couponActivityId,Integer activityType) {
- model.addAttribute("activityType",activityType);
- model.addAttribute("couponActivityId",couponActivityId);
- model.addAttribute("language", UserExt.getLanguage());
-
- return PREFIX + "userCouponRecord.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/userCouponRecord_add")
- public String userCouponRecordAdd() {
- return PREFIX + "userCouponRecord_add.html";
- }
-
- /**
- * 跳转到修改
- */
- @RequestMapping("/userCouponRecord_update/{userCouponRecordId}")
- public String userCouponRecordUpdate(@PathVariable Integer userCouponRecordId, Model model) {
- UserCouponRecordRes userCouponRecordRes = userCouponRecordClient.queryUserCouponRecordById(userCouponRecordId);
- model.addAttribute("item",userCouponRecordRes);
- LogObjectHolder.me().set(userCouponRecordRes);
- return PREFIX + "userCouponRecord_edit.html";
- }
-
- /**
- * 获取列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String createTime,String userName,String userPhone,Integer couponActivityId,Integer activityType,Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
- String[] timeArray = createTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-
- page.setRecords(userCouponRecordClient.queryUserCouponRecordList(new UserCouponRecordQueryReq(limit,offset,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state)));
- return super.packForBT(page);
- }
-
- /**
- * 新增
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(UserCouponRecord userCouponRecord) {
- userCouponRecordClient.addUserCouponRecord(userCouponRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 删除
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer userCouponRecordId) {
- userCouponRecordClient.deleteUserCouponRecordById(userCouponRecordId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(UserCouponRecord userCouponRecord) {
- userCouponRecordClient.UserCouponRecord(userCouponRecord);
- return SUCCESS_TIP;
- }
-
- /**
- * 详情
- */
- @RequestMapping(value = "/detail/{userCouponRecordId}")
- @ResponseBody
- public Object detail(@PathVariable("userCouponRecordId") Integer userCouponRecordId) {
- return userCouponRecordClient.queryUserCouponRecordById(userCouponRecordId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TDispatchController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TDispatchController.java
deleted file mode 100644
index e271241..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TDispatchController.java
+++ /dev/null
@@ -1,235 +0,0 @@
-//package com.dsh.guns.modular.system.controller.specialTrain;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.dsh.app.feignClient.account.model.Company;
-//import com.dsh.app.feignClient.activity.CompanyClient;
-//import com.dsh.guns.core.base.controller.BaseController;
-//import com.dsh.guns.core.base.tips.ErrorTip;
-//import com.dsh.guns.core.common.constant.factory.PageFactory;
-//import com.dsh.guns.core.shiro.ShiroKit;
-//import com.dsh.guns.core.util.SinataUtil;
-//import com.dsh.guns.modular.system.model.TCompany;
-//import com.dsh.guns.modular.system.service.ITCompanyService;
-//import com.dsh.guns.modular.system.service.IUserService;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.dsh.guns.core.log.LogObjectHolder;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.dsh.guns.modular.system.model.TDispatch;
-//import com.dsh.guns.modular.system.service.ITDispatchService;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 调度管理控制器
-// *
-// * @author fengshuonan
-// * @Date 2020-09-01 16:00:16
-// */
-//@Controller
-//@RequestMapping("/tDispatch")
-//public class TDispatchController extends BaseController {
-//
-// private String PREFIX = "/system/tDispatch/";
-//
-// @Autowired
-// private ITDispatchService tDispatchService;
-//
-// @Autowired
-// private CompanyClient tCompanyService;
-//
-// @Autowired
-// private IUserService userService;
-//
-// /**
-// * 跳转到调度管理首页
-// */
-// @RequestMapping("")
-// public String index() {
-// return PREFIX + "tDispatch.html";
-// }
-//
-// /**
-// * 跳转到添加调度管理
-// */
-// @RequestMapping("/tDispatch_add")
-// public String tDispatchAdd(Model model) {
-// model.addAttribute("roleType",ShiroKit.getUser().getRoleType());
-//
-// List<Company> companyList = tCompanyService.selectList(new QueryWrapper<Company>().eq("type", 2)
-// .eq("isCross", 1)
-// .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
-// model.addAttribute("companyList",companyList);
-//
-// if (2 == ShiroKit.getUser().getRoleType()){
-// List<Company> franchiseeList = tCompanyService.selectList(new QueryWrapper<Company>().eq("type", 3)
-// .eq("superiorId",ShiroKit.getUser().getObjectId()));
-// model.addAttribute("franchiseeList",franchiseeList);
-// }else{
-// model.addAttribute("franchiseeList",null);
-// }
-// return PREFIX + "tDispatch_add.html";
-// }
-//
-// /**
-// * 根据分公司ID获取加盟商
-// * @param oneId
-// * @return
-// */
-// @RequestMapping(value = "/companyChange")
-// @ResponseBody
-// public Object companyChange(@RequestParam Integer oneId) {
-// List<Company> list = new ArrayList<>();
-// if (SinataUtil.isNotEmpty(oneId)){
-// list = tCompanyService.selectList(new QueryWrapper<Company>()
-// .eq("type", 3)
-// .eq("isCross", 1)
-// .eq("superiorId", oneId)
-// .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
-// }
-// return list;
-// }
-//
-// /**
-// * 跳转到修改调度管理
-// */
-// @RequestMapping("/tDispatch_update/{tDispatchId}")
-// public String tDispatchUpdate(@PathVariable Integer tDispatchId, Model model) {
-// TDispatch tDispatch = tDispatchService.selectById(tDispatchId);
-// model.addAttribute("item",tDispatch);
-// LogObjectHolder.me().set(tDispatch);
-//
-// Integer roleType = ShiroKit.getUser().getRoleType();
-// model.addAttribute("roleType",roleType);
-// if (1 == roleType){
-// List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
-// .eq("isCross", 1)
-// .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
-// model.addAttribute("companyList",companyList);
-//
-// List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
-// .eq("superiorId",tDispatch.getCompanyId())
-// .eq("isCross", 1)
-// .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
-// model.addAttribute("franchiseeList",franchiseeList);
-// }else if (2 == roleType){
-// List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
-// .eq("superiorId",ShiroKit.getUser().getObjectId())
-// .eq("isCross", 1)
-// .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
-// model.addAttribute("franchiseeList",franchiseeList);
-// }
-// return PREFIX + "tDispatch_edit.html";
-// }
-//
-// /**
-// * 获取调度管理列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String insertTime,String name,String companyName,String franchiseeName,String account,Integer state) {
-// String beginTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(insertTime)){
-// String[] timeArray = insertTime.split(" - ");
-// beginTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// page.setRecords(tDispatchService.getDispatchList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,name,companyName,franchiseeName,account,state));
-// return super.packForBT(page);
-// }
-//
-// /**
-// * 新增调度管理
-// */
-// @RequestMapping(value = "/add")
-// @ResponseBody
-// public Object add(TDispatch tDispatch) {
-// //判断账号是否存在
-// int count = tDispatchService.selectCount(new EntityWrapper<TDispatch>().eq("account",tDispatch.getAccount()).last(" and FIND_IN_SET(state,'1,2')"));
-// if (count > 0){
-// return new ErrorTip(500,"账号已存在,请重新输入");
-// }
-// Integer roleType = ShiroKit.getUser().getRoleType();
-// Integer objectId = ShiroKit.getUser().getObjectId();
-// if (2 == roleType){
-// tDispatch.setCompanyId(objectId);
-// }else if (3 == roleType){
-// TCompany company = tCompanyService.selectById(objectId);
-// tDispatch.setCompanyId(company.getSuperiorId());
-// tDispatch.setFranchiseeId(objectId);
-// }
-// tDispatch.setInsertTime(new Date());
-// tDispatch.setInsertUserId(ShiroKit.getUser().getId());
-// tDispatch.setInsertUserRole(roleType);
-// tDispatch.setState(1);
-// if(tDispatch.getCompanyId() == null){
-// Integer objectId1 = userService.selectById(ShiroKit.getUser().getId()).getObjectId();
-// tDispatch.setCompanyId(objectId1);
-// }
-// tDispatch.setPassword(ShiroKit.md5(tDispatch.getPassword(), "WL:x9#"));
-// tDispatchService.insert(tDispatch);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 删除调度管理
-// * @param tDispatchId
-// * @param optType 1=删除 2=冻结 3=解冻
-// * @return
-// */
-// @RequestMapping(value = "/opt")
-// @ResponseBody
-// public Object delete(@RequestParam Integer tDispatchId,@RequestParam Integer optType) {
-// TDispatch dispatch = tDispatchService.selectById(tDispatchId);
-// if (1 == optType){
-// dispatch.setState(3);
-// }else if (2 == optType){
-// dispatch.setState(2);
-// }else if (3 == optType){
-// dispatch.setState(1);
-// }
-// tDispatchService.updateById(dispatch);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 修改调度管理
-// */
-// @RequestMapping(value = "/update")
-// @ResponseBody
-// public Object update(TDispatch tDispatch) {
-// TDispatch obj = tDispatchService.selectById(tDispatch.getId());
-// if (!obj.getAccount().equals(tDispatch.getAccount())){
-// //判断账号是否存在
-// int count = tDispatchService.selectCount(new EntityWrapper<TDispatch>().eq("account",tDispatch.getAccount()).last(" and FIND_IN_SET(state,'1,2')"));
-// if (count > 0){
-// return new ErrorTip(500,"账号已存在,请重新输入");
-// }
-// }
-// Integer roleType = ShiroKit.getUser().getRoleType();
-// Integer objectId = ShiroKit.getUser().getObjectId();
-// if (2 == roleType){
-// tDispatch.setCompanyId(objectId);
-// }else if (3 == roleType){
-// TCompany company = tCompanyService.selectById(objectId);
-// tDispatch.setCompanyId(company.getSuperiorId());
-// tDispatch.setFranchiseeId(objectId);
-// }
-// if (SinataUtil.isNotEmpty(tDispatch.getPassword())){
-// tDispatch.setPassword(ShiroKit.md5(tDispatch.getPassword(), "WL:x9#"));
-// }
-// tDispatchService.updateById(tDispatch);
-// return SUCCESS_TIP;
-// }
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java
deleted file mode 100644
index 9e05bdd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.dsh.guns.modular.system.controller.specialTrain;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.core.base.controller.BaseController;
-//import com.dsh.guns.core.common.constant.factory.PageFactory;
-//import com.dsh.guns.core.shiro.ShiroKit;
-//import com.dsh.guns.core.util.SinataUtil;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.dsh.guns.core.log.LogObjectHolder;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.dsh.guns.modular.system.model.TIntegralGoods;
-//import com.dsh.guns.modular.system.service.ITIntegralGoodsService;
-//
-//import java.util.Date;
-//import java.util.Map;
-//
-///**
-// * 商品管理控制器
-// *
-// * @author fengshuonan
-// * @Date 2020-09-02 11:28:36
-// */
-//@Controller
-//@RequestMapping("/tIntegralGoods")
-//public class TIntegralGoodsController extends BaseController {
-//
-// private String PREFIX = "/system/tIntegralGoods/";
-//
-// @Autowired
-// private ITIntegralGoodsService tIntegralGoodsService;
-//
-// /**
-// * 跳转到商品管理首页
-// */
-// @RequestMapping("")
-// public String index() {
-// return PREFIX + "tIntegralGoods.html";
-// }
-//
-// /**
-// * 跳转到添加商品管理
-// */
-// @RequestMapping("/tIntegralGoods_add")
-// public String tIntegralGoodsAdd() {
-// return PREFIX + "tIntegralGoods_add.html";
-// }
-//
-// /**
-// * 跳转到修改商品管理
-// */
-// @RequestMapping("/tIntegralGoods_update/{tIntegralGoodsId}")
-// public String tIntegralGoodsUpdate(@PathVariable Integer tIntegralGoodsId, Model model) {
-// TIntegralGoods tIntegralGoods = tIntegralGoodsService.selectById(tIntegralGoodsId);
-// model.addAttribute("item",tIntegralGoods);
-// LogObjectHolder.me().set(tIntegralGoods);
-// return PREFIX + "tIntegralGoods_edit.html";
-// }
-//
-// /**
-// * 获取商品管理列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String insertTime,String name,Integer state) {
-// String beginTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(insertTime)){
-// String[] timeArray = insertTime.split(" - ");
-// beginTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// if (ShiroKit.getUser().getRoleType() != 1){
-// page.setRecords(null);
-// }else{
-// page.setRecords(tIntegralGoodsService.getIntegralGoodsList(page,beginTime,endTime,name,state));
-// }
-// return super.packForBT(page);
-// }
-//
-// /**
-// * 新增商品管理
-// */
-// @RequestMapping(value = "/add")
-// @ResponseBody
-// public Object add(TIntegralGoods tIntegralGoods) {
-// tIntegralGoods.setInsertTime(new Date());
-// tIntegralGoods.setInsertUserId(ShiroKit.getUser().getId());
-// tIntegralGoods.setInsertUserRole(ShiroKit.getUser().getRoleType());
-// tIntegralGoods.setState(1);
-// tIntegralGoodsService.insert(tIntegralGoods);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * c操作商品
-// * @param tIntegralGoodsId
-// * @param optType 1=上架 2=下架 3=删除
-// * @return
-// */
-// @RequestMapping(value = "/opt")
-// @ResponseBody
-// public Object delete(@RequestParam Integer tIntegralGoodsId,@RequestParam Integer optType) {
-// TIntegralGoods tIntegralGoods = tIntegralGoodsService.selectById(tIntegralGoodsId);
-// if (1 == optType){
-// tIntegralGoods.setState(1);
-// }else if (2 == optType){
-// tIntegralGoods.setState(2);
-// }else if (3 == optType){
-// tIntegralGoods.setState(3);
-// }
-// tIntegralGoodsService.updateById(tIntegralGoods);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 修改商品管理
-// */
-// @RequestMapping(value = "/update")
-// @ResponseBody
-// public Object update(TIntegralGoods tIntegralGoods) {
-// tIntegralGoodsService.updateById(tIntegralGoods);
-// return SUCCESS_TIP;
-// }
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
deleted file mode 100644
index 592337c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-//package com.dsh.guns.modular.system.controller.specialTrain;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.core.base.controller.BaseController;
-//import com.dsh.guns.core.common.constant.factory.PageFactory;
-//import com.dsh.guns.core.shiro.ShiroKit;
-//import com.dsh.guns.core.util.SinataUtil;
-//import com.dsh.guns.modular.system.model.TOrderCharter;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.dsh.guns.core.log.LogObjectHolder;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.dsh.guns.modular.system.model.TIntegralOrder;
-//import com.dsh.guns.modular.system.service.ITIntegralOrderService;
-//
-//import java.util.Map;
-//
-///**
-// * 积分兑换订单控制器
-// *
-// * @author fengshuonan
-// * @Date 2020-09-02 15:22:24
-// */
-//@Controller
-//@RequestMapping("/tIntegralOrder")
-//public class TIntegralOrderController extends BaseController {
-//
-// private String PREFIX = "/system/tIntegralOrder/";
-//
-// @Autowired
-// private ITIntegralOrderService tIntegralOrderService;
-//
-// /**
-// * 跳转到积分兑换订单首页
-// */
-// @RequestMapping("")
-// public String index() {
-// return PREFIX + "tIntegralOrder.html";
-// }
-//
-//// /**
-//// * 跳转到查看详情
-//// */
-//// @RequestMapping("/lookDetail/{id}")
-//// public String lookDetail(@PathVariable Integer id, Model model) {
-//// TIntegralOrder tIntegralOrder = tIntegralOrderService.selectById(id);
-//// model.addAttribute("str",tIntegralOrder.getRemark());
-//// return "/system/tComplaint/lookDetail.html";
-//// }
-//
-// /**
-// * 跳转至立即处理页面
-// */
-// @RequestMapping("/tIntegralOrder_immediately/{tIntegralOrderId}")
-// public String tIntegralOrder_immediately(@PathVariable Integer tIntegralOrderId, Model model) {
-// model.addAttribute("id",tIntegralOrderId);
-// return PREFIX + "tIntegralOrder_immediately.html";
-// }
-//
-// /**
-// * 获取积分兑换订单列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String insertTime,String userName,String goodsName,String consigneeName,String consigneePhone,Integer state) {
-// String beginTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(insertTime)){
-// String[] timeArray = insertTime.split(" - ");
-// beginTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// if (ShiroKit.getUser().getRoleType() != 1){
-// page.setRecords(null);
-// }else{
-// page.setRecords(tIntegralOrderService.getIntegralOrderList(page,beginTime,endTime,userName,goodsName,consigneeName,consigneePhone,state));
-// }
-// return super.packForBT(page);
-// }
-//
-// /**
-// * 立即处理
-// */
-// @RequestMapping(value = "/immediately")
-// @ResponseBody
-// public Object immediately(TIntegralOrder tIntegralOrder) {
-// tIntegralOrder.setState(2);
-// tIntegralOrderService.updateById(tIntegralOrder);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 删除积分兑换订单
-// */
-// @RequestMapping(value = "/delete")
-// @ResponseBody
-// public Object delete(@RequestParam Integer tIntegralOrderId) {
-// TIntegralOrder tIntegralOrder = tIntegralOrderService.selectById(tIntegralOrderId);
-// tIntegralOrder.setState(3);
-// tIntegralOrderService.updateById(tIntegralOrder);
-// return SUCCESS_TIP;
-// }
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TLineController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TLineController.java
deleted file mode 100644
index aa444bc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TLineController.java
+++ /dev/null
@@ -1,378 +0,0 @@
-//package com.dsh.guns.modular.system.controller.specialTrain;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.mapper.EntityWrapper;
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.core.base.controller.BaseController;
-//import com.dsh.guns.core.common.constant.factory.PageFactory;
-//import com.dsh.guns.core.shiro.ShiroKit;
-//import com.dsh.guns.core.util.SinataUtil;
-//import com.dsh.guns.modular.system.model.*;
-//import com.dsh.guns.modular.system.service.*;
-//import com.dsh.guns.modular.system.util.ResultUtil;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.dsh.guns.core.log.LogObjectHolder;
-//import org.springframework.web.bind.annotation.RequestParam;
-//
-//import java.text.SimpleDateFormat;
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 跨城线路管理控制器
-// *
-// * @author fengshuonan
-// * @Date 2020-09-15 16:17:29
-// */
-//@Controller
-//@RequestMapping("/tLine")
-//public class TLineController extends BaseController {
-//
-// private String PREFIX = "/system/tLine/";
-//
-// @Autowired
-// private ITLineService tLineService;
-//
-// @Autowired
-// private ITSiteService itSiteService;
-//
-// @Autowired
-// private ITServerCarmodelService itServerCarmodelService;
-//
-// @Autowired
-// private ITLineSiteService itLineSiteService;
-//
-// @Autowired
-// private ITLinePriceService itLinePriceService;
-//
-// @Autowired
-// private ITLineShiftService itLineShiftService;
-//
-// @Autowired
-// private ITCompanyService itCompanyService;
-//
-// @Autowired
-// private ITLineCompanyService itLineCompanyService;
-//
-// /**
-// * 跳转到跨城站点管理首页
-// */
-// @RequestMapping("")
-// public String index() {
-// return PREFIX + "tLine.html";
-// }
-//
-// /**
-// * 跳转到添加跨城站点管理
-// */
-// @RequestMapping("/tLine_add")
-// public String tLineAdd(Model model) {
-// //站点
-// List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
-// model.addAttribute("siteList",siteList);
-// //跨城车型
-// List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
-// model.addAttribute("carmodelList",carmodelList);
-// return PREFIX + "tLine_add.html";
-// }
-//
-// /**
-// * 分配企业页面
-// */
-// @RequestMapping("/tLine_addCompany/{tLineId}")
-// public String tLine_addCompany(@PathVariable Integer tLineId,Model model) {
-// TLine tLine = tLineService.selectById(tLineId);
-// model.addAttribute("tLine",tLine);
-// //查询所有企业
-// List<TCompany> companyList = itCompanyService.selectList(new EntityWrapper<TCompany>().last(" where not FIND_IN_SET(state,'1') and not FIND_IN_SET(flag,'3')"));
-// model.addAttribute("companyList",companyList);
-// //查询已分配企业
-// List<Map<String, Object>> lineCompanyList = tLineService.getLineCompanyList(tLineId);
-// model.addAttribute("lineCompanyList",lineCompanyList);
-// return PREFIX + "tLine_addCompany.html";
-// }
-//
-// /**
-// * 跳转到修改跨城站点管理
-// */
-// @RequestMapping("/tLine_update/{tLineId}")
-// public String tLineUpdate(@PathVariable Integer tLineId, Model model) {
-// TLine tLine = tLineService.selectById(tLineId);
-// model.addAttribute("item",tLine);
-// LogObjectHolder.me().set(tLine);
-//
-// //查找站点起点+终点
-// TLineSite start = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLineId).eq("type", 1));
-// model.addAttribute("start",start);
-// TLineSite end = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLineId).eq("type", 2));
-// model.addAttribute("end",end);
-// //站点
-// List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
-// model.addAttribute("siteList",siteList);
-// //跨城车型
-// List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
-// model.addAttribute("carmodelList",carmodelList);
-// //查询所有站点
-// List<Map<String, Object>> linePriceList = tLineService.getLinePriceList(tLineId);
-// model.addAttribute("linePriceList",linePriceList);
-// //查询所有班次
-// List<TLineShift> lineShiftList = itLineShiftService.selectList(new EntityWrapper<TLineShift>().eq("lineId", tLineId).last(" and not FIND_IN_SET(state,'3')"));
-// model.addAttribute("lineShiftList",lineShiftList);
-// return PREFIX + "tLine_edit.html";
-// }
-//
-// /**
-// * 获取跨城站点管理列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String insertTime,String name,String insertUser,String modelStr,Integer state) {
-// String beginTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(insertTime)){
-// String[] timeArray = insertTime.split(" - ");
-// beginTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// if (ShiroKit.getUser().getRoleType() != 1){
-// page.setRecords(null);
-// }else{
-// page.setRecords(tLineService.getLineList(page,beginTime,endTime,name,insertUser,modelStr,state));
-// }
-// return super.packForBT(page);
-// }
-//
-// /**
-// * 新增跨城站点管理
-// */
-// @RequestMapping(value = "/add")
-// @ResponseBody
-// public ResultUtil add(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {
-// String name = tLine.getName();
-// name = name.replaceAll("& lt;", "<");
-// name = name.replaceAll("& gt;", ">");
-// name = name.replaceAll("& #40;", "(");
-// name = name.replaceAll("& #41;", ")");
-// tLine.setName(name);
-// tLine.setState(1);
-// tLine.setInsertTime(new Date());
-// tLine.setInsertUserId(ShiroKit.getUser().getId());
-// tLineService.insert(tLine);
-//
-// //添加线路站点起点+终点
-// TLineSite start = new TLineSite();
-// start.setLineId(tLine.getId());
-// start.setSiteId(startSiteId);
-// start.setType(1);
-// itLineSiteService.insert(start);
-// TLineSite end = new TLineSite();
-// end.setLineId(tLine.getId());
-// end.setSiteId(endSiteId);
-// end.setType(2);
-// itLineSiteService.insert(end);
-//
-// //添加价格设置
-// addPrice(tLine.getId(), subArr);
-//
-// //添加班次设置
-// return addShift(tLine.getId(), shuArr);
-// }
-//
-// /**
-// * 添加线路班次
-// * @param lineId
-// * @param shuArr
-// */
-// private ResultUtil addShift(Integer lineId, @RequestParam String shuArr) {
-// try {
-// JSONArray jsonArray1 = JSON.parseArray(shuArr);
-// int size1 = jsonArray1.size();
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// List<String> list = new ArrayList<>();
-// for (int i = 0; i < size1; i++) {
-// List<TLineShift> tLineShifts = itLineShiftService.selectList(new EntityWrapper<TLineShift>().eq("lineId", lineId).ne("state", 3).orderBy("startTime"));
-// JSONObject jsonObject = jsonArray1.getJSONObject(i);
-// TLineShift shift = new TLineShift();
-// shift.setLineId(lineId);
-// String shiftTime = jsonObject.getString("shiftTime");
-// String startTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(shiftTime)){
-// String[] timeArray = shiftTime.split(" - ");
-// startTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Date s1 = sdf.parse("2020-11-11 " + startTime + ":00");
-// Date e1 = sdf.parse("2020-11-11 " + endTime + ":00");
-// boolean b = false;
-// for(TLineShift lineShift : tLineShifts){
-// Date s2 = sdf.parse("2020-11-11 " + lineShift.getStartTime() + ":00");
-// Date e2 = sdf.parse("2020-11-11 " + lineShift.getEndTime() + ":00");
-// if(s2.getTime() <= s1.getTime() && e1.getTime() <= e2.getTime()){
-// list.add(startTime + " - " + endTime);
-// b = true;
-// break;
-// }
-// if(s1.getTime() <= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= s2.getTime()){
-// list.add(startTime + " - " + endTime);
-// b = true;
-// break;
-// }
-// if(s1.getTime() >= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= e2.getTime()){
-// list.add(startTime + " - " + endTime);
-// b = true;
-// break;
-// }
-// }
-// if(b){
-// continue;
-// }
-// shift.setStartTime(startTime);
-// shift.setEndTime(endTime);
-// shift.setCarNum(jsonObject.getInteger("carNum"));
-// shift.setInsertTime(new Date());
-// shift.setAddTime(jsonObject.getString("time2"));
-// shift.setState(1);
-// itLineShiftService.insert(shift);
-// }
-// if(list.size() > 0){
-// return ResultUtil.error("【" + JSON.toJSONString(list) + "】时间段与现存时间段重合，添加失败！");
-// }
-// return ResultUtil.success();
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
-// }
-//
-// /**
-// * 添加线路价格
-// * @param lineId
-// * @param subArr
-// */
-// private void addPrice(Integer lineId, @RequestParam String subArr) {
-// JSONArray jsonArray = JSON.parseArray(subArr);
-// int size = jsonArray.size();
-// for (int i = 0; i < size; i++) {
-// JSONObject jsonObject = jsonArray.getJSONObject(i);
-// TLinePrice price = new TLinePrice();
-// price.setLineId(lineId);
-// price.setServerCarModelId(jsonObject.getInteger("serverModelId"));
-// price.setType(jsonObject.getInteger("type"));
-// price.setContent(jsonObject.getString("content"));
-// price.setContentStr(jsonObject.getString("contentStr"));
-// price.setState(1);
-// price.setInsertTime(new Date());
-// price.setAddTime(jsonObject.getString("time"));
-// itLinePriceService.insert(price);
-// }
-// }
-//
-// /**
-// * 操作跨城站点管理
-// * optType 1=删除 2=冻结 3=解冻
-// */
-// @RequestMapping(value = "/opt")
-// @ResponseBody
-// public Object opt(@RequestParam Integer tLineId,@RequestParam Integer optType) {
-// TLine tLine = tLineService.selectById(tLineId);
-// if (1 == optType){
-// tLine.setState(3);
-// }else if (2 == optType){
-// tLine.setState(2);
-// }else if (3 == optType){
-// tLine.setState(1);
-// }
-// tLineService.updateById(tLine);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 分配企业操作
-// */
-// @RequestMapping(value = "/addCompany")
-// @ResponseBody
-// public Object addCompany(Integer lineId,@RequestParam String comArr) {
-// //删除分配企业
-// itLineCompanyService.delete(new EntityWrapper<TLineCompany>().eq("lineId",lineId));
-// //添加企业
-// if (SinataUtil.isNotEmpty(comArr)){
-// JSONArray jsonArray = JSON.parseArray(comArr);
-// int size = jsonArray.size();
-// for (int i = 0; i < size; i++) {
-// JSONObject jsonObject = jsonArray.getJSONObject(i);
-// TLineCompany lineCompany = new TLineCompany();
-// lineCompany.setLineId(lineId);
-// lineCompany.setCompanyId(jsonObject.getInteger("companyId"));
-// lineCompany.setInsertTime(new Date());
-// lineCompany.setInsertUserId(ShiroKit.getUser().getId());
-// itLineCompanyService.insert(lineCompany);
-// }
-// }
-// return SUCCESS_TIP;
-// }
-// /**
-// * 修改跨城站点管理
-// */
-// @RequestMapping(value = "/update")
-// @ResponseBody
-// public ResultUtil update(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {
-// String name = tLine.getName();
-// name = name.replaceAll("& lt;", "<");
-// name = name.replaceAll("& gt;", ">");
-// name = name.replaceAll("& #40;", "(");
-// name = name.replaceAll("& #41;", ")");
-// tLine.setName(name);
-// tLineService.updateById(tLine);
-//
-// //修改站点起点
-// TLineSite start = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLine.getId()).eq("type", 1));
-// if (SinataUtil.isNotEmpty(start)){
-// if (start.getSiteId().intValue() != startSiteId.intValue()){
-// start.setSiteId(startSiteId);
-// itLineSiteService.updateById(start);
-// }
-// }else{
-// start = new TLineSite();
-// start.setLineId(tLine.getId());
-// start.setSiteId(startSiteId);
-// start.setType(1);
-// itLineSiteService.insert(start);
-// }
-// //修改站点终点
-// TLineSite end = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLine.getId()).eq("type", 2));
-// if (SinataUtil.isNotEmpty(end)){
-// if (end.getSiteId().intValue() != endSiteId.intValue()){
-// end.setSiteId(endSiteId);
-// itLineSiteService.updateById(end);
-// }
-// }else{
-// end = new TLineSite();
-// end.setLineId(tLine.getId());
-// end.setSiteId(endSiteId);
-// end.setType(2);
-// itLineSiteService.insert(end);
-// }
-//
-// //删除线路价格
-// itLinePriceService.delete(new EntityWrapper<TLinePrice>().eq("lineId",tLine.getId()));
-// //添加价格设置
-// addPrice(tLine.getId(), subArr);
-// //删除线路班次
-// itLineShiftService.delete(new EntityWrapper<TLineShift>().eq("lineId",tLine.getId()));
-// //添加班次设置
-// return addShift(tLine.getId(), shuArr);
-//
-// }
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
deleted file mode 100644
index 335a96d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.dsh.guns.modular.system.controller.specialTrain;
-
-import com.dsh.course.feignClient.account.IncomeClient;
-import com.dsh.course.feignClient.account.model.IncomeReq;
-import com.dsh.course.feignClient.account.model.QueryIncomeListReq;
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoReq;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.feignClient.order.OrderLogisticsClient;
-import com.dsh.course.feignClient.order.TransactionDetailsClient;
-import com.dsh.course.feignClient.order.model.OrderLogisticsInfoReq;
-import com.dsh.course.feignClient.order.model.OrderLogisticsInfoRes;
-import com.dsh.course.feignClient.order.model.QueryLoginsicsListReq;
-import com.dsh.course.feignClient.order.model.TransactionDetailsReq;
-import com.dsh.course.feignClient.orderCancel.OrderCancelClient;
-import com.dsh.course.feignClient.orderCancel.model.OrderCancelRes;
-import com.dsh.course.feignClient.payment.PaymentClient;
-import com.dsh.course.feignClient.payment.model.QueryPaymentRecordReq;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.util.HttpRequestUtil;
-import com.dsh.guns.modular.system.util.PushURL;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 小件物流订单控制器
- *
- * @author fengshuonan
- * @Date 2020-09-24 14:20:41
- */
-@Controller
-@RequestMapping("/tOrderLogistics")
-public class TOrderLogisticsController extends BaseController {
-
- private String PREFIX = "/system/tOrderLogistics/";
-
- @Autowired
- private OrderLogisticsClient orderLogisticsClient;
-
- @Autowired
- private OrderCancelClient orderCancelClient;
-
- @Autowired
- private TUserClinet userClinet;
-
-
- @Autowired
- private PaymentClient paymentClient;
-
-// @Autowired
-// private ICBCPayUtil icbcPayUtil;
-
- @Autowired
- private IncomeClient incomeClient;
-
- @Autowired
- private DriverClient driverClient;
-
- @Autowired
- private TransactionDetailsClient transactionDetailsClient;
-
-
- /**
- * 跳转到小件物流订单首页
- */
- @RequestMapping("")
- public String index(Model model) {
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tOrderLogistics.html";
- }
-
- /**
- * 跳转到添加小件物流订单
- */
- @RequestMapping("/tOrderLogistics_add")
- public String tOrderLogisticsAdd() {
- return PREFIX + "tOrderLogistics_add.html";
- }
-
- /**
- * 跳转到查看小件物流订单
- */
- @RequestMapping("/tOrderLogistics_detail/{tOrderLogisticsId}")
- public String tOrderLogistics_detail(@PathVariable Long tOrderLogisticsId, Model model) {
- Map<String, Object> tOrderLogistics = orderLogisticsClient.getLogisticsOrderDetailById(tOrderLogisticsId);
- model.addAttribute("item", tOrderLogistics);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOrderLogistics_detail.html";
- }
-
- /**
- * 获取小件物流订单列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String orderNum,
- Integer type,
- Integer orderSource,
- String userName,
- String userPhone,
- String recipient,
- String recipientPhone,
- String driver,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)) {
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
-
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
-
-
- return super.packForBT( orderLogisticsClient.getLogisticsOrderList(new QueryLoginsicsListReq(limit,offset, beginTime, endTime, UserExt.getUser().getRoleType(), UserExt.getUser().getObjectId(),
- orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state)));
- }
-
-
- /**
- * 取消小件物流订单
- */
- @RequestMapping(value = "/cancel")
- @ResponseBody
- public Object cancel(@RequestParam Long tOrderLogisticsId) {
- try {
-// ShiroUser user = ShiroKit.getUser();
- OrderLogisticsInfoRes tOrderLogistics = orderLogisticsClient.queryOrderLogisticsInfo(tOrderLogisticsId);
- tOrderLogistics.setState(10);
-
- //已支付的情况下进行退款操作
- if (null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
- if (tOrderLogistics.getPayType() == 3) {//余额支付
- TUser tUser = userClinet.queryById(tOrderLogistics.getUserId());
-// TUser tUser = userService.selectById(tOrderLogistics.getUserId());
- tUser.setBalance(tUser.getBalance().add(new BigDecimal(tOrderLogistics.getPayMoney())));
- userClinet.updateById(tUser);
-// userService.updateById(tUser);
- } else {
-// List<PaymentRecord> paymentRecords = paymentRecordService.query();
- List<PaymentRecord> paymentRecords = paymentClient.queryPaymentRecordList(new QueryPaymentRecordReq(1, null, null, tOrderLogisticsId, tOrderLogistics.getType(), null, 2));
- if (paymentRecords.size() == 0) {
- return ResultUtil.error("订单还未进行支付");
- }
- boolean b = false;
- for (PaymentRecord query : paymentRecords) {
-// Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), tOrderLogistics.getId() + "_" + tOrderLogistics.getType(), tOrderLogistics.getOrderNum());
-// if (Integer.valueOf(merrefund.get("code").toString()) == 0) {
-// Map<String, Object> refundqry = icbcPayUtil.refundqry("", query.getCode(), tOrderLogistics.getOrderNum());
-// if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 0) {//成功
-// b = true;
-// }
-// if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 1) {//失败
-// return ResultUtil.error("订单取消失败（退款不成功）");
-// }
-// if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 2) {//未知
-// return ResultUtil.error("退款返回未知异常");
-// }
-// }
- }
- if (b) {
- //添加交易明细
-
- }
- }
-
- transactionDetailsClient.addTransactionDetails(new TransactionDetailsReq(tOrderLogistics.getUserId(), "小件订单取消退款", tOrderLogistics.getPayMoney().doubleValue(), 1, 1, 1, 4, tOrderLogistics.getId()));
-
- //添加负的收入明细
-// List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
- List<Income> incomes = incomeClient.queryIncomeListByType(new QueryIncomeListReq(2,tOrderLogistics.getId(),tOrderLogistics.getType()));
- for (Income income : incomes) {
- if (income.getUserType() == 2) {//处理司机的收入
- DriverInfoRes driver = driverClient.getDriver(income.getObjectId());
- driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(income.getMoney())).doubleValue());
-// if(driver.getLaveBusinessMoney().compareTo(income.getMoney()) >= 0){
-// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - income.getMoney());
-// }else{
-// double b = driver.getLaveBusinessMoney() - income.getMoney();
-// driver.setLaveBusinessMoney(0d);
-// driver.setLaveActivityMoney(driver.getLaveActivityMoney() - b);
-// }
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- }
- Income income1 = new Income();
- BeanUtils.copyProperties(income, income1);
- income1.setMoney(income.getMoney() * -1);
- income1.setId(null);
- income1.setInsertTime(new Date());
-// incomeService.insert(income1);
- IncomeReq incomeReq = new IncomeReq();
- BeanUtils.copyProperties(income1,incomeReq);
- incomeClient.insertIncome(incomeReq);
- }
- }
- OrderLogisticsInfoReq orderLogisticsInfoReq = new OrderLogisticsInfoReq();
- orderLogisticsInfoReq.setId(tOrderLogistics.getId());
- orderLogisticsInfoReq.setState(10);
- orderLogisticsClient.updateOrderLogistics(orderLogisticsInfoReq);
-// tOrderLogisticsService.updateById(tOrderLogistics);
-
- //添加取消记录
- OrderCancel orderCancel = new OrderCancel();
- orderCancel.setOrderId(tOrderLogistics.getId());
- orderCancel.setOrderType(tOrderLogistics.getType());
- orderCancel.setReason("调度端取消订单");
-// orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
- orderCancel.setState(2);
- orderCancel.setInsertTime(new Date());
- orderCancel.setUserType(3);
-// orderCancel.setUserId(user.getId());
- OrderCancelRes orderCancelRes = new OrderCancelRes();
- BeanUtils.copyProperties(orderCancel,orderCancelRes);
- orderCancelClient.saveOrderCancel(orderCancelRes);
-// orderCancelMapper.insert(orderCancel);
-
- //增加推送
- Map<String, String> map = new HashMap<>();
- map.put("id", tOrderLogistics.getId().toString());
- map.put("orderType", tOrderLogistics.getType().toString());
- String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
- System.out.println("小件物流取消:【orderId=" + tOrderLogistics.getId().toString() + "】,调用接口:" + result);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return SUCCESS_TIP;
- }
-
- /**
- * 删除小件物流订单
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Long tOrderLogisticsId) throws InvocationTargetException, IllegalAccessException {
- OrderLogisticsInfoRes orderLogisticsInfoRes = orderLogisticsClient.queryOrderLogisticsInfo(tOrderLogisticsId);
- orderLogisticsInfoRes.setIsDelete(2);
- OrderLogisticsInfoReq orderLogisticsInfoReq = new OrderLogisticsInfoReq();
- BeanUtils.copyProperties(orderLogisticsInfoRes,orderLogisticsInfoReq);
- orderLogisticsClient.updateOrderLogistics(orderLogisticsInfoReq);
-// TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
-// tOrderLogistics.setIsDelete(2);
-// tOrderLogisticsService.updateById(tOrderLogistics);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
deleted file mode 100644
index 628e05b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.dsh.guns.modular.system.controller.specialTrain;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoReq;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.feignClient.nearDriver.OrderPositionClient;
-import com.dsh.course.feignClient.nearDriver.model.DriverPositionReq;
-import com.dsh.course.feignClient.nearDriver.model.OrderPosition;
-import com.dsh.course.feignClient.order.OrderPrivateCarClient;
-import com.dsh.course.feignClient.order.model.GetPrivateCarOrderDetailById;
-import com.dsh.course.feignClient.order.model.OrderPrivateCar;
-import com.dsh.course.feignClient.order.model.QueryPrivateCarOrderReq;
-import com.dsh.course.feignClient.order.model.UpdateStateReq;
-import com.dsh.course.feignClient.orderCancel.OrderCancelClient;
-import com.dsh.course.feignClient.orderCancel.model.OrderCancelRes;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.support.HttpKit;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.OrderCancel;
-import com.dsh.guns.modular.system.model.TServerCarmodel;
-import com.dsh.guns.modular.system.service.ITServerCarmodelService;
-import com.dsh.guns.modular.system.util.HttpRequestUtil;
-import com.dsh.guns.modular.system.util.PushURL;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 专车订单控制器
- *
- * @author fengshuonan
- * @Date 2020-09-02 17:28:59
- */
-@Controller
-@RequestMapping("/tOrderPrivateCar")
-public class TOrderPrivateCarController extends BaseController {
-
- private String PREFIX = "/system/tOrderPrivateCar/";
-
- @Resource
- private OrderPrivateCarClient tOrderPrivateCarService;
-
- @Autowired
- private ITServerCarmodelService tServerCarmodelService;
-
-
- @Resource
- private DriverClient driverClient;
-
-
- @Resource
- private OrderCancelClient orderCancelClient;
-
- @Resource
- private OrderPositionClient orderPositionClient;
-
-
-
-
- /**
- * 跳转到专车订单首页
- */
- @RequestMapping("")
- public String index(Model model) {
- //服务专车车型
- List<TServerCarmodel> carmodelList = tServerCarmodelService.getBaseMapper().selectList(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- model.addAttribute("carmodelList",carmodelList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOrderPrivateCar.html";
- }
-
- /**
- * 跳转到修改专车订单
- */
- @RequestMapping("/tOrderPrivateCar_orderDetail/{tOrderPrivateCarId}")
- public String tOrderPrivateCarUpdate(@PathVariable Long tOrderPrivateCarId, Model model) {
- Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(new GetPrivateCarOrderDetailById(tOrderPrivateCarId,UserExt.getLanguage()));
- item.put("insertTimeStr",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.valueOf(item.get("insertTime").toString()))));
- if(item.get("travelTime") != null){
- item.put("travelTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.valueOf(item.get("travelTime").toString()))));
- }
- if(item.get("boardingTime")!=null) {
- item.put("boardingTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.valueOf(item.get("startServiceTime").toString()))));
- }
- if(item.get("getoffTime")!=null) {
- item.put("getoffTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.valueOf(item.get("endServiceTime").toString()))));
- }
- model.addAttribute("item",item);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tOrderPrivateCar_orderDetail.html";
- }
-
- /**
- * 跳转到出租车订单轨迹页面
- */
- @RequestMapping("/tOrderPrivateCar_trajectory/{tOrderPrivateCarId}")
- public String tOrderTaxi_trajectory(@PathVariable Long tOrderPrivateCarId, Model model) {
- model.addAttribute("tOrderPrivateCarId",tOrderPrivateCarId);
- return PREFIX + "tOrderPrivateCar_trajectory.html";
- }
-
- /**
- * 获取专车订单列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String orderNum,
- Integer orderSource,
- String userName,
- String userPhone,
- String passengers,
- String passengersPhone,
- Integer serverCarModelId,
- String driver,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
-
-
- HttpServletRequest request = HttpKit.getRequest();
- int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
- int offset = Integer.valueOf(request.getParameter("offset"));
- return super.packForBT(tOrderPrivateCarService.getPrivateCarOrderList(new QueryPrivateCarOrderReq(limit,offset, beginTime, endTime, UserExt.getUser().getRoleType(), UserExt.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state)));
- }
-
- private ResultUtil resultUtil;
-
- /**
- * 获取订单轨迹
- * @param orderDetailId
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
- public ResultUtil getOrderTrack(Long orderDetailId, Integer orderType){
- if(!StringUtils.isEmpty(orderDetailId)){
- try {
- DriverPositionReq driverPositionReq = new DriverPositionReq();
- driverPositionReq.setOrderId(orderDetailId);
- driverPositionReq.setOrderType(orderType);
- List<OrderPosition> orderPositions = orderPositionClient.queryOrderPosition(driverPositionReq);
- resultUtil = ResultUtil.success(orderPositions);
- }catch (Exception e){
- e.printStackTrace();
- resultUtil = ResultUtil.runErr();
- }
- }else {
- resultUtil = ResultUtil.paranErr();
- }
- return resultUtil;
- }
-
- /**
- * 取消专车订单
- */
- @RequestMapping(value = "/cancel")
- @ResponseBody
- public Object cancel(@RequestParam Long tOrderPrivateCarId) {
- OrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
-
- //修改之前司机状态 -- 空闲
- if(null != tOrderPrivateCar.getDriverId()){
- DriverInfoRes driver = driverClient.getDriver(tOrderPrivateCar.getDriverId());
- driver.setState(2);
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- }
-
- tOrderPrivateCar.setState(10);
- tOrderPrivateCarService.updateByIds(new UpdateStateReq(tOrderPrivateCarId,10));
-
- OrderCancel orderCancel = new OrderCancel();
- orderCancel.setOrderId(tOrderPrivateCarId);
- orderCancel.setOrderType(1);
- orderCancel.setReason("平台取消订单");
- orderCancel.setRemark("平台取消订单");
- orderCancel.setUserType(2);
- orderCancel.setState(2);
- orderCancel.setInsertTime(new Date());
- OrderCancelRes orderCancelRes = new OrderCancelRes();
- BeanUtils.copyProperties(orderCancel,orderCancelRes);
- orderCancelClient.saveOrderCancel(orderCancelRes);
-
- //增加推送
- Map<String,String> map = new HashMap<>();
- map.put("id", tOrderPrivateCar.getId().toString());
- map.put("orderType", "1");
- String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
- System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
-//
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// if(pushMinistryOfTransport){//上传数据
-// pushMinistryOfTransportUtil.orderCancel(tOrderPrivateCarId);
-// }
-// }
-// }).start();
-
- return SUCCESS_TIP;
- }
-
- /**
- * 删除专车订单
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Long tOrderPrivateCarId) {
- OrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
- tOrderPrivateCar.setIsDelete(2);
- tOrderPrivateCarService.updateById1s(new UpdateStateReq(tOrderPrivateCarId,2));
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TReassignController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TReassignController.java
deleted file mode 100644
index 6cae7d3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TReassignController.java
+++ /dev/null
@@ -1,534 +0,0 @@
-package com.dsh.guns.modular.system.controller.specialTrain;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.IncomeClient;
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.feignClient.driver.model.DriverInfoReq;
-import com.dsh.course.feignClient.driver.model.DriverInfoRes;
-import com.dsh.course.feignClient.order.OrderLogisticsClient;
-import com.dsh.course.feignClient.order.OrderPrivateCarClient;
-import com.dsh.course.feignClient.order.ReassignClient;
-import com.dsh.course.feignClient.order.TransactionDetailsClient;
-import com.dsh.course.feignClient.order.model.*;
-import com.dsh.course.feignClient.orderCancel.OrderCancelClient;
-import com.dsh.course.feignClient.orderCancel.model.OrderCancelRes;
-import com.dsh.course.feignClient.payment.PaymentClient;
-import com.dsh.course.feignClient.payment.model.QueryPaymentRecordReq;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.log.LogObjectHolder;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.util.HttpRequestUtil;
-import com.dsh.guns.modular.system.util.PushURL;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 专车改派管理控制器
- *
- * @author fengshuonan
- * @Date 2020-09-03 14:20:27
- */
-@Controller
-@RequestMapping("/tReassign")
-public class TReassignController extends BaseController {
-
- private String PREFIX = "/system/tReassign/";
-
- @Autowired
- private ReassignClient reassignClient;
-
- @Autowired
- private OrderPrivateCarClient itOrderPrivateCarService;
-
-
- @Autowired
- private DriverClient driverClient;
-
- @Autowired
- private OrderCancelClient orderCancelMapper;
-
-// @Autowired
-// private ICBCPayUtil icbcPayUtil;
-
- @Autowired
- private TUserClinet userClinet;
-
- @Autowired
- private TransactionDetailsClient transactionDetailsClient;
-
- @Autowired
- private PaymentClient paymentClient;
-
- @Autowired
- private IncomeClient incomeClient;
-
- @Autowired
- private OrderLogisticsClient orderLogisticsClient;
-
-
- /**
- * 跳转到专车改派管理首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tReassign.html";
- }
-
-
- /**
- * 跳转到小件物流改派管理首页
- */
- @RequestMapping("/smallPieceLogistics")
- public String smallPieceLogistics() {
- return PREFIX + "smallPieceLogistics.html";
- }
-
-
- /**
- * 跳转到添加专车改派管理
- */
- @RequestMapping("/tReassign_add")
- public String tReassignAdd() {
- return PREFIX + "tReassign_add.html";
- }
-
- /**
- * 跳转到修改专车改派管理
- */
- @RequestMapping("/tReassign_update/{tReassignId}")
- public String tReassignUpdate(@PathVariable Long tReassignId, Model model) {
- TReassign tReassign = reassignClient.queryReassignById(tReassignId);
- model.addAttribute("item",tReassign);
- LogObjectHolder.me().set(tReassign);
- return PREFIX + "tReassign_edit.html";
- }
-
- /**
- * 跳转到修改专车改派管理
- */
- @RequestMapping("/tReassign_reassignment/{tReassignId}")
- public String tReassign_reassignment(@PathVariable Integer tReassignId, Model model) {
- model.addAttribute("tReassignId",tReassignId);
- return PREFIX + "tReassign_reassignment.html";
- }
-
-
-
- /**
- * 获取摩托改派管理列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String insertTime,
- String originalDriverName,
- String originalDriverPhone,
- String orderNum,
- String nowDriverName,
- String nowDriverPhone,
- Integer orderState,
- Integer state) {
- String beginTime = null;
- String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
- String[] timeArray = insertTime.split(" - ");
- beginTime = timeArray[0];
- endTime = timeArray[1];
- }
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// page.setRecords(reassignClient.getPrivateCarReassignOrderList(new PrivateCarReassignReq(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state)));
- return super.packForBT(page);
- }
-
-
-
-
- /**
- * 选择司机列表
- */
- @RequestMapping(value = "/selectDriver/{orderId}")
- @ResponseBody
- public Object selectDriver(@PathVariable Long orderId,
- String name,
- String phone) {
-// TReassign reassign = tReassignService.selectById(orderId);
- TReassign reassign = reassignClient.queryReassignById(orderId);
-
- OrderPrivateCar privateCar = itOrderPrivateCarService.selectById(reassign.getOrderId());
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(reassignClient.getCanSelectPrivateCarDriverList(new QueryCanSelectPrivateCarDriverReq(page,privateCar.getCompanyId(),name,phone)));
- return super.packForBT(page);
- }
-
- /**
- * 选择司机列表
- */
-// @RequestMapping(value = "/selectCrossDriver/{orderId}")
-// @ResponseBody
-// public Object selectCrossDriver(@PathVariable Integer orderId,
-// String name,
-// String phone) {
-// TReassign reassign = tReassignService.selectById(orderId);
-// TOrderCrossCity tOrderCrossCity = itOrderCrossCityService.selectById(reassign.getOrderId());
-// LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(tOrderCrossCity.getLineShiftDriverId());
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// page.setRecords(tReassignService.getCanSelectCrossDriverList(page, tOrderCrossCity.getCompanyId(), tOrderCrossCity.getServerCarModelId(),
-// tOrderCrossCity.getLineId(), lineShiftDriver.getLineShiftId(), tOrderCrossCity.getTravelTime(), tOrderCrossCity.getPeopleNumber(), name, phone, tOrderCrossCity.getDriverId()));
-// return super.packForBT(page);
-// }
-
-
- /**
- * 选择司机列表
- */
- @RequestMapping(value = "/selectSmallDriver/{orderId}")
- @ResponseBody
- public Object selectSmallDriver(@PathVariable Long orderId,
- String name,
- String phone) {
-// TReassign reassign = tReassignService.selectById(orderId);
- TReassign reassign = reassignClient.queryReassignById(orderId);
-
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
- TOrderLogistics tOrderLogistics = orderLogisticsClient.queryByOrderId(reassign.getOrderId());
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(reassignClient.getCanSelectSmallDriverList(new QueryCanSelectSmallDriverReq(page,tOrderLogistics.getCompanyId(), tOrderLogistics.getType(),name,phone)));
- return super.packForBT(page);
- }
-
-
- /**
- * 操作专车改派管理
- * optType 1=拒绝 2=取消
- */
- @RequestMapping(value = "/opt")
- @ResponseBody
- public Object opt(@RequestParam Long tReassignId,@RequestParam Integer optType) {
-// ShiroUser user = ShiroKit.getUser();
-// TReassign tReassign = tReassignService.selectById(tReassignId);
- TReassign tReassign = reassignClient.queryReassignById(tReassignId);
- if (1 == optType){
- tReassign.setState(5);
- reassignClient.updateById(tReassign);
-
- //还原订单状态
- OrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
- tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
- itOrderPrivateCarService.updateByIds(new UpdateStateReq(tOrderPrivateCar.getId(),tOrderPrivateCar.getOldState()));
- }else if (2 == optType){
- tReassign.setState(4);
- reassignClient.updateById(tReassign);
-
- //修改订单状态"已取消"
- OrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
- tOrderPrivateCar.setState(10);
- itOrderPrivateCarService.updateByIds(new UpdateStateReq(tOrderPrivateCar.getId(),10));
-
- //修改司机状态"空闲"
- DriverInfoRes driver = driverClient.getDriver(tReassign.getOriginalDriverId());
- driver.setState(2);
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
-
- //添加取消记录
- OrderCancel orderCancel = new OrderCancel();
- orderCancel.setOrderId(tReassign.getOrderId());
- orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
-// orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
- orderCancel.setState(2);
- orderCancel.setInsertTime(new Date());
- orderCancel.setUserType(3);
-// orderCancel.setUserId(user.getId());
- OrderCancelRes orderCancelRes = new OrderCancelRes();
- BeanUtils.copyProperties(orderCancel,orderCancelRes);
- orderCancelMapper.saveOrderCancel(orderCancelRes);
-
- //调用推送
- Map<String,String> map = new HashMap<>();
- map.put("id", tOrderPrivateCar.getId().toString());
- map.put("orderType", "1");
- String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
- System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
- }
-
- //返回驾驶员处罚金
- DriverInfoRes originalDriver = driverClient.getDriver(tReassign.getOriginalDriverId());
-
- //增加交易明细
- TPubTransactionDetails details = new TPubTransactionDetails();
- details.setUserId(originalDriver.getId());
- details.setInsertTime(new Date());
- details.setRemark("【专车改派】:改派失败或订单取消");
- details.setMoney(new BigDecimal(tReassign.getMoney()));
- details.setState(1);
- details.setType(1);
- details.setUserType(2);
- details.setOrderType(3);
- details.setOrderId(tReassign.getOrderId());
- TransactionDetailsReq transactionDetailsReq = new TransactionDetailsReq();
- BeanUtils.copyProperties(details,transactionDetailsReq);
- transactionDetailsClient.addTransactionDetails(transactionDetailsReq);
- return SUCCESS_TIP;
- }
-
-
-
- /**
- * 操作专车改派管理
- * optType 1=拒绝 2=取消
- */
- @RequestMapping(value = "/optSmall")
- @ResponseBody
- public Object optSmall(@RequestParam Long tReassignId,@RequestParam Integer optType) {
- try {
-// ShiroUser user = ShiroKit.getUser();
- TReassign tReassign = reassignClient.queryReassignById(tReassignId);
- if (1 == optType){
- tReassign.setState(5);
- reassignClient.updateById(tReassign);
-
- //还原订单状态
- TOrderLogistics tOrderLogistics = orderLogisticsClient.queryByOrderId(tReassign.getOrderId());
- tOrderLogistics.setState(tOrderLogistics.getOldState());
- OrderLogisticsInfoReq orderLogisticsInfoReq = new OrderLogisticsInfoReq();
- BeanUtils.copyProperties(tOrderLogistics,orderLogisticsInfoReq);
- orderLogisticsClient.updateOrderLogistics(orderLogisticsInfoReq);
- }else if (2 == optType){
- tReassign.setState(4);
- reassignClient.updateById(tReassign);
-
- //修改订单状态"已取消"
- TOrderLogistics tOrderLogistics = orderLogisticsClient.queryByOrderId(tReassign.getOrderId());
- tOrderLogistics.setState(10);
- OrderLogisticsInfoReq orderLogisticsInfoReq = new OrderLogisticsInfoReq();
- BeanUtils.copyProperties(tOrderLogistics,orderLogisticsInfoReq);
- orderLogisticsClient.updateOrderLogistics(orderLogisticsInfoReq);
-
- //添加取消记录
- OrderCancel orderCancel = new OrderCancel();
- orderCancel.setOrderId(tReassign.getOrderId());
- orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
-// orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
- orderCancel.setState(2);
- orderCancel.setInsertTime(new Date());
- orderCancel.setUserType(3);
-// orderCancel.setUserId(user.getId());
- OrderCancelRes orderCancelRes = new OrderCancelRes();
- BeanUtils.copyProperties(orderCancel,orderCancelRes);
- orderCancelMapper.saveOrderCancel(orderCancelRes);
-
- //调用推送
- Map<String,String> map = new HashMap<>();
- map.put("id", tOrderLogistics.getId().toString());
- map.put("orderType", tOrderLogistics.getType().toString());
- String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
- System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
-
- //已支付的情况下进行退款操作
- if(null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
- if (tOrderLogistics.getPayType() == 3) {//余额支付
- TUser tUser = userClinet.queryById(tOrderLogistics.getUserId());
- tUser.setBalance(tUser.getBalance().add(tOrderLogistics.getPayMoney()));
- userClinet.updateById(tUser);
- } else {
- List<PaymentRecord> paymentRecords = paymentClient.queryPaymentRecordList(new QueryPaymentRecordReq(1, null, null, tOrderLogistics.getId().longValue(), tOrderLogistics.getType(), null, 2));
- if (paymentRecords.size() == 0) {
- return ResultUtil.error("订单还未进行支付");
- }
- boolean b = false;
-// for(PaymentRecord query : paymentRecords){
-// Map<String, Object> merrefund = icbcPayUtil.merrefund(query.getCode(), "", query.getAmount(), tOrderLogistics.getId() + "_" + tOrderLogistics.getType(), tOrderLogistics.getOrderNum());
-// if (Integer.valueOf(merrefund.get("code").toString()) == 0) {
-// Map<String, Object> refundqry = icbcPayUtil.refundqry("", query.getCode(), tOrderLogistics.getOrderNum());
-// if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 0) {//成功
-// b = true;
-// }
-// if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 1) {//失败
-// return ResultUtil.error("订单取消失败（退款不成功）");
-// }
-// if (Integer.valueOf(refundqry.get("code").toString()) == 0 && Integer.valueOf(refundqry.get("pay_status").toString()) == 2) {//未知
-// return ResultUtil.error("退款返回未知异常");
-// }
-// }
-// }
- if(b){
- //添加交易明细
-
- }
- }
-
- transactionDetailsClient.addTransactionDetails(new TransactionDetailsReq(tOrderLogistics.getUserId(), "小件订单取消退款", tOrderLogistics.getPayMoney().doubleValue(), 1, 1, 1, 4, tOrderLogistics.getId()));
-
- //添加负的收入明细
- List<Income> incomes = incomeClient.selectList(new QueryWrapper<Income>().eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
- for(Income income : incomes){
- if(income.getUserType() == 2){//处理司机的收入
- DriverInfoRes driver = driverClient.getDriver(income.getObjectId());
- driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(income.getMoney())).doubleValue());
-// if(driver.getLaveBusinessMoney().compareTo(income.getMoney()) >= 0){
-// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() -income.getMoney());
-// }else{
-// double b = driver.getLaveBusinessMoney() - income.getMoney();
-// driver.setLaveBusinessMoney(0d);
-// driver.setLaveActivityMoney(driver.getLaveActivityMoney() - b);
-// }
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
- }
- Income income1 = new Income();
- BeanUtils.copyProperties(income, income1);
- income1.setMoney(income.getMoney() * -1);
- income1.setId(null);
- income1.setInsertTime(new Date());
- incomeClient.insert(income1);
- }
- }
- }
- //返回驾驶员处罚金
- DriverInfoRes originalDriver = driverClient.getDriver(tReassign.getOriginalDriverId());
-
- //增加交易明细
- TPubTransactionDetails details = new TPubTransactionDetails();
- details.setUserId(originalDriver.getId());
- details.setInsertTime(new Date());
- details.setRemark("【小件物流】:改派失败或订单取消");
- details.setMoney(new BigDecimal(tReassign.getMoney()));
- details.setState(1);
- details.setType(1);
- details.setUserType(2);
- details.setOrderType(tReassign.getOrderType());
- details.setOrderId(tReassign.getOrderId());
- TransactionDetailsReq transactionDetailsReq = new TransactionDetailsReq();
- BeanUtils.copyProperties(details,transactionDetailsReq);
- transactionDetailsClient.addTransactionDetails(transactionDetailsReq);
- }catch (Exception e){
- e.printStackTrace();
- }
- return SUCCESS_TIP;
- }
-
-
- /**
- * 专车订单改派司机
- */
- @RequestMapping(value = "/selectDriver")
- @ResponseBody
- public Object selectDriver(@RequestParam Long orderId,@RequestParam Integer driverId) {
- //修改订单
- TReassign tReassign = reassignClient.queryReassignById(orderId);
-
- OrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
-
- //修改之前司机状态 -- 空闲
- DriverInfoRes oldDriver = driverClient.getDriver(tReassign.getOriginalDriverId());
- oldDriver.setState(2);
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(oldDriver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
-
- //查找司机对象
- DriverInfoRes nowDriver = driverClient.getDriver(driverId);
- nowDriver.setState(3);
- DriverInfoReq driverInfoReq1 = new DriverInfoReq();
- BeanUtils.copyProperties(nowDriver,driverInfoReq1);
- driverClient.updateDriver(driverInfoReq1);
-
- //修改专车订单
- tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
- tOrderPrivateCar.setDriverId(driverId);
- tOrderPrivateCar.setCarId(nowDriver.getCarId());
- itOrderPrivateCarService.updateById2s(tOrderPrivateCar);
-
- //修改专车改派订单
- tReassign.setNowDriverId(driverId);
- tReassign.setNowCarId(nowDriver.getCarId());
- tReassign.setState(3);
- tReassign.setCompleteTime(new Date());
- reassignClient.updateById(tReassign);
-
- //增加推送
- Map<String,String> map = new HashMap<>();
- map.put("orderId", tOrderPrivateCar.getId().toString());
- map.put("orderType", "1");
- String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
- System.out.println("专车改派:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
- return SUCCESS_TIP;
- }
-
-
- /**
- * 专车订单改派司机
- */
- @RequestMapping(value = "/selectSmallDriver")
- @ResponseBody
- public Object selectSmallDriver(@RequestParam Long orderId,@RequestParam Integer driverId) {
- //修改订单
- TReassign tReassign = reassignClient.queryReassignById(orderId);
- TOrderLogistics tOrderLogistics = orderLogisticsClient.queryByOrderId(tReassign.getOrderId());
-
- DriverInfoRes nowDriver = driverClient.getDriver(driverId);
- //修改专车订单
- tOrderLogistics.setState(tOrderLogistics.getOldState());
- tOrderLogistics.setDriverId(driverId);
- tOrderLogistics.setCarId(nowDriver.getCarId());
- OrderLogisticsInfoReq orderLogisticsInfoReq = new OrderLogisticsInfoReq();
- BeanUtils.copyProperties(tOrderLogistics,orderLogisticsInfoReq);
- orderLogisticsClient.updateOrderLogistics(orderLogisticsInfoReq);
-
- tReassign.setNowDriverId(driverId);
- tReassign.setNowCarId(nowDriver.getCarId());
- tReassign.setState(3);
- tReassign.setCompleteTime(new Date());
- reassignClient.updateById(tReassign);
-
- List<Income> incomes = incomeClient.selectList(new QueryWrapper<Income>().eq("userType", 2).eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
- for(Income income : incomes){
- income.setObjectId(driverId);
- incomeClient.updateById(income);
-
- DriverInfoRes driver = driverClient.getDriver(tReassign.getOriginalDriverId());
- driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(income.getMoney())).doubleValue());
-// driver.setBusinessMoney(driver.getBusinessMoney() - income.getMoney());
-// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - income.getMoney());
- DriverInfoReq driverInfoReq = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq);
-
- driver = driverClient.getDriver(driverId);
- driver.setBalance(new BigDecimal(driver.getBalance()).add(new BigDecimal(income.getMoney())).doubleValue());
-// driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
-// driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
- DriverInfoReq driverInfoReq1 = new DriverInfoReq();
- BeanUtils.copyProperties(driver,driverInfoReq);
- driverClient.updateDriver(driverInfoReq1);
- }
-
- //增加推送
- Map<String,String> map = new HashMap<>();
- map.put("orderId", tOrderLogistics.getId().toString());
- map.put("orderType", tOrderLogistics.getType().toString());
- String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
- System.out.println("小件物流改派:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
- return SUCCESS_TIP;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TServerCarmodelController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
deleted file mode 100644
index f251f7c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package com.dsh.guns.modular.system.controller.specialTrain;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.base.tips.ErrorTip;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.modular.system.model.TServerCarmodel;
-import com.dsh.guns.modular.system.service.ITServerCarmodelService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 专车车型设置控制器
- *
- * @author fengshuonan
- * @Date 2020-08-29 09:06:02
- */
-@Controller
-@RequestMapping("/tServerCarmodel")
-public class TServerCarmodelController extends BaseController {
-
- private String PREFIX = "/system/tServerCarmodel/";
-
- @Autowired
- private ITServerCarmodelService tServerCarmodelService;
-
- /**
- * 跳转到专车车型设置首页
- */
- @RequestMapping("")
- public String index() {
- return PREFIX + "tServerCarmodel.html";
- }
-
- /**
- * 跳转到跨城车型设置首页
- */
- @RequestMapping("/acrossCity")
- public String acrossCity() {
- return PREFIX + "acrossCity.html";
- }
-
- /**
- * 跳转到包车车型设置首页
- */
- @RequestMapping("/charter")
- public String charter() {
- return PREFIX + "charter.html";
- }
-
- /**
- * 跳转到添加专车车型设置
- */
- @RequestMapping("/tServerCarmodel_add")
- public String tServerCarmodelAdd() {
- return PREFIX + "tServerCarmodel_add.html";
- }
-
-
- /**
- * 跳转到添加专车车型设置
- */
- @RequestMapping("/tServerCarmodel_edit")
- public String tServerCarmodelAddEdit(Integer id, Model model) {
- TServerCarmodel tServerCarmodel = tServerCarmodelService.getById(id);
- model.addAttribute("data", tServerCarmodel);
- return PREFIX + "tServerCarmodel_edit.html";
- }
-
- /**
- * 跳转到添加跨城车型设置
- */
- @RequestMapping("/acrossCity_add")
- public String acrossCity_add() {
- return PREFIX + "acrossCity_add.html";
- }
-
-
- /**
- * 跳转到添加跨城车型设置
- */
- @RequestMapping("/acrossCity_edit")
- public String acrossCity_update(Integer id, Model model) {
- TServerCarmodel tServerCarmodel = tServerCarmodelService.getById(id);
- model.addAttribute("data", tServerCarmodel);
- return PREFIX + "acrossCity_edit.html";
- }
-
-
- /**
- * 跳转到添加包车车型设置
- */
- @RequestMapping("/charter_add")
- public String charter_add() {
- return PREFIX + "charter_add.html";
- }
-
-
- /**
- * 跳转到添加包车车型设置
- */
- @RequestMapping("/charter_edit")
- public String charter_edit(Integer id, Model model) {
- TServerCarmodel tServerCarmodel = tServerCarmodelService.getById(id);
- model.addAttribute("data", tServerCarmodel);
- model.addAttribute("price1", tServerCarmodel.getPrice().split("-")[0]);
- model.addAttribute("price2", tServerCarmodel.getPrice().split("-")[1]);
- return PREFIX + "charter_edit.html";
- }
-
-
- /**
- * 获取专车车型设置列表
- */
- @RequestMapping(value = "/list")
- @ResponseBody
- public Object list(String name,Integer state) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (33 != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tServerCarmodelService.getServerCarModelList(page,1,name,state));
- }
- return super.packForBT(page);
- }
-
- /**
- * 获取跨城车型设置列表
- */
- @RequestMapping(value = "/listAcrossCity")
- @ResponseBody
- public Object listAcrossCity(String name,Integer state) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (33 != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tServerCarmodelService.getServerCarModelList(page,2,name,state));
- }
- return super.packForBT(page);
- }
-
- /**
- * 获取包车车型设置列表
- */
- @RequestMapping(value = "/listCharter")
- @ResponseBody
- public Object listCharter(String name,Integer state) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (33 != 1){
- page.setRecords(null);
- }else{
- page.setRecords(tServerCarmodelService.getServerCarModelList(page,3,name,state));
- }
- return super.packForBT(page);
- }
-
- /**
- * 新增专车车型设置
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(TServerCarmodel tServerCarmodel) {
- int count = tServerCarmodelService.getBaseMapper().selectCount(new QueryWrapper<TServerCarmodel>().eq("type", 1)
- .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
- if (count > 0){
- return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
- }
- tServerCarmodel.setInsertTime(new Date());
- tServerCarmodel.setState(1);
- tServerCarmodel.setType(1);
- tServerCarmodelService.save(tServerCarmodel);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改专车型设置
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TServerCarmodel tServerCarmodel) {
- tServerCarmodel.setInsertTime(new Date());
- tServerCarmodel.setState(1);
- tServerCarmodel.setType(1);
- tServerCarmodelService.updateById(tServerCarmodel);
- return SUCCESS_TIP;
- }
-
-
-
- /**
- * 新增跨城车型设置
- */
- @RequestMapping(value = "/addAcrossCity")
- @ResponseBody
- public Object addAcrossCity(TServerCarmodel tServerCarmodel) {
- int count = tServerCarmodelService.getBaseMapper().selectCount(new QueryWrapper<TServerCarmodel>().eq("type", 2)
- .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
- if (count > 0){
- return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
- }
- tServerCarmodel.setInsertTime(new Date());
- tServerCarmodel.setState(1);
- tServerCarmodel.setType(2);
- tServerCarmodelService.save(tServerCarmodel);
- return SUCCESS_TIP;
- }
-
-
- /**
- * 修改跨城车型设置
- */
- @RequestMapping(value = "/editAcrossCity")
- @ResponseBody
- public Object editAcrossCity(TServerCarmodel tServerCarmodel) {
- tServerCarmodel.setInsertTime(new Date());
- tServerCarmodel.setState(1);
- tServerCarmodel.setType(2);
- tServerCarmodelService.updateById(tServerCarmodel);
- return SUCCESS_TIP;
- }
-
-
-
- /**
- * 新增包车车型设置
- */
- @RequestMapping(value = "/addCharter")
- @ResponseBody
- public Object addCharter(TServerCarmodel tServerCarmodel) {
- int count = tServerCarmodelService.getBaseMapper().selectCount(new QueryWrapper<TServerCarmodel>().eq("type", 3)
- .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
- if (count > 0){
- return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
- }
- tServerCarmodel.setInsertTime(new Date());
- tServerCarmodel.setState(1);
- tServerCarmodel.setType(3);
- tServerCarmodelService.save(tServerCarmodel);
- return SUCCESS_TIP;
- }
-
- /**
- * 新增包车车型设置
- */
- @RequestMapping(value = "/editCharter")
- @ResponseBody
- public Object editCharter(TServerCarmodel tServerCarmodel) {
- tServerCarmodel.setInsertTime(new Date());
- tServerCarmodel.setState(1);
- tServerCarmodel.setType(3);
- tServerCarmodelService.updateById(tServerCarmodel);
- return SUCCESS_TIP;
- }
-
-
-
- /**
- * 禁用/启用
- */
- @RequestMapping(value = "/opt")
- @ResponseBody
- public Object opt(@RequestParam Integer optType,@RequestParam Integer tServerCarmodelId) {
- TServerCarmodel one = tServerCarmodelService.getById(tServerCarmodelId);
- if (1 == optType){ //禁用
- one.setState(2);
- }else if (2 == optType){ //启用
- one.setState(1);
- }
- tServerCarmodelService.updateById(one);
- return SUCCESS_TIP;
- }
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSiteController.java
deleted file mode 100644
index 3140dd7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSiteController.java
+++ /dev/null
@@ -1,285 +0,0 @@
-//package com.dsh.guns.modular.system.controller.specialTrain;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.mapper.EntityWrapper;
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.core.base.controller.BaseController;
-//import com.dsh.guns.core.common.constant.factory.PageFactory;
-//import com.dsh.guns.core.shiro.ShiroKit;
-//import com.dsh.guns.core.util.DateUtil;
-//import com.dsh.guns.core.util.SinataUtil;
-//import com.dsh.guns.core.util.ToolUtil;
-//import com.dsh.guns.modular.system.model.TDriverLine;
-//import com.dsh.guns.modular.system.model.TLocation;
-//import com.dsh.guns.modular.system.model.TRegion;
-//import com.dsh.guns.modular.system.service.ITLocationService;
-//import com.dsh.guns.modular.system.service.ITRegionService;
-//import com.dsh.guns.modular.system.util.GDMapElectricFenceUtil;
-//import com.dsh.guns.modular.system.util.ResultUtil;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.dsh.guns.core.log.LogObjectHolder;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.dsh.guns.modular.system.model.TSite;
-//import com.dsh.guns.modular.system.service.ITSiteService;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 跨城站点管理控制器
-// *
-// * @author fengshuonan
-// * @Date 2020-09-04 10:35:51
-// */
-//@Controller
-//@RequestMapping("/tSite")
-//public class TSiteController extends BaseController {
-//
-// private String PREFIX = "/system/tSite/";
-//
-// @Autowired
-// private ITSiteService tSiteService;
-//
-// @Autowired
-// private ITRegionService tRegionService;
-//
-// @Autowired
-// private ITLocationService itLocationService;
-//
-// @Autowired
-// private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-//
-//
-//
-// /**
-// * 跳转到跨城站点管理首页
-// */
-// @RequestMapping("")
-// public String index() {
-// return PREFIX + "tImg.html";
-// }
-//
-// /**
-// * 跳转到添加跨城站点管理
-// */
-// @RequestMapping("/tSite_add")
-// public String tSiteAdd(Model model) {
-// //省
-// List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
-// model.addAttribute("provinceList",provinceList);
-// return PREFIX + "tSite_add.html";
-// }
-//
-// /**
-// * 跳转到修改跨城站点管理
-// */
-// @RequestMapping("/tSite_update/{tSiteId}")
-// public String tSiteUpdate(@PathVariable Integer tSiteId, Model model) {
-// TSite tSite = tSiteService.selectById(tSiteId);
-// model.addAttribute("item",tSite);
-// LogObjectHolder.me().set(tSite);
-//
-// //省
-// List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
-// model.addAttribute("provinceList",provinceList);
-//
-// TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tSite.getProvinceCode()));
-// //市
-// List<TRegion> cityList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", province.getId()));
-// model.addAttribute("cityList",cityList);
-//
-// if (SinataUtil.isNotEmpty(tSite.getCityCode())){
-// TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tSite.getCityCode()));
-// //区
-// List<TRegion> areaList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", city.getId()));
-// model.addAttribute("areaList",areaList);
-// }else{
-// model.addAttribute("areaList",null);
-// }
-//
-// //查询所有的站点区域
-// List<TLocation> locationList = itLocationService.selectList(new EntityWrapper<TLocation>().eq("siteId", tSite.getId()).ne("state", 3));
-// model.addAttribute("locationList",locationList);
-// model.addAttribute("disabled","disabled");
-//
-// Integer type = itLocationService.selectList(new EntityWrapper<TLocation>().eq("siteId", tSite.getId())).get(0).getType();
-// model.addAttribute("type1", type == 1 ? "block" : "none");
-// model.addAttribute("type2", type == 1 ? "none" : "block");
-// model.addAttribute("checked1", type == 1 ? "checked" : "");
-// model.addAttribute("checked2", type == 1 ? "" : "checked");
-// return PREFIX + "tImg_edit.html";
-// }
-//
-// /**
-// * 获取跨城站点管理列表
-// */
-// @RequestMapping(value = "/list")
-// @ResponseBody
-// public Object list(String insertTime,String name,String insertUser,String city,Integer state) {
-// String beginTime = null;
-// String endTime = null;
-// if (SinataUtil.isNotEmpty(insertTime)){
-// String[] timeArray = insertTime.split(" - ");
-// beginTime = timeArray[0];
-// endTime = timeArray[1];
-// }
-// Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-// if (ShiroKit.getUser().getRoleType() != 1){
-// page.setRecords(null);
-// }else{
-// page.setRecords(tSiteService.getSiteList(page,beginTime,endTime,name,insertUser,city,state));
-// }
-// return super.packForBT(page);
-// }
-//
-// /**
-// * 新增跨城站点管理
-// */
-// @RequestMapping(value = "/add")
-// @ResponseBody
-// public Object add(TSite tSite,@RequestParam String subArr) {
-// tSite.setInsertTime(new Date());
-// tSite.setInsertUserId(ShiroKit.getUser().getId());
-// tSite.setState(1);
-// tSiteService.insert(tSite);
-//
-// //添加站点区域
-// addLocation(subArr,tSite.getId());
-// return ResultUtil.success();
-// }
-//
-// /**
-// * 添加站点区域
-// * @param subArr
-// * @param id
-// */
-// public void addLocation(String subArr,Integer id){
-// JSONArray jsonArray = JSON.parseArray(subArr);
-// int size = jsonArray.size();
-// for (int i = 0; i < size; i++){
-// JSONObject jsonObject = jsonArray.getJSONObject(i);
-// TLocation location = new TLocation();
-// location.setSiteId(id);
-// location.setName(jsonObject.getString("name"));
-// location.setInsertTime(new Date());
-// location.setAddTime(jsonObject.getString("time"));
-// location.setState(1);
-// location.setUpdateTime(new Date());
-// Integer type = jsonObject.getInteger("areaType");
-// location.setType(type);
-// if (1 == type){
-// if (SinataUtil.isNotEmpty(jsonObject.getString("provinceCode"))){
-// location.setProvince(jsonObject.getString("province"));
-// location.setProvinceCode(jsonObject.getString("provinceCode"));
-// }
-// if (SinataUtil.isNotEmpty(jsonObject.getString("cityCode"))){
-// location.setCity(jsonObject.getString("city"));
-// location.setCityCode(jsonObject.getString("cityCode"));
-// }
-// if (SinataUtil.isNotEmpty(jsonObject.getString("districtCode"))){
-// location.setDistrict(jsonObject.getString("district"));
-// location.setDistrictCode(jsonObject.getString("districtCode"));
-// }
-// }else if (2 == type){
-// String coordinate = jsonObject.getString("coordinate");
-// coordinate = coordinate.substring(0, coordinate.length() - 1);
-// location.setCoordinate(coordinate);
-// }
-// itLocationService.insert(location);
-//
-// if(type == 2){
-// List<String> fence = gdMapElectricFenceUtil.createFence(location.getId().toString(), location.getCoordinate());
-// TLocation location1 = itLocationService.selectById(location.getId());
-// String s = "";
-// for(String gid : fence){
-// s += gid + "_";
-// }
-// location1.setGid(s.substring(0, s.length() - 1));
-// location1.setUpdateTime(new Date());
-// itLocationService.updateById(location1);
-// }
-// }
-// }
-//
-// /**
-// * 操作跨城站点管理
-// * optType 1=删除 2=冻结 3=解冻
-// */
-// @RequestMapping(value = "/opt")
-// @ResponseBody
-// public Object opt(@RequestParam Integer tSiteId,@RequestParam Integer optType) {
-// TSite tSite = tSiteService.selectById(tSiteId);
-// if (1 == optType){
-// tSite.setState(3);
-// }else if (2 == optType){
-// tSite.setState(2);
-// }else if (3 == optType){
-// tSite.setState(1);
-// }
-// tSiteService.updateById(tSite);
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 修改跨城站点管理
-// */
-// @RequestMapping(value = "/update")
-// @ResponseBody
-// public Object update(TSite tSite,@RequestParam String subArr) {
-// tSiteService.updateById(tSite);
-//
-// //删除站点区域
-// JSONArray jsonArray = JSON.parseArray(subArr);
-// List<TLocation> siteId = itLocationService.selectList(new EntityWrapper<TLocation>().eq("siteId", tSite.getId()));
-// List<TLocation> del = new ArrayList<>();
-// List<Object> add = new ArrayList<>();
-// for(TLocation location : siteId){
-// boolean b = true;
-// for(int i = 0; i < jsonArray.size(); i++){
-// if(jsonArray.getJSONObject(i).getIntValue("id") == location.getId()){
-// b = false;
-// }
-// }
-// if(b){
-// del.add(location);
-// continue;
-// }
-// }
-// for(int i = 0; i < jsonArray.size(); i++){
-// if(jsonArray.getJSONObject(i).getInteger("id") == null){
-// add.add(jsonArray.get(i));
-// }
-// }
-// for(TLocation location : del){
-// if(location.getType() == 2){
-// String[] s = location.getGid().split("_");
-// for(String gid : s){
-// gdMapElectricFenceUtil.deleteElectricFenc(gid);
-// }
-// }
-// itLocationService.deleteById(location.getId());
-// }
-//
-// //添加站点区域
-// addLocation(JSON.toJSONString(add),tSite.getId());
-// return SUCCESS_TIP;
-// }
-//
-// /**
-// * 跨城站点管理详情
-// */
-// @RequestMapping(value = "/detail/{tSiteId}")
-// @ResponseBody
-// public Object detail(@PathVariable("tSiteId") Integer tSiteId) {
-// return tSiteService.selectById(tSiteId);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSystemPriceController.java
deleted file mode 100644
index c11a703..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ /dev/null
@@ -1,549 +0,0 @@
-package com.dsh.guns.modular.system.controller.specialTrain;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.entity.BaseBean;
-import com.dsh.course.entity.OpenCity;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.course.mapper.OpenCityMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.constant.factory.PageFactory;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.TOpenCity;
-import com.dsh.guns.modular.system.model.TServerCarmodel;
-import com.dsh.guns.modular.system.model.TSystemPrice;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-import com.dsh.guns.modular.system.service.*;
-import net.sf.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 专车价格设置控制器
- *
- * @author fengshuonan
- * @Date 2020-08-29 10:50:13
- */
-@Controller
-@RequestMapping("/tSystemPrice")
-public class TSystemPriceController extends BaseController {
-
- private String PREFIX = "/system/tSystemPrice/";
-
- @Autowired
- private ITSystemPriceService tSystemPriceService;
-
- @Autowired
- private ITServerCarmodelService tServerCarmodelService;
-
- @Autowired
- private ITSystemPriceServiceService itSystemPriceServiceService;
-
- @Autowired
- private IUserService userService;
-
- @Resource
- private CityMapper cityMapper;
-
- @Resource
- private OpenCityMapper openCityMapper;
-
- @Autowired
- private ITOpenCityService openCityService;
-
-
- /**
- * 跳转到专车价格设置首页
- */
- @RequestMapping("/special")
- public String index(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tSystemPrice.html";
- }
-
-
- @RequestMapping("/check")
- public String index1(Model model) {
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tSystemPriceCheck.html";
- }
-
- /**
- * 跳转到小件物流价格设置首页
- */
- @RequestMapping("/small")
- public String small(Model model) {
- //跨城小件物流
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "small.html";
- }
-
-
- @RequestMapping(value = "/change")
- @ResponseBody
- public Object change(Integer code) {
- List<OpenCity> openCities = openCityMapper.selectListCity1(UserExt.getLanguage(),code);
- return openCities;
- }
-
- /**
- * 跳转到添加专车价格设置
- */
- @RequestMapping("/tSystemPrice_add")
- public String tSystemPriceAdd(Model model) {
- //查询所有专车车型
- List<TSystemPrice> tSystemPrices = tSystemPriceService.getBaseMapper().selectList(new QueryWrapper<TSystemPrice>().eq("type", 1).eq("companyId", 11).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.getBaseMapper().selectList(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- Integer language = UserExt.getLanguage();
- if(language==2){
- for (TServerCarmodel tServerCarmodel : modelList) {
- tServerCarmodel.setName(tServerCarmodel.getEname());
- }
- }
- if(language==3){
- for (TServerCarmodel tServerCarmodel : modelList) {
- tServerCarmodel.setName(tServerCarmodel.getYname());
- }
- }
- List<TServerCarmodel> serverCarmodels = new ArrayList<>();
- for (TServerCarmodel tsc : modelList) {
- boolean b = true;
- for (TSystemPrice tsp : tSystemPrices) {
- if (tsc.getId() == tsp.getServerCarModelId()) {
- b = false;
- break;
- }
- }
- if (b) {
- serverCarmodels.add(tsc);
- }
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("modelList", serverCarmodels);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tSystemPrice_add.html";
- }
-
-
- /**
- * 跳转到修改专车价格设置
- */
- @RequestMapping("/tSystemPrice_update/{tSystemPriceId}")
- public String tSystemPriceUpdate(@PathVariable String tSystemPriceId, Model model) {
- TSystemPrice sys = tSystemPriceService.getById(tSystemPriceId);
-
- List<TSystemPrice> service = tSystemPriceService.getBaseMapper().selectList(new LambdaQueryWrapper<TSystemPrice>()
- .eq(TSystemPrice::getCompanyId,sys.getCompanyId()).eq(TSystemPrice::getUserType,sys.getUserType())
- .eq(TSystemPrice::getOpenCityId,sys.getOpenCityId()).eq(TSystemPrice::getServerCarModelId,sys.getServerCarModelId())
- .eq(TSystemPrice::getOrderType,sys.getOrderType()));
- for (TSystemPrice s : service) {
- if(s.getType()==1){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json1", json);
- }else if(s.getType()==2){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json2", json);
- }else if(s.getType()==3){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json3", json);
- }else if(s.getType()==4){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json4", json);
- }else if(s.getType()==5){
- JSONArray objects = JSON.parseArray(s.getContent());
- objects.getJSONObject(0).put("num10",1);
- model.addAttribute("json5a", objects);
- }else if(s.getType()==6){
- JSONArray objects = JSON.parseArray(s.getContent());
- objects.getJSONObject(0).put("num10",1);
- model.addAttribute("json6a", objects);
- }else if(s.getType()==7){
- JSONArray objects = JSON.parseArray(s.getContent());
- objects.getJSONObject(0).put("num10",1);
- model.addAttribute("json7a", objects);
- }
- }
- model.addAttribute("item", sys);
- model.addAttribute("carType", sys.getServerCarModelId());
-
- //查询所有专车车型
- List<TSystemPrice> tSystemPrices = tSystemPriceService.getBaseMapper().selectList(new QueryWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.getBaseMapper().selectList(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- List<TServerCarmodel> serverCarmodels = new ArrayList<>();
- Integer language = UserExt.getLanguage();
- for (TServerCarmodel tsc : modelList) {
- if(language==2){
- tsc.setName(tsc.getEname());
- }
- if(language==3){
- tsc.setName(tsc.getYname());
- }
- boolean b = true;
- for (TSystemPrice tsp : tSystemPrices) {
- if (tsc.getId() == tsp.getServerCarModelId() && !tsc.getId().equals(tSystemPriceId)) {
- b = false;
- break;
- }
- }
- if (b) {
- serverCarmodels.add(tsc);
- }
- }
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("modelList", modelList);
- model.addAttribute("language", UserExt.getLanguage());
- return PREFIX + "tSystemPrice_edit.html";
- }
-
-
-
-
- @RequestMapping("/tSystemPrice_update1/{tSystemPriceId}")
- public String tSystemPriceUpdate1(@PathVariable String tSystemPriceId, Model model) {
- List<TSystemPriceService> two = tSystemPriceService.getService(tSystemPriceId);
- if(two.get(0).getOrderType()==4) {
- if (SinataUtil.isNotEmpty(two)) {
- JSONObject json1 = JSONObject.fromObject(two.get(0).getContent());
- model.addAttribute("json1", json1);
- JSONObject json2 = JSONObject.fromObject(two.get(1).getContent());
- model.addAttribute("json2", json2);
- JSONArray json3 = JSON.parseArray(two.get(2).getContent());
- model.addAttribute("json3a", json3);
- }
- Integer language = UserExt.getLanguage();
- TOpenCity openCity = openCityService.getBaseMapper().selectById(two.get(0).getOpenCityId());
- if(language==1){
- openCity.setCityName(openCity.getChineseName());
- }else if(language==2){
- openCity.setCityName(openCity.getEnglishName());
- }else {
- openCity.setCityName(openCity.getIndonesianName());
- }
- model.addAttribute("city", openCity);
-
- model.addAttribute("code", tSystemPriceId);
- model.addAttribute("item", cityMapper.selectList(null));
- model.addAttribute("sub", 1);
- model.addAttribute("userType", two.get(0).getUserType());
- model.addAttribute("language", language);
- return PREFIX + "small_edit.html";
- }else if(two.get(0).getOrderType()==1){
- for (TSystemPriceService s : two) {
- if(s.getType()==1){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json1", json);
- }else if(s.getType()==2){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json2", json);
- }else if(s.getType()==3){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json3", json);
- }else if(s.getType()==4){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json4", json);
- }else if(s.getType()==5){
- JSONArray objects = JSON.parseArray(s.getContent());
- objects.getJSONObject(0).put("num10",1);
- Object o = objects.get(0);
- System.out.println(o
- );
-
-// JSONObject json = JSONObject.fromObject(objects);
- model.addAttribute("json5a", objects);
- }else if(s.getType()==6){
- JSONArray objects = JSON.parseArray(s.getContent());
-// JSONObject json = JSONObject.fromObject(objects);
- model.addAttribute("json6a", objects);
- }else if(s.getType()==7){
- JSONArray objects = JSON.parseArray(s.getContent());
-// JSONObject json = JSONObject.fromObject(objects);
- model.addAttribute("json7a", objects);
- }
- }
- Integer language = UserExt.getLanguage();
- model.addAttribute("item", two.get(0));
- TOpenCity openCity = openCityService.getBaseMapper().selectById(two.get(0).getOpenCityId());
- if(language==1){
- openCity.setCityName(openCity.getChineseName());
- }else if(language==2){
- openCity.setCityName(openCity.getEnglishName());
- }else {
- openCity.setCityName(openCity.getIndonesianName());
- }
- model.addAttribute("city", openCity);
-
- List<TOpenCity> openCities = openCityService.getBaseMapper().selectList(new QueryWrapper<TOpenCity>().ne("flag", 3));
- model.addAttribute("openCity",openCities);
- model.addAttribute("code", tSystemPriceId);
- model.addAttribute("userType", two.get(0).getUserType());
- model.addAttribute("sub", 1);
- List<TServerCarmodel> modelList = tServerCarmodelService.getBaseMapper().selectList(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1).eq("id",two.get(0).getServerCarModelId()));
-
- for (TServerCarmodel tServerCarmodel : modelList) {
- if(language==2){
- tServerCarmodel.setName(tServerCarmodel.getEname());
- }
- if(language==3){
- tServerCarmodel.setName(tServerCarmodel.getYname());
- }
- }
-
- model.addAttribute("modelList", modelList);
- model.addAttribute("language", language);
- return PREFIX + "tSystemPriceService_edit.html";
- }
- return null;
- }
-
-
-
- @RequestMapping("/tSystemPrice_update2/{tSystemPriceId}")
- public String tSystemPriceUpdate2(@PathVariable String tSystemPriceId, Model model) {
- List<TSystemPriceService> two = tSystemPriceService.getService(tSystemPriceId);
- if(two.get(0).getOrderType()==4) {
- if (SinataUtil.isNotEmpty(two)) {
- JSONObject json1 = JSONObject.fromObject(two.get(0).getContent());
- model.addAttribute("json1", json1);
- JSONObject json2 = JSONObject.fromObject(two.get(1).getContent());
- model.addAttribute("json2", json2);
- JSONArray json3 = JSON.parseArray(two.get(2).getContent());
- model.addAttribute("json3a", json3);
- }
- Integer cityId = two.get(0).getOpenCityId();
- OpenCity openCity = openCityMapper.selectList(new LambdaQueryWrapper<OpenCity>().eq(OpenCity::getId,cityId).ne(BaseBean::getFlag,3)).get(0);
- Integer language = UserExt.getLanguage();
- if(language==1){
- openCity.setCityName(openCity.getChineseName());
- }else if(language==2){
- openCity.setCityName(openCity.getEnglishName());
- }else {
- openCity.setCityName(openCity.getIndonesianName());
- }
- model.addAttribute("city", openCity);
- model.addAttribute("code", tSystemPriceId);
- model.addAttribute("item", cityMapper.selectList(null));
- model.addAttribute("sub", 2);
- model.addAttribute("userType", two.get(0).getUserType());
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "small_edit.html";
- }else if(two.get(0).getOrderType()==1){
- for (TSystemPriceService s : two) {
- if(s.getType()==1){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json1", json);
- }else if(s.getType()==2){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json2", json);
- }else if(s.getType()==3){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json3", json);
- }else if(s.getType()==4){
- JSONObject json = JSONObject.fromObject(s.getContent());
- model.addAttribute("json4", json);
- }else if(s.getType()==5){
- JSONArray objects = JSON.parseArray(s.getContent());
-// JSONObject json = JSONObject.fromObject(objects);
- model.addAttribute("json5a", objects);
- }else if(s.getType()==6){
- JSONArray objects = JSON.parseArray(s.getContent());
-// JSONObject json = JSONObject.fromObject(objects);
- model.addAttribute("json6a", objects);
- }else if(s.getType()==7){
- JSONArray objects = JSON.parseArray(s.getContent());
-// JSONObject json = JSONObject.fromObject(objects);
- model.addAttribute("json7a", objects);
- }
- }
- model.addAttribute("item", two.get(0));
- Integer cityId = two.get(0).getOpenCityId();
- OpenCity openCity = openCityMapper.selectList(new LambdaQueryWrapper<OpenCity>().eq(OpenCity::getId,cityId).ne(BaseBean::getFlag,3)).get(0);
- Integer language = UserExt.getLanguage();
- if(language==1){
- openCity.setCityName(openCity.getChineseName());
- }else if(language==2){
- openCity.setCityName(openCity.getEnglishName());
- }else {
- openCity.setCityName(openCity.getIndonesianName());
- }
-
- model.addAttribute("code", tSystemPriceId);
- model.addAttribute("userType", two.get(0).getUserType());
- model.addAttribute("sub", 2);
- model.addAttribute("city", openCity);
-
- List<TServerCarmodel> modelList = tServerCarmodelService.getBaseMapper().selectList(new QueryWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1).eq("id",two.get(0).getServerCarModelId()));
- for (TServerCarmodel tServerCarmodel : modelList) {
- if(language==2){
- tServerCarmodel.setName(tServerCarmodel.getEname());
- }
- if(language==3){
- tServerCarmodel.setName(tServerCarmodel.getYname());
- }
- }
-
- model.addAttribute("modelList", modelList);
- model.addAttribute("language",UserExt.getLanguage());
- return PREFIX + "tSystemPriceService_edit.html";
- }
- return null;
- }
-
- /**
- * 获取专车价格设置列表
- */
- @RequestMapping(value = "/listSpecial")
- @ResponseBody
- public Object list(String name, Integer state) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> specialPriceList = tSystemPriceService.getSpecialPriceList(page, UserExt.getUser().getObjectId(), name, state);
- Integer language = UserExt.getLanguage();
- for (Map<String, Object> map : specialPriceList) {
- if(null == map.get("openCityId")){
- continue;
- }
- Integer openCityId = Integer.valueOf(map.get("openCityId").toString());
- TOpenCity openCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null != openCity){
- map.put("city", language == 1 ? openCity.getChineseName() : language == 2 ? openCity.getEnglishName() : openCity.getIndonesianName());
- }
- }
- page.setRecords(specialPriceList);
- return super.packForBT(page);
- }
-
-
- @RequestMapping(value = "/listService")
- @ResponseBody
- public Object listService(String time, String company, String phone, String account, Integer state) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tSystemPriceService.getServicePriceList(page,time, company, phone, account, state));
- return super.packForBT(page);
- }
-
- /**
- * 新增专车价格设置
- */
- @RequestMapping(value = "/add")
- @ResponseBody
- public Object add(Integer openCityId,Integer serverCarModelId,Integer type,String json1,String json2,String json3,String json4,String json5,String json6,String json7) {
- String randomNumber = ToolUtil.getRandomNumber(11);
- Integer userId=UserExt.getUser().getId();
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json1,1,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json2,2,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json3,3,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json4,4,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json5,5,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json6,6,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json7,7,randomNumber,userId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改专车价格设置
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(Integer openCityId,Integer oldServer ,Integer serverCarModelId,Integer oldType,Integer oldOpenCityId, Integer type,String json1,String json2,String json3,String json4,String json5,String json6,String json7) {
-
- tSystemPriceService.remove(new LambdaQueryWrapper<TSystemPrice>().eq(TSystemPrice::getOpenCityId,oldOpenCityId).eq(TSystemPrice::getUserType,oldType).eq(TSystemPrice::getOrderType,1).eq(TSystemPrice::getCompanyId,1).eq(TSystemPrice::getServerCarModelId,oldServer));
- String randomNumber = ToolUtil.getRandomNumber(11);
- Integer userId=1;
- if(type==null){
- type=oldType;
- }
-
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json1,1,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json2,2,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json3,3,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json4,4,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json5,5,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json6,6,randomNumber,userId);
- tSystemPriceService.saveMotoService(openCityId,serverCarModelId,type,json7,7,randomNumber,userId);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改状态
- */
- @RequestMapping(value = "/opt")
- @ResponseBody
- public Object opt(Integer optType, Integer tSystemPriceId) {
-// List<TSystemPriceService> service = itSystemPriceServiceService.getBaseMapper().selectList(new LambdaQueryWrapper<TSystemPriceService>()
-// .eq(TSystemPriceService::getCompanyId,byId.getCompanyId()).eq(TSystemPriceService::getUserType,byId.getUserType())
-// .eq(TSystemPriceService::getCityId,byId.getCityId()).eq(TSystemPriceService::getServerCarModelId,byId.getServerCarModelId())
-// .eq(TSystemPriceService::getOrderType,byId.getOrderType()));
- TSystemPrice systemPrice = new TSystemPrice();
- if (1 == optType) { //冻结
- systemPrice.setState(2);
- } else if (2 == optType) { //解冻
- systemPrice.setState(1);
- } else if (3 == optType) { //删除
- systemPrice.setState(3);
- }
- TSystemPrice byId = tSystemPriceService.getById(tSystemPriceId);
- tSystemPriceService.update(systemPrice, new QueryWrapper<TSystemPrice>()
- .eq("companyId",byId.getCompanyId()).eq("userType",byId.getUserType())
- .eq("cityId",byId.getCityId()).eq("serverCarModelId",byId.getServerCarModelId())
- .eq("orderType",byId.getOrderType()));
- return SUCCESS_TIP;
- }
-
- @RequestMapping(value = "/opt1")
- @ResponseBody
- public Object opt1(String tSystemPriceId) {
- tSystemPriceService.updateState(tSystemPriceId);
- return SUCCESS_TIP;
- }
-
- /**
- * 小件物流价格设置
- */
- @RequestMapping(value = "/smallSubmit")
- @ResponseBody
- public Object smallSubmit(Integer type, Integer tcId, String json2,String json1,Integer openCityId) {
- Object num1 = JSON.parseObject(json2).get("num1");
- Object num2 = JSON.parseObject(json2).get("num2");
- Object num3 = JSON.parseObject(json2).get("num3");
- Object num4 = JSON.parseObject(json2).get("num4");
-// Object num5 = JSON.parseObject(json2).get("num5");
-// Object num6 = JSON.parseObject(json2).get("num6");
-// Object num7 = JSON.parseObject(json2).get("num7");
-// Object num8 = JSON.parseObject(json2).get("num8");
-// Object num9 = JSON.parseObject(json2).get("num9");
-// Object num10 = JSON.parseObject(json2).get("num10");
-// Object num11 = JSON.parseObject(json2).get("num11");
-
- String a ="{\"num1\":\""+num1+"\",\"num2\":\""+num2+"\",\"num3\":\""+num3+"\"}";
- String randomNumber = ToolUtil.getRandomNumber(11);
- tSystemPriceService.saveService(type, openCityId,1, a,randomNumber,1,"123");
- String b ="{\"num1\":\""+num4+"\"}";
- tSystemPriceService.saveService(type, openCityId,2, b,randomNumber,1,"123");
- tSystemPriceService.saveService(type, openCityId,7, json1,randomNumber,1,"123");
- return SUCCESS_TIP;
- }
- @RequestMapping(value = "/smallCheckSubmit")
- @ResponseBody
- public Object smallCheckSubmit(String id, Integer check) {
- tSystemPriceService.updateCheck(id,check);
- return SUCCESS_TIP;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 7f63b3a..98c888d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -2,12 +2,6 @@
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.model.Company;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.DriverClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.activity.model.CompanyQueryStateAndFlgReq;
-import com.dsh.course.feignClient.activity.model.UpdateCompanyDriverReq;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.config.properties.GunsProperties;
@@ -40,11 +34,13 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import javax.naming.NoPermissionException;
import javax.validation.Valid;
import java.io.File;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
/**
* 系统管理员控制器
@@ -64,14 +60,9 @@
@Autowired
private IUserService userService;
- @Resource
- private DriverClient itDriverService;
-
@Autowired
private IRoleService roleService;
- @Resource
- private CompanyClient itCompanyService;
/**
@@ -231,10 +222,6 @@
User objectUser = UserFactory.createUser(user);
//查找平台所属公司
//Search for the company that owns the platform.
- Company company = itCompanyService.getCompanyByTypeAndFlag(new CompanyQueryStateAndFlgReq(1,3));
- if (SinataUtil.isNotEmpty(company)){
- objectUser.setObjectId(company.getId());
- }
objectUser.setPassWordUpdate(new Date());
this.userService.save(objectUser);
@@ -350,25 +337,8 @@
User user = userService.getById(userId);
if (user.getRoleType() == 2){
- //查询分公司 Query branch office
- CompanyInfoRes company = itCompanyService.queryById(user.getObjectId());
- company.setState(1);
- itCompanyService.updateCompany(company);
-
- //设置该分公司下的所有司机状态
- //Set the status of all drivers under this branch
- itDriverService.updateCompanyDriverState(new UpdateCompanyDriverReq(3,company.getId()));
}else if (user.getRoleType() == 3){
- //查询加盟商
- //Search for franchisees
- CompanyInfoRes franchisee = itCompanyService.queryById(user.getObjectId());
- franchisee.setState(1);
- itCompanyService.updateCompany(franchisee);
-
- //设置该加盟商下的所有司机状态
- //Set the status of all drivers under this franchisee
- itDriverService.updateFranchiseeDriverState(new UpdateCompanyDriverReq(3,franchisee.getId()));
}
return SUCCESS_TIP;
}
@@ -389,26 +359,8 @@
User user = userService.getById(userId);
if (user.getRoleType() == 2){
- //查询分公司
- //Query branch office
- CompanyInfoRes company = itCompanyService.queryById(user.getObjectId());
- company.setState(0);
- itCompanyService.updateCompany(company);
-
- //设置该分公司下的所有司机状态
- ////Set the status of all drivers under this branch
- itDriverService.updateCompanyDriverState(new UpdateCompanyDriverReq(2,company.getId()));
}else if (user.getRoleType() == 3){
- //查询加盟商
- ////Search for franchisees
- CompanyInfoRes franchisee = itCompanyService.queryById(user.getObjectId());
- franchisee.setState(0);
- itCompanyService.updateCompany(franchisee);
-
- //设置该加盟商下的所有司机状态
- //Set the status of all drivers under this branch
- itDriverService.updateFranchiseeDriverState(new UpdateCompanyDriverReq(2,franchisee.getId()));
}
return SUCCESS_TIP;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CarInsurance.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CarInsurance.java
deleted file mode 100644
index d0f0211..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CarInsurance.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 车辆保险
- */
-@TableName("t_car_insurance")
-public class CarInsurance {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 保险公司名称
- */
- @TableField("insurCom")
- private String insurCom;
- /**
- * 保险号
- */
- @TableField("insurNum")
- private String insurNum;
- /**
- * 保险类型
- */
- @TableField("insurType")
- private String insurType;
- /**
- * 保险金额
- */
- @TableField("insurCount")
- private Double insurCount;
- /**
- * 保险生效日期
- */
- @TableField("insurEff")
- private Date insurEff;
- /**
- * 保险到期日期
- */
- @TableField("insurExp")
- private Date insurExp;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public String getInsurCom() {
- return insurCom;
- }
-
- public void setInsurCom(String insurCom) {
- this.insurCom = insurCom;
- }
-
- public String getInsurNum() {
- return insurNum;
- }
-
- public void setInsurNum(String insurNum) {
- this.insurNum = insurNum;
- }
-
- public String getInsurType() {
- return insurType;
- }
-
- public void setInsurType(String insurType) {
- this.insurType = insurType;
- }
-
- public Double getInsurCount() {
- return insurCount;
- }
-
- public void setInsurCount(Double insurCount) {
- this.insurCount = insurCount;
- }
-
- public Date getInsurEff() {
- return insurEff;
- }
-
- public void setInsurEff(Date insurEff) {
- this.insurEff = insurEff;
- }
-
- public Date getInsurExp() {
- return insurExp;
- }
-
- public void setInsurExp(Date insurExp) {
- this.insurExp = insurExp;
- }
-
- @Override
- public String toString() {
- return "CarInsurance{" +
- "id=" + id +
- ", carId=" + carId +
- ", insurCom='" + insurCom + '\'' +
- ", insurNum='" + insurNum + '\'' +
- ", insurType='" + insurType + '\'' +
- ", insurCount=" + insurCount +
- ", insurEff=" + insurEff +
- ", insurExp=" + insurExp +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java
deleted file mode 100644
index 5b5f891..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 部门表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_dept")
-public class Dept extends Model<Dept> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 排序
- */
- private Integer num;
- /**
- * 父部门id
- */
- private Integer pid;
- /**
- * 父级ids
- */
- private String pids;
- /**
- * 简称
- */
- private String simplename;
- /**
- * 全称
- */
- private String fullname;
- /**
- * 提示
- */
- private String tips;
- /**
- * 版本（乐观锁保留字段）
- */
- private Integer version;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- public String getPids() {
- return pids;
- }
-
- public void setPids(String pids) {
- this.pids = pids;
- }
-
- public String getSimplename() {
- return simplename;
- }
-
- public void setSimplename(String simplename) {
- this.simplename = simplename;
- }
-
- public String getFullname() {
- return fullname;
- }
-
- public void setFullname(String fullname) {
- this.fullname = fullname;
- }
-
- public String getTips() {
- return tips;
- }
-
- public void setTips(String tips) {
- this.tips = tips;
- }
-
- public Integer getVersion() {
- return version;
- }
-
- public void setVersion(Integer version) {
- this.version = version;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "Dept{" +
- "id=" + id +
- ", num=" + num +
- ", pid=" + pid +
- ", pids=" + pids +
- ", simplename=" + simplename +
- ", fullname=" + fullname +
- ", tips=" + tips +
- ", version=" + version +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dict.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dict.java
deleted file mode 100644
index 49c48c7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dict.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_dict")
-public class Dict extends Model<Dict> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 排序
- */
- private Integer num;
- /**
- * 父级字典
- */
- private Integer pid;
- /**
- * 名称
- */
- private String name;
-
- /**
- * 编码
- */
- private String code;
- /**
- * 提示
- */
- private String tips;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTips() {
- return tips;
- }
-
- public void setTips(String tips) {
- this.tips = tips;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "Dict{" +
- "id=" + id +
- ", num=" + num +
- ", pid=" + pid +
- ", name='" + name + '\'' +
- ", code='" + code + '\'' +
- ", tips='" + tips + '\'' +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Driver.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Driver.java
deleted file mode 100644
index 3d2db2d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Driver.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dsh.course.entity.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 司机
- */
-@Data
-@TableName("t_driver")
-public class Driver extends BaseBean {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 账号
- */
- @TableField("account")
- private String account;
- /**
- * 工号
- */
- @TableField("jobNumber")
- private String jobNumber;
- /**
- * 电话
- */
- @TableField("phone")
- private String phone;
- /**
- * 登录密码
- */
- @TableField("password")
- private String password;
- /**
- * 提现密码
- */
- @TableField("withdrawPassword")
- private String withdrawPassword;
- /**
- * 姓名
- */
- @TableField("name")
- private String name;
- /**
- * 性别（1=男，2=女）1:man 2:woman
- */
- @TableField("sex")
- private Integer sex;
- /**
- * 身份证号码
- */
- @TableField("idCard")
- private String idCard;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 加盟商id
- */
- @TableField("franchiseeId")
- private Integer franchiseeId;
- /**
- * 头像图片
- */
- @TableField("headImgUrl")
- private String headImgUrl;
- /**
- * 人脸识别照片
- */
- @TableField("faceImgUrl")
- private String faceImgUrl;
- /**
- * 身份证正面照片
- */
- @TableField("idCardImgUrl1")
- private String idCardImgUrl1;
- /**
- * 身份证背面照片
- */
- @TableField("idCardImgUrl2")
- private String idCardImgUrl2;
- /**
- * 网约车注册地
- */
- @TableField("placeOfEmployment")
- private String placeOfEmployment;
- /**
- * 生日
- */
- @TableField("birthday")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date birthday;
- /**
- * 银行卡号
- */
- @TableField("bankCardNumber")
- private String bankCardNumber;
- /**
- * 国籍
- */
- @TableField("driverNationality")
- private String driverNationality;
- /**
- * 民族
- */
- @TableField("driverNation")
- private String driverNation;
- /**
- * 婚姻状况（1：未婚，2：已婚，3：离异）1:unmarried 2:married 3:devorce
- */
- @TableField("driverMaritalStatus")
- private Integer driverMaritalStatus;
- /**
- * 外语能力
- */
- @TableField("driverLanguageLevel")
- private String driverLanguageLevel;
- /**
- * 学历
- */
- @TableField("driverEducation")
- private String driverEducation;
- /**
- * 户口登记机关名称
- */
- @TableField("driverCensus")
- private String driverCensus;
- /**
- * 户口地址或常住地址
- */
- @TableField("driverAddress")
- private String driverAddress;
- /**
- * 通信地址
- */
- @TableField("driverContactAddress")
- private String driverContactAddress;
- /**
- * 通信地址（带分隔符）
- */
- @TableField("driverContactAddress_")
- private String driverContactAddress_;
- /**
- * 驾龄
- */
- @TableField("driverAge")
- private Integer driverAge;
- /**
- * 驾驶证号码
- */
- @TableField("driveCard")
- private String driveCard;
- /**
- * 驾驶证照片
- */
- @TableField("driveCardImgUrl")
- private String driveCardImgUrl;
- /**
- * 准驾车型
- */
- @TableField("driverType")
- private String driverType;
- /**
- * 初次领取驾驶证日期
- */
- @TableField("getDriverLicenseDate")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date getDriverLicenseDate;
- /**
- * 驾驶证有效期限起
- */
- @TableField("driverLicenseOn")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date driverLicenseOn;
- /**
- * 驾驶证有效期限止
- */
- @TableField("driverLicenseOff")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date driverLicenseOff;
- /**
- * 是否巡游出租车驾驶员（0：否，1：是）0:N 1:Y
- */
- @TableField("taxiDriver")
- private Integer taxiDriver;
- /**
- * 出租车资格证号
- */
- @TableField("taxiAptitudeCard")
- private String taxiAptitudeCard;
- /**
- * 网约车资格证照片
- */
- @TableField("networkCarlssueImg")
- private String networkCarlssueImg;
- /**
- * 网络预约出租车驾驶员证发证机构
- */
- @TableField("networkCarlssueOrganization")
- private String networkCarlssueOrganization;
- /**
- * 资格证发证日期
- */
- @TableField("networkCarlssueDate")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarlssueDate;
- /**
- * 初次认领资格证日期
- */
- @TableField("getNetworkCarProofDate")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date getNetworkCarProofDate;
- /**
- * 资格证有效起始日期
- */
- @TableField("networkCarProofOn")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarProofOn;
- /**
- * 资格证有效截至日期
- */
- @TableField("networkCarProofOff")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date networkCarProofOff;
- /**
- * 报备日期
- */
- @TableField("registerDate")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date registerDate;
- /**
- * 是否专职驾驶员（0：否，1：是）0:N 1:Y
- */
- @TableField("fullTimeDriver")
- private Integer fullTimeDriver;
- /**
- * 是否在驾驶员黑名单内（0：否，1：是）0:N 1:Y
- */
- @TableField("inDriverBlacklist")
- private Integer inDriverBlacklist;
- /**
- * 服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
- * Service types (1: Online reserved taxi, 2: Regular taxi, 3: Private carpooling).
- */
- @TableField("commercialType")
- private Integer commercialType;
- /**
- * 驾驶员合同签署公司
- */
- @TableField("contractCompany")
- private String contractCompany;
- /**
- * 合同有效期起
- */
- @TableField("contractOn")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date contractOn;
- /**
- * 合同有效期止
- */
- @TableField("contractOff")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date contractOff;
- /**
- * 紧急联系人
- */
- @TableField("emergencyContact")
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- @TableField("emergencyContactPhone")
- private String emergencyContactPhone;
- /**
- * 紧急联系地址
- */
- @TableField("emergencyContactAddress")
- private String emergencyContactAddress;
- /**
- * 从业地（带分隔符）
- */
- @TableField("placeOfPractice")
- private String placeOfPractice;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- @TableField("isPlatCar")
- private Integer isPlatCar;
- /**
- * 司机管理车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 审核状态(1=待审核，2=正常，3=冻结，4=拒绝)
- * 1=Pending review, 2=Normal, 3=Frozen, 4=Rejected
- */
- @TableField("authState")
- private Integer authState;
- /**
- * 司机状态(1=离线，2=空闲，3=服务中) 1:outline ,2:leisure 3:in service
- */
- @TableField("state")
- private Integer state;
- /**
- * 添加方式（1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加）
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- * @return
- */
- @TableField("addType")
- private Integer addType;
- /**
- * 账户余额
- * @return
- */
- @TableField("balance")
- private Double balance;
- /**
- * 活动总收入
- * @return
- */
- @TableField("activityMoney")
- private Double activityMoney;
- /**
- * 剩余未提现活动总收入
- * @return
- */
- @TableField("laveActivityMoney")
- private Double laveActivityMoney;
- /**
- * 业务总收入
- * @return
- */
- @TableField("businessMoney")
- private Double businessMoney;
- /**
- * 剩余未提现业务总收入
- * @return
- */
- @TableField("laveBusinessMoney")
- private Double laveBusinessMoney;
- /**
- * 小程序openid
- */
- @TableField("appletsOpenId")
- private String appletsOpenId;
- /**
- * 代扣金额
- */
- @TableField("withholding")
- private BigDecimal withholding;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivity.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivity.java
deleted file mode 100644
index 2590ba1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivity.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 司机活动主表
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_driver_activity")
-public class DriverActivity extends Model<DriverActivity> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 活动名称
- */
- private String name;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 状态(1=待审核，2=驳回，3=通过)
- */
- private Integer status;
- /**
- * 备注
- */
- private String remark;
- /**
- * 有效期开始时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
- /**
- * 有效期结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
-
- private Integer companyType;
-
- public Integer getCompanyType() {
- return companyType;
- }
-
- public void setCompanyType(Integer companyType) {
- this.companyType = companyType;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "DriverActivity{" +
- "id=" + id +
- ", name=" + name +
- ", companyId=" + companyId +
- ", insertTime=" + insertTime +
- ", status=" + status +
- ", remark=" + remark +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityHistory.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityHistory.java
deleted file mode 100644
index 41ed0b6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityHistory.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 司机完成活动记录
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_driver_activity_history")
-public class DriverActivityHistory extends Model<DriverActivityHistory> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 活动日期
- */
- private Date day;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 活动类型（1=邀请司机注册，2=邀请用户注册，3=累计在线，4=订单量）
- */
- private Integer type;
- /**
- * 活动id
- */
- private Integer activityId;
- /**
- * 是否完成（1=未完成，2=已完成）
- */
- private Integer carryOut;
- /**
- * 奖励金额
- */
- private Double money;
- //领取时间
- private Date collectionTime;
- /**
- * 添加时间
- */
- private Date insertTime;
-
- private String content;
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getDay() {
- return day;
- }
-
- public void setDay(Date day) {
- this.day = day;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getActivityId() {
- return activityId;
- }
-
- public void setActivityId(Integer activityId) {
- this.activityId = activityId;
- }
-
- public Integer getCarryOut() {
- return carryOut;
- }
-
- public void setCarryOut(Integer carryOut) {
- this.carryOut = carryOut;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getCollectionTime() {
- return collectionTime;
- }
-
- public void setCollectionTime(Date collectionTime) {
- this.collectionTime = collectionTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "DriverActivityHistory{" +
- "id=" + id +
- ", day=" + day +
- ", driverId=" + driverId +
- ", type=" + type +
- ", activityId=" + activityId +
- ", carryOut=" + carryOut +
- ", money=" + money +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOnline.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOnline.java
deleted file mode 100644
index 5d4a73b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOnline.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 司机活动-在线
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_driver_activity_online")
-public class DriverActivityOnline extends Model<DriverActivityOnline> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 司机活动id
- */
- private Integer driverActivityId;
- /**
- * 1=专车
- * 1:specail car
- */
- private Integer type;
- /**
- * 在线小时
- */
- private Integer online;
- /**
- * 奖励金额
- */
- private Double money;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 添加时间
- */
- private Date insertTime;
-
- private String content;
-
- public Integer getId() {
- return id;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getDriverActivityId() {
- return driverActivityId;
- }
-
- public void setDriverActivityId(Integer driverActivityId) {
- this.driverActivityId = driverActivityId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getOnline() {
- return online;
- }
-
- public void setOnline(Integer online) {
- this.online = online;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "DriverActivityOnline{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", driverActivityId=" + driverActivityId +
- ", type=" + type +
- ", online=" + online +
- ", money=" + money +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOrder.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOrder.java
deleted file mode 100644
index 5066ba7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityOrder.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 司机活动-订单
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_driver_activity_order")
-public class DriverActivityOrder extends Model<DriverActivityOrder> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 司机活动id
- */
- private Integer driverActivityId;
- /**
- * 每天开始时间（08:00）
- */
- private String start;
- /**
- * 每天结束时间（17:00）
- */
- private String end;
- /**
- * 订单数量
- */
- private Integer orderNum;
- /**
- * 奖励金额
- */
- private Double money;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 添加时间
- */
- private Date insertTime;
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- private String content;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getDriverActivityId() {
- return driverActivityId;
- }
-
- public void setDriverActivityId(Integer driverActivityId) {
- this.driverActivityId = driverActivityId;
- }
-
- public String getStart() {
- return start;
- }
-
- public void setStart(String start) {
- this.start = start;
- }
-
- public String getEnd() {
- return end;
- }
-
- public void setEnd(String end) {
- this.end = end;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "DriverActivityOrder{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", driverActivityId=" + driverActivityId +
- ", start=" + start +
- ", end=" + end +
- ", orderNum=" + orderNum +
- ", money=" + money +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityRegistered.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityRegistered.java
deleted file mode 100644
index a27bcd8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivityRegistered.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 司机活动-注册
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_driver_activity_registered")
-public class DriverActivityRegistered extends Model<DriverActivityRegistered> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 司机活动主表id
- */
- private Integer driverActivityId;
- /**
- * 1=邀请司机注册奖励，2=邀请用户注册奖励
- * 1=Reward for inviting drivers to register, 2=Reward for inviting users to register
- */
- private Integer type;
- /**
- * 奖励金额
- */
- private Double money;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- private String content;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getDriverActivityId() {
- return driverActivityId;
- }
-
- public void setDriverActivityId(Integer driverActivityId) {
- this.driverActivityId = driverActivityId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "DriverActivityRegistered{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", driverActivityId=" + driverActivityId +
- ", type=" + type +
- ", money=" + money +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivitySubsidy.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivitySubsidy.java
deleted file mode 100644
index f3d3a70..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverActivitySubsidy.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverActivitySubsidy {
-
- private Integer id;
- private Integer driverActivityId;
- private Date startTime;
- private Date endTime;
- private Date insertTime;
- private String content;
- private Integer companyId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverOnline.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverOnline.java
deleted file mode 100644
index fe389bb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverOnline.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 司机在线记录
- */
-@TableName("t_driver_online")
-public class DriverOnline {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 设备（1=APP,2=车载端）
- * 1:app 2:car platfrom
- */
- @TableField("device")
- private Integer device;
- /**
- * 版本号
- */
- @TableField("version")
- private String version;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 最后在线时间
- */
- @TableField("lastTime")
- private Date lastTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getDevice() {
- return device;
- }
-
- public void setDevice(Integer device) {
- this.device = device;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getLastTime() {
- return lastTime;
- }
-
- public void setLastTime(Date lastTime) {
- this.lastTime = lastTime;
- }
-
- @Override
- public String toString() {
- return "DriverOnline{" +
- "id=" + id +
- ", driverId=" + driverId +
- ", device=" + device +
- ", insertTime=" + insertTime +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverPunish.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverPunish.java
deleted file mode 100644
index 78cc7f6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverPunish.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 司机处罚
- */
-@TableName("t_driver_punish")
-public class DriverPunish {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 处罚时间
- */
- @TableField("punishTime")
- private Date punishTime;
- /**
- * 处罚原因
- */
- @TableField("punishReason")
- private String punishReason;
- /**
- * 处罚结果
- */
- @TableField("punishReault")
- private String punishReault;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Date getPunishTime() {
- return punishTime;
- }
-
- public void setPunishTime(Date punishTime) {
- this.punishTime = punishTime;
- }
-
- public String getPunishReason() {
- return punishReason;
- }
-
- public void setPunishReason(String punishReason) {
- this.punishReason = punishReason;
- }
-
- public String getPunishReault() {
- return punishReault;
- }
-
- public void setPunishReault(String punishReault) {
- this.punishReault = punishReault;
- }
-
- @Override
- public String toString() {
- return "DriverPunish{" +
- "id=" + id +
- ", driverId=" + driverId +
- ", punishTime=" + punishTime +
- ", punishReason='" + punishReason + '\'' +
- ", punishReault='" + punishReault + '\'' +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverTrain.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverTrain.java
deleted file mode 100644
index b64e378..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverTrain.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 司机培训
- */
-@TableName("t_driver_train")
-public class DriverTrain {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 课程名称
- */
- @TableField("courseName")
- private String courseName;
- /**
- * 培训时间
- */
- @TableField("courseDate")
- private Date courseDate;
- /**
- * 开始时间
- */
- @TableField("startTime")
- private String startTime;
- /**
- * 结束时间
- */
- @TableField("stopTime")
- private String stopTime;
- /**
- * 培训时长
- */
- @TableField("duration")
- private Integer duration;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public String getCourseName() {
- return courseName;
- }
-
- public void setCourseName(String courseName) {
- this.courseName = courseName;
- }
-
- public Date getCourseDate() {
- return courseDate;
- }
-
- public void setCourseDate(Date courseDate) {
- this.courseDate = courseDate;
- }
-
- public String getStartTime() {
- return startTime;
- }
-
- public void setStartTime(String startTime) {
- this.startTime = startTime;
- }
-
- public String getStopTime() {
- return stopTime;
- }
-
- public void setStopTime(String stopTime) {
- this.stopTime = stopTime;
- }
-
- public Integer getDuration() {
- return duration;
- }
-
- public void setDuration(Integer duration) {
- this.duration = duration;
- }
-
- @Override
- public String toString() {
- return "DriverTrain{" +
- "id=" + id +
- ", driverId=" + driverId +
- ", courseName='" + courseName + '\'' +
- ", courseDate=" + courseDate +
- ", startTime='" + startTime + '\'' +
- ", stopTime='" + stopTime + '\'' +
- ", duration=" + duration +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverUpdateReq.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverUpdateReq.java
deleted file mode 100644
index 99c162a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverUpdateReq.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DriverUpdateReq {
- private Integer type;
- private Integer superiorId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverVerify.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverVerify.java
deleted file mode 100644
index 3a9f300..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/DriverVerify.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("t_driver_verify")
-public class DriverVerify {
-
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- @TableField("driverId")
- private Integer driverId;
- @TableField("newCarId")
- private String newCarId;
- @TableField("oldCarId")
- private String oldCarId;
- @TableField("createTime")
- private Date createTime;
- @TableField("state")
- private Integer state;
- @TableField("remark")
- private String remark;
-
- @TableField(exist = false)
- private String driverName;
- @TableField(exist = false)
- private String headImg;
- @TableField("source")
- private String source;
- @TableField("company")
- private String company;
- @TableField("phone")
- private String phone;
- @TableField(exist = false)
- private String sex;
- @TableField("driverNum")
- private String driverNum;
- @TableField("age")
- private Integer age;
- @TableField("IdCard")
- private String idCards;
- @TableField("carServer")
- private String carServer;
- @TableField("account")
- private String account;
- @TableField("driverNumImg")
- private String driverNumImg;
- @TableField("address")
- private String address;
- @TableField("newId")
- private Integer newId;
- @TableField("oldId")
- private Integer oldId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/GDInterface.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/GDInterface.java
deleted file mode 100644
index c1b5d3c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/GDInterface.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * 高德接口统计
- */
-@TableName("t_gdinterface")
-public class GDInterface {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 接口名称
- */
- @TableField("name")
- private String name;
- /**
- * 接口说明
- */
- @TableField("explanation")
- private String explanation;
- /**
- * 调用次数
- */
- @TableField("num")
- private Integer num;
- /**
- * 调用日期
- */
- @TableField("time")
- private String time;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getExplanation() {
- return explanation;
- }
-
- public void setExplanation(String explanation) {
- this.explanation = explanation;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- @Override
- public String toString() {
- return "GDInterface{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", explanation='" + explanation + '\'' +
- ", num=" + num +
- ", time=" + time +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Income.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Income.java
deleted file mode 100644
index b9515eb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Income.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 收入明细
- */
-@TableName("t_income")
-public class Income {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 收入方类型（1=公司，2=司机）
- */
- @TableField("userType")
- private Integer userType;
- /**
- * 收入对象id
- */
- @TableField("objectId")
- private Integer objectId;
- /**
- * 收入类型（1=活动，2=业务）
- */
- @TableField("type")
- private Integer type;
- /**
- * 收入类型id
- */
- @TableField("incomeId")
- private Integer incomeId;
- /**
- * 订单类型
- */
- @TableField("orderType")
- private Integer orderType;
- /**
- * 收入金额
- */
- @TableField("money")
- private Double money;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Integer getObjectId() {
- return objectId;
- }
-
- public void setObjectId(Integer objectId) {
- this.objectId = objectId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getIncomeId() {
- return incomeId;
- }
-
- public void setIncomeId(Integer incomeId) {
- this.incomeId = incomeId;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- @Override
- public String toString() {
- return "Income{" +
- "id=" + id +
- ", userType=" + userType +
- ", objectId=" + objectId +
- ", type=" + type +
- ", incomeId=" + incomeId +
- ", orderType=" + orderType +
- ", money=" + money +
- ", insertTime=" + insertTime +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LineShiftDriver.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LineShiftDriver.java
deleted file mode 100644
index a69fe42..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LineShiftDriver.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 司机预约排班记录
- */
-@TableName("t_line_shift_driver")
-public class LineShiftDriver {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 线路班次id
- */
- @TableField("lineShiftId")
- private Integer lineShiftId;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 预约日期
- */
- @TableField("day")
- private Date day;
- /**
- * 剩余座位数
- */
- @TableField("laveSeat")
- private Integer laveSeat;
- /**
- * 剩余座位号(多个以逗号分隔)
- */
- @TableField("laveSeatNumber")
- private String laveSeatNumber;
- /**
- * 总座位数
- */
- @TableField("totalSeat")
- private Integer totalSeat;
- /**
- * 添加时间
- */
- @TableField("inserTime")
- private Date inserTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getLineShiftId() {
- return lineShiftId;
- }
-
- public void setLineShiftId(Integer lineShiftId) {
- this.lineShiftId = lineShiftId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Date getDay() {
- return day;
- }
-
- public void setDay(Date day) {
- this.day = day;
- }
-
- public Integer getLaveSeat() {
- return laveSeat;
- }
-
- public void setLaveSeat(Integer laveSeat) {
- this.laveSeat = laveSeat;
- }
-
- public String getLaveSeatNumber() {
- return laveSeatNumber;
- }
-
- public void setLaveSeatNumber(String laveSeatNumber) {
- this.laveSeatNumber = laveSeatNumber;
- }
-
- public Integer getTotalSeat() {
- return totalSeat;
- }
-
- public void setTotalSeat(Integer totalSeat) {
- this.totalSeat = totalSeat;
- }
-
- public Date getInserTime() {
- return inserTime;
- }
-
- public void setInserTime(Date inserTime) {
- this.inserTime = inserTime;
- }
-
- @Override
- public String toString() {
- return "LineShiftDriver{" +
- "id=" + id +
- ", lineShiftId=" + lineShiftId +
- ", driverId=" + driverId +
- ", day=" + day +
- ", laveSeat=" + laveSeat +
- ", laveSeatNumber='" + laveSeatNumber + '\'' +
- ", totalSeat=" + totalSeat +
- ", inserTime=" + inserTime +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LoginLog.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LoginLog.java
deleted file mode 100644
index 5257c30..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/LoginLog.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 登录记录
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_login_log")
-public class LoginLog extends Model<LoginLog> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 日志名称
- */
- private String logname;
- /**
- * 管理员id
- */
- private Integer userid;
- /**
- * 创建时间
- */
- private Date createtime;
- /**
- * 是否执行成功
- */
- private String succeed;
- /**
- * 具体消息
- */
- private String message;
- /**
- * 登录ip
- */
- private String ip;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLogname() {
- return logname;
- }
-
- public void setLogname(String logname) {
- this.logname = logname;
- }
-
- public Integer getUserid() {
- return userid;
- }
-
- public void setUserid(Integer userid) {
- this.userid = userid;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public String getSucceed() {
- return succeed;
- }
-
- public void setSucceed(String succeed) {
- this.succeed = succeed;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "LoginLog{" +
- "id=" + id +
- ", logname=" + logname +
- ", userid=" + userid +
- ", createtime=" + createtime +
- ", succeed=" + succeed +
- ", message=" + message +
- ", ip=" + ip +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Menu.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Menu.java
deleted file mode 100644
index 96b1e93..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Menu.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import org.hibernate.validator.constraints.NotBlank;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 菜单表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_menu")
-public class Menu extends Model<Menu> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
- /**
- * 菜单编号
- */
- private String code;
- /**
- * 菜单父编号
- */
- private String pcode;
- /**
- * 当前菜单的所有父菜单编号
- */
- private String pcodes;
- /**
- * 菜单名称
- */
- @NotBlank
- private String name;
- /**
- * 菜单图标
- */
- private String icon;
- /**
- * url地址
- */
- @NotBlank
- private String url;
- /**
- * 菜单排序号
- */
- private Integer num;
- /**
- * 菜单层级
- */
- private Integer levels;
- /**
- * 是否是菜单（1：是 0：不是）
- */
- private Integer ismenu;
- /**
- * 备注
- */
- private String tips;
- /**
- * 菜单状态 : 1:启用 0:不启用
- */
- private Integer status;
- /**
- * 是否打开: 1:打开 0:不打开
- */
- private Integer isopen;
-
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getPcode() {
- return pcode;
- }
-
- public void setPcode(String pcode) {
- this.pcode = pcode;
- }
-
- public String getPcodes() {
- return pcodes;
- }
-
- public void setPcodes(String pcodes) {
- this.pcodes = pcodes;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getLevels() {
- return levels;
- }
-
- public void setLevels(Integer levels) {
- this.levels = levels;
- }
-
- public Integer getIsmenu() {
- return ismenu;
- }
-
- public void setIsmenu(Integer ismenu) {
- this.ismenu = ismenu;
- }
-
- public String getTips() {
- return tips;
- }
-
- public void setTips(String tips) {
- this.tips = tips;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public Integer getIsopen() {
- return isopen;
- }
-
- public void setIsopen(Integer isopen) {
- this.isopen = isopen;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "Menu{" +
- "id=" + id +
- ", code=" + code +
- ", pcode=" + pcode +
- ", pcodes=" + pcodes +
- ", name=" + name +
- ", icon=" + icon +
- ", url=" + url +
- ", num=" + num +
- ", levels=" + levels +
- ", ismenu=" + ismenu +
- ", tips=" + tips +
- ", status=" + status +
- ", isopen=" + isopen +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Notice.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Notice.java
deleted file mode 100644
index fc1b56a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Notice.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 通知表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_notice")
-public class Notice extends Model<Notice> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 标题
- */
- private String title;
- /**
- * 类型
- */
- private Integer type;
- /**
- * 内容
- */
- private String content;
- /**
- * 创建时间
- */
- private Date createtime;
- /**
- * 创建人
- */
- private Integer creater;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public Integer getCreater() {
- return creater;
- }
-
- public void setCreater(Integer creater) {
- this.creater = creater;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "Notice{" +
- "id=" + id +
- ", title=" + title +
- ", type=" + type +
- ", content=" + content +
- ", createtime=" + createtime +
- ", creater=" + creater +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperationLog.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperationLog.java
deleted file mode 100644
index 88cdcca..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OperationLog.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 操作日志
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_operation_log")
-public class OperationLog extends Model<OperationLog> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 日志类型
- */
- @TableField("logtype")
- private String logtype;
- /**
- * 日志名称
- */
- @TableField("logname")
- private String logname;
- /**
- * 用户id
- */
- @TableField("userid")
- private Integer userid;
- /**
- * 类名称
- */
- @TableField("classname")
- private String classname;
- /**
- * 方法名称
- */
- @TableField("method")
- private String method;
- /**
- * 创建时间
- */
- @TableField("createtime")
- private Date createtime;
- /**
- * 是否成功
- */
- @TableField("succeed")
- private String succeed;
- /**
- * 备注
- */
- @TableField("message")
- private String message;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLogtype() {
- return logtype;
- }
-
- public void setLogtype(String logtype) {
- this.logtype = logtype;
- }
-
- public String getLogname() {
- return logname;
- }
-
- public void setLogname(String logname) {
- this.logname = logname;
- }
-
- public Integer getUserid() {
- return userid;
- }
-
- public void setUserid(Integer userid) {
- this.userid = userid;
- }
-
- public String getClassname() {
- return classname;
- }
-
- public void setClassname(String classname) {
- this.classname = classname;
- }
-
- public String getMethod() {
- return method;
- }
-
- public void setMethod(String method) {
- this.method = method;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public String getSucceed() {
- return succeed;
- }
-
- public void setSucceed(String succeed) {
- this.succeed = succeed;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "OperationLog{" +
- "id=" + id +
- ", logtype=" + logtype +
- ", logname=" + logname +
- ", userid=" + userid +
- ", classname=" + classname +
- ", method=" + method +
- ", createtime=" + createtime +
- ", succeed=" + succeed +
- ", message=" + message +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderCancel.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderCancel.java
deleted file mode 100644
index 063eefa..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderCancel.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 取消订单
- */
-@TableName("t_order_cancel")
-public class OrderCancel {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 订单id
- */
- @TableField("orderId")
- private Long orderId;
- /**
- * 订单类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- @TableField("orderType")
- private Integer orderType;
- /**
- * 取消原因
- */
- @TableField("reason")
- private String reason;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 支付方式(1=微信，2=支付宝，3=余额)
- * 1:wechat 2:alipay 3:balance
- */
- @TableField("payType")
- private Integer payType;
- /**
- * 支付金额
- */
- @TableField("money")
- private Double money;
- /**
- * 状态(1=临时，2=正式)
- * 1=Temporary, 2=Formal
- */
- @TableField("state")
- private Integer state;
- /**
- * 添加时间
- * @return
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 取消人员类型（1=用户，2=后台）
- * @return
- */
- @TableField("userType")
- private Integer userType;
- /**
- * 操作人员id
- * @return
- */
- @TableField("userId")
- private Integer userId;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- @Override
- public String toString() {
- return "OrderCancel{" +
- "id=" + id +
- ", orderId=" + orderId +
- ", orderType=" + orderType +
- ", reason='" + reason + '\'' +
- ", remark='" + remark + '\'' +
- ", payType=" + payType +
- ", money=" + money +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", userType=" + userType +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderLogistics.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderLogistics.java
deleted file mode 100644
index 68651ff..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/OrderLogistics.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 小件物流订单
- */
-@Data
-@TableName("t_order_logistics")
-public class OrderLogistics {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 订单类型（4=同城物流，5=跨城物流）
- */
- @TableField("type")
- private Integer type;
- /**
- * 用户id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 司机id
- */
- @TableField("driverId")
- private Integer driverId;
- /**
- * 车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 订单号
- */
- @TableField("orderNum")
- private String orderNum;
- /**
- * 货物名称
- */
- @TableField("cargoName")
- private String cargoName;
- /**
- * 是否加急（1=否，2=是）1:N,2:Y
- */
- @TableField("urgent")
- private Integer urgent;
- /**
- * 货物数量
- */
- @TableField("cargoNumber")
- private Integer cargoNumber;
- /**
- * 备注信息
- */
- @TableField("remark")
- private String remark;
- /**
- * 下单地点经度
- */
- @TableField("placementLon")
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- @TableField("placementLat")
- private Double placementLat;
- /**
- * 下单地点
- */
- @TableField("placementAddress")
- private String placementAddress;
- /**
- * 起点经度
- */
- @TableField("startLon")
- private Double startLon;
- /**
- * 起点纬度
- */
- @TableField("startLat")
- private Double startLat;
- /**
- * 起点
- */
- @TableField("startAddress")
- private String startAddress;
- /**
- * 目的地经度
- */
- @TableField("endLon")
- private Double endLon;
- /**
- * 目的地纬度
- */
- @TableField("endLat")
- private Double endLat;
- /**
- * 目的地
- */
- @TableField("endAddress")
- private String endAddress;
- /**
- * 收件人姓名
- */
- @TableField("recipient")
- private String recipient;
- /**
- * 收件人电话
- */
- @TableField("recipientPhone")
- private String recipientPhone;
- /**
- * 上车点经度
- */
- @TableField("boardingLon")
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- @TableField("boardingLat")
- private Double boardingLat;
- /**
- * 上车地点
- */
- @TableField("boardingAddress")
- private String boardingAddress;
- /**
- * 上车时间
- */
- @TableField("boardingTime")
- private Date boardingTime;
- /**
- * 下车点经度
- */
- @TableField("getoffLon")
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- @TableField("getoffLat")
- private Double getoffLat;
- /**
- * 下车点
- */
- @TableField("getoffAddress")
- private String getoffAddress;
- /**
- * 下车时间
- */
- @TableField("getoffTime")
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- @TableField("mileage")
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- */
- @TableField("payManner")
- private Integer payManner;
- /**
- * 支付方式（1=微信，2=支付宝，3=余额）
- * 1:wechat 2:alipay 3:balance
- */
- @TableField("payType")
- private Integer payType;
- /**
- * 订单金额
- */
- @TableField("orderMoney")
- private Double orderMoney;
- /**
- * 行程费
- */
- @TableField("travelMoney")
- private Double travelMoney;
- /**
- * 小费
- */
- @TableField("tipMoney")
- private Double tipMoney;
- /**
- * 红包抵扣金额
- */
- @TableField("redPacketMoney")
- private Double redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- @TableField("couponMoney")
- private Double couponMoney;
- /**
- * 红包id
- */
- @TableField("redPacketId")
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- @TableField("couponId")
- private Integer couponId;
- /**
- * 折扣
- */
- @TableField("discount")
- private Double discount;
- /**
- * 折扣优惠金额
- */
- @TableField("discountMoney")
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- @TableField("activityId")
- private Integer activityId;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 支付金额
- */
- @TableField("payMoney")
- private Double payMoney;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- @TableField("state")
- private Integer state;
- /**
- * 下单时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 预约取货时间
- */
- @TableField("travelTime")
- private Date travelTime;
- /**
- * 抢单时间
- */
- @TableField("snatchOrderTime")
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- @TableField("setOutTime")
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- @TableField("arriveTime")
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- @TableField("startServiceTime")
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- @TableField("endServiceTime")
- private Date endServiceTime;
- /**
- * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)
- */
- @TableField("orderSource")
- private Integer orderSource;
- /**
- * 发票id
- */
- @TableField("invoiceId")
- private Integer invoiceId;
- /**
- * 高德猎鹰轨迹id
- * @return
- */
- @TableField("trackId")
- private String trackId;
- /**
- * 是否删除（1=否，2=是）1:N,2:Y
- */
- @TableField("isDelete")
- private Integer isDelete;
- /**
- * 移动小号
- * @return
- */
- @TableField("telX")
- private String telX;
- /**
- * 绑定小号关系id
- * @return
- */
- @TableField("bindId")
- private String bindId;
- /**
- * 取件码
- * @return
- */
- @TableField("pickUpCode")
- private String pickUpCode;
- /**
- * 是否是改派单（1=否，=是）
- * @return
- */
- @TableField("isReassign")
- private Integer isReassign;
- /**
- * 改派通知标识（0=没有改派，1=改派中，2=已改派）用于通知前端获取新司机数据
- * The reassignment notification flag (0=no reassignment, 1=reassignment in progress, 2=reassignment completed) is used to notify the frontend to fetch new driver data.
- */
- @TableField("reassignNotice")
- private Integer reassignNotice;
- /**
- * 抢单状态（1=正常抢单，2=订单大厅）
- * 1:normal 2:grab hall
- */
- @TableField("orderHall")
- private Integer orderHall;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/PaymentRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/PaymentRecord.java
deleted file mode 100644
index e47e440..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/PaymentRecord.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 第三方支付记录
- */
-@TableName("t_payment_record")
-public class PaymentRecord {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 支付类别（1=订单相关支付，2=其他支付）
- * 1=Payment related to orders, 2=Other payments
- * 1:order
- */
- @TableField("category")
- private Integer category;
- /**
- * 用户id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 用户类型（1=用户，2=司机）
- * 1:user 2:driver
- */
- @TableField("type")
- private Integer type;
- /**
- * 订单id
- */
- @TableField("orderId")
- private Long orderId;
- /**
- * 订单类型
- */
- @TableField("orderType")
- private Integer orderType;
- /**
- * 支付方式（1=微信，2=支付宝）
- * 1:wechat 2:alipay
- */
- @TableField("payType")
- private Integer payType;
- /**
- * 支付金额
- */
- @TableField("amount")
- private Double amount;
- /**
- * 第三方支付订单号
- */
- @TableField("code")
- private String code;
- /**
- * 支付状态（1=未支付，2=已支付）
- * 1=Unpaid, 2=Paid
- */
- @TableField("state")
- private Integer state;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCategory() {
- return category;
- }
-
- public void setCategory(Integer category) {
- this.category = category;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public Double getAmount() {
- return amount;
- }
-
- public void setAmount(Double amount) {
- this.amount = amount;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- public String toString() {
- return "PaymentRecord{" +
- "id=" + id +
- ", category=" + category +
- ", userId=" + userId +
- ", type=" + type +
- ", orderId=" + orderId +
- ", orderType=" + orderType +
- ", payType=" + payType +
- ", amount=" + amount +
- ", code='" + code + '\'' +
- ", state=" + state +
- ", insertTime=" + insertTime +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Region.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Region.java
deleted file mode 100644
index abbed2c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Region.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 省市区三级联动
- * </p>
- *
- * @author 吕雪
- * @since 2019-12-30
- */
-@TableName("region")
-public class Region extends Model<Region> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 城市名称
- */
- private String name;
- private String code;
- private String citycode;
- /**
- * 父级ID
- */
- @TableField("parent_id")
- private Integer parentId;
- /**
- * 英文名称
- */
- private String english;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getCitycode() {
- return citycode;
- }
-
- public void setCitycode(String citycode) {
- this.citycode = citycode;
- }
-
- public Integer getParentId() {
- return parentId;
- }
-
- public void setParentId(Integer parentId) {
- this.parentId = parentId;
- }
-
- public String getEnglish() {
- return english;
- }
-
- public void setEnglish(String english) {
- this.english = english;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "Region{" +
- "id=" + id +
- ", name=" + name +
- ", code=" + code +
- ", citycode=" + citycode +
- ", parentId=" + parentId +
- ", english=" + english +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Relation.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Relation.java
deleted file mode 100644
index d3e5d68..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Relation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色和菜单关联表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_relation")
-public class Relation extends Model<Relation> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 菜单id
- */
- private Long menuid;
- /**
- * 角色id
- */
- private Integer roleid;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Long getMenuid() {
- return menuid;
- }
-
- public void setMenuid(Long menuid) {
- this.menuid = menuid;
- }
-
- public Integer getRoleid() {
- return roleid;
- }
-
- public void setRoleid(Integer roleid) {
- this.roleid = roleid;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "Relation{" +
- "id=" + id +
- ", menuid=" + menuid +
- ", roleid=" + roleid +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java
deleted file mode 100644
index 1486fc6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_role")
-public class Role extends Model<Role> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 序号
- */
- private Integer num;
- /**
- * 父角色id
- */
- private Integer pid;
- /**
- * 角色名称
- */
- private String name;
- /**
- * 部门名称
- */
- private Integer deptid;
- /**
- * 提示
- */
- private String tips;
- /**
- * 保留字段(暂时没用）
- */
- private Integer version;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getDeptid() {
- return deptid;
- }
-
- public void setDeptid(Integer deptid) {
- this.deptid = deptid;
- }
-
- public String getTips() {
- return tips;
- }
-
- public void setTips(String tips) {
- this.tips = tips;
- }
-
- public Integer getVersion() {
- return version;
- }
-
- public void setVersion(Integer version) {
- this.version = version;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "Role{" +
- "id=" + id +
- ", num=" + num +
- ", pid=" + pid +
- ", name=" + name +
- ", deptid=" + deptid +
- ", tips=" + tips +
- ", version=" + version +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponActivity.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponActivity.java
deleted file mode 100644
index 542f749..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponActivity.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 系统设置-优惠券活动
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_sys_coupon_activity")
-public class SysCouponActivity extends Model<SysCouponActivity> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 金额
- */
- @TableField("money")
- private BigDecimal money;
- /**
- * 满减金额
- */
- @TableField("fullMoney")
- private BigDecimal fullMoney;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 优惠券使用类型(0=通用，1=专车，4=小件物流)
- * 1:comment 4:small-scale express
- */
- @TableField("couponUseType")
- private Integer couponUseType;
- /**
- * 优惠券类型(1=抵扣，2=满减)
- * 1:discount 2:full reduction
- */
- @TableField("couponType")
- private Integer couponType;
- /**
- * 活动名称
- */
- @TableField("name")
- private String name;
- /**
- * 有效天数
- */
- @TableField("effective")
- private Integer effective;
- /**
- * 1=平台 2=分公司 3=加盟商
- * 1=Platform 2=Branch office 3=Franchisee
- */
- @TableField("companyType")
- private Integer companyType;
- /**
- * 状态(1=待审核，2=驳回，3=通过)
- * 1:review 2:reject 3:pass
- */
- @TableField("status")
- private Integer status;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 发送类型(1=全部用户，2=部分)
- * 1:all 2:portion
- */
- @TableField("sendType")
- private Integer sendType;
- /**
- * 发送用户id
- */
- @TableField("sendUserId")
- private String sendUserId;
- /**
- * 张数
- */
- @TableField("number")
- private Integer number;
- /**
- * 领取人数
- */
- @TableField("sendUserNum")
- private Integer sendUserNum;
- @TableField("couponId")
- private Integer couponId;
- @TableField("allNum")
- private Integer allNum;
-
- public Integer getAllNum() {
- return allNum;
- }
-
- public void setAllNum(Integer allNum) {
- this.allNum = allNum;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Integer getSendUserNum() {
- return sendUserNum;
- }
-
- public void setSendUserNum(Integer sendUserNum) {
- this.sendUserNum = sendUserNum;
- }
-
- public Integer getNumber() {
- return number;
- }
-
- public void setNumber(Integer number) {
- this.number = number;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public BigDecimal getFullMoney() {
- return fullMoney;
- }
-
- public void setFullMoney(BigDecimal fullMoney) {
- this.fullMoney = fullMoney;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getCouponUseType() {
- return couponUseType;
- }
-
- public void setCouponUseType(Integer couponUseType) {
- this.couponUseType = couponUseType;
- }
-
- public Integer getCouponType() {
- return couponType;
- }
-
- public void setCouponType(Integer couponType) {
- this.couponType = couponType;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
-
- public Integer getCompanyType() {
- return companyType;
- }
-
- public void setCompanyType(Integer companyType) {
- this.companyType = companyType;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getSendType() {
- return sendType;
- }
-
- public void setSendType(Integer sendType) {
- this.sendType = sendType;
- }
-
- public String getSendUserId() {
- return sendUserId;
- }
-
- public void setSendUserId(String sendUserId) {
- this.sendUserId = sendUserId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "SysCouponActivity{" +
- "id=" + id +
- ", money=" + money +
- ", fullMoney=" + fullMoney +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", couponUseType=" + couponUseType +
- ", couponType=" + couponType +
- ", name=" + name +
- ", effective=" + effective +
- ", companyType=" + companyType +
- ", status=" + status +
- ", remark=" + remark +
- ", sendType=" + sendType +
- ", sendUserId=" + sendUserId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponRecord.java
deleted file mode 100644
index 22e2f66..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysCouponRecord.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 系统设置-优惠券记录
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-15
- */
-@TableName("t_sys_coupon_record")
-public class SysCouponRecord extends Model<SysCouponRecord> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 金额
- */
- @TableField("money")
- private BigDecimal money;
- /**
- * 满减金额
- */
- @TableField("fullMoney")
- private BigDecimal fullMoney;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 优惠券使用类型(0=通用，1=专车，4=小件物流)
- * 1:comment 2:special 4:small-scale express
- */
- @TableField("couponUseType")
- private Integer couponUseType;
- /**
- * 优惠券类型(1=抵扣，2=满减)
- * 1:discount 2:full discount
- */
- @TableField("couponType")
- private Integer couponType;
- /**
- * 优惠券名称
- */
- @TableField("name")
- private String name;
- /**
- * 有效天数
- */
- @TableField("effective")
- private Integer effective;
-
- public Integer getLanguage() {
- return language;
- }
-
- public void setLanguage(Integer language) {
- this.language = language;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- /**
- * 1=平台 2=分公司 3=加盟商
- * 1=Platform 2=Branch office 3=Franchisee
- */
- @TableField("companyType")
- private Integer companyType;
- @TableField("language")
- private Integer language;
-
- @TableField("status")
- private Integer status;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @TableField(exist = false)
- private String remark;
-
- public Integer getCompanyType() {
- return companyType;
- }
-
- public void setCompanyType(Integer companyType) {
- this.companyType = companyType;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public BigDecimal getFullMoney() {
- return fullMoney;
- }
-
- public void setFullMoney(BigDecimal fullMoney) {
- this.fullMoney = fullMoney;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getCouponUseType() {
- return couponUseType;
- }
-
- public void setCouponUseType(Integer couponUseType) {
- this.couponUseType = couponUseType;
- }
-
- public Integer getCouponType() {
- return couponType;
- }
-
- public void setCouponType(Integer couponType) {
- this.couponType = couponType;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "SysCouponRecord{" +
- "id=" + id +
- ", money=" + money +
- ", fullMoney=" + fullMoney +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", couponUseType=" + couponUseType +
- ", couponType=" + couponType +
- ", name=" + name +
- ", effective=" + effective +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysRedPacketRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysRedPacketRecord.java
deleted file mode 100644
index dcc9fcb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/SysRedPacketRecord.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 系统设置-红包记录
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-13
- */
-@TableName("t_sys_red_packet_record")
-public class SysRedPacketRecord extends Model<SysRedPacketRecord> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 金额
- */
- @TableField("money")
- private BigDecimal money;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 红包名称
- */
- @TableField("name")
- private String name;
- /**
- * 类型(1=固定金额，2=随机金额)
- * 1=Fixed amount, 2=Random amount
- */
- @TableField("type")
- private Integer type;
- /**
- * 总金额
- */
- @TableField("totalMoney")
- private BigDecimal totalMoney;
- /**
- * 剩余金额
- */
- @TableField("laveMoney")
- private Double laveMoney;
- /**
- * 开始金额
- */
- @TableField("startMoney")
- private BigDecimal startMoney;
- /**
- * 结束金额
- */
- @TableField("endMoney")
- private BigDecimal endMoney;
- /**
- * 有效天数
- */
- @TableField("effective")
- private Integer effective;
- /**
- * 1=平台 2=分公司 3=加盟商
- * 1=Platform 2=Branch office 3=Franchisee
- */
- @TableField("companyType")
- private Integer companyType;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public BigDecimal getTotalMoney() {
- return totalMoney;
- }
-
- public void setTotalMoney(BigDecimal totalMoney) {
- this.totalMoney = totalMoney;
- }
-
- public Double getLaveMoney() {
- return laveMoney;
- }
-
- public void setLaveMoney(Double laveMoney) {
- this.laveMoney = laveMoney;
- }
-
- public BigDecimal getStartMoney() {
- return startMoney;
- }
-
- public void setStartMoney(BigDecimal startMoney) {
- this.startMoney = startMoney;
- }
-
- public BigDecimal getEndMoney() {
- return endMoney;
- }
-
- public void setEndMoney(BigDecimal endMoney) {
- this.endMoney = endMoney;
- }
-
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
-
- public Integer getCompanyType() {
- return companyType;
- }
-
- public void setCompanyType(Integer companyType) {
- this.companyType = companyType;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "SysRedPacketRecord{" +
- "id=" + id +
- ", money=" + money +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", name=" + name +
- ", type=" + type +
- ", totalMoney=" + totalMoney +
- ", laveMoney=" + laveMoney +
- ", startMoney=" + startMoney +
- ", endMoney=" + endMoney +
- ", effective=" + effective +
- ", companyType=" + companyType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAdvertisement.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAdvertisement.java
deleted file mode 100644
index f65fadf..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAdvertisement.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 广告
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@TableName("t_advertisement")
-public class TAdvertisement extends Model<TAdvertisement> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 名称
- */
- private String name;
- /**
- * 图片路径
- */
- private String imgUrl;
- /**
- * 类型(1=弹窗，2=首页底部) 1=Pop-up window, 2=Bottom of homepage
- */
- private Integer type;
- /**
- * 是否跳转(1=是，2=否) 1:Y 2:N
- */
- private Integer isJump;
- /**
- * 跳转类型(1=外部，2=内部) 1:outside 2:inner
- */
- private Integer jumpType;
- /**
- * 跳转路径
- */
- private String jumpUrl;
- /**
- * 文本编辑器内容
- */
- private String content;
- /**
- * 1：创建，2：修改，3：删除 1:create 2:update 3:delete
- */
- private Integer flag;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- private Integer insertUser;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
- private Integer updateUser;
- /**
- * 状态 1=已上线 2=已下线 1=Online 2=Offline
- */
- private Integer state;
- /**
- * 开通城市id
- */
- private Integer openCityId;
- /**
- * 所属省Id
- */
- @Deprecated
- private Integer provinceId;
-
- public Integer getOpenCityId() {
- return openCityId;
- }
-
- public void setOpenCityId(Integer openCityId) {
- this.openCityId = openCityId;
- }
-
- public Integer getCityId() {
- return cityId;
- }
-
- public void setCityId(Integer cityId) {
- this.cityId = cityId;
- }
-
- @Deprecated
- private Integer cityId;
-
- public Integer getProvinceId() {
- return provinceId;
- }
-
- public void setProvinceId(Integer provinceId) {
- this.provinceId = provinceId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImgUrl() {
- return imgUrl;
- }
-
- public void setImgUrl(String imgUrl) {
- this.imgUrl = imgUrl;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getIsJump() {
- return isJump;
- }
-
- public void setIsJump(Integer isJump) {
- this.isJump = isJump;
- }
-
- public Integer getJumpType() {
- return jumpType;
- }
-
- public void setJumpType(Integer jumpType) {
- this.jumpType = jumpType;
- }
-
- public String getJumpUrl() {
- return jumpUrl;
- }
-
- public void setJumpUrl(String jumpUrl) {
- this.jumpUrl = jumpUrl;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getFlag() {
- return flag;
- }
-
- public void setFlag(Integer flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TAdvertisement{" +
- "id=" + id +
- ", name=" + name +
- ", imgUrl=" + imgUrl +
- ", type=" + type +
- ", isJump=" + isJump +
- ", jumpType=" + jumpType +
- ", jumpUrl=" + jumpUrl +
- ", content=" + content +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAgreement.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAgreement.java
deleted file mode 100644
index cf3c6ed..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAgreement.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 平台协议
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-01
- */
-@TableName("t_agreement")
-public class TAgreement extends Model<TAgreement> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 1=用户，2=司机
- * 1:user 3:driver
- */
- @TableField("useType")
- private Integer useType;
- /**
- * 协议内容
- */
- @TableField("content")
- private String content;
- /**
- * 类型（1：隐私协议，2：用户协议，3：用户指南，4：法律条款，5：关于我们，6=注册协议）
- * Types (1: Privacy Policy, 2: User Agreement, 3: User Guide, 4: Legal Terms, 5: About Us, 6: Registration Agreement)
- */
- @TableField("type")
- private Integer type;
- /**
- * 1：创建，2：修改，3：删除
- * 1:create 2:update 3:delete
- */
- @TableField("flag")
- private String flag;
- @TableField("insertTime")
- private Date insertTime;
- @TableField("insertUser")
- private String insertUser;
- @TableField("updateTime")
- private Date updateTime;
- @TableField("updateUser")
- private Integer updateUser;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUseType() {
- return useType;
- }
-
- public void setUseType(Integer useType) {
- this.useType = useType;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(String insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TAgreement{" +
- "id=" + id +
- ", useType=" + useType +
- ", content=" + content +
- ", type=" + type +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAuditRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAuditRecord.java
deleted file mode 100644
index f76cdee..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TAuditRecord.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 审核记录表
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-25
- */
-@TableName("t_audit_record")
-public class TAuditRecord extends Model<TAuditRecord> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 活动id
- */
- @TableField(value = "activityId")
- private Integer activityId;
- /**
- * 活动名称
- */
- @TableField(value = "activityName")
- private String activityName;
- /**
- * 1待审核 2通过 3拒绝
- */
- @TableField(value = "auditStatus")
- private Integer auditStatus;
- /**
- * 审核时间
- */
- @TableField(value = "auditTime")
- private Date auditTime;
- /**
- * 1司机活动 2用户活动 3赠送活动 4大额优惠券 5保底收入 6优惠券
- */
- @TableField(value = "activityType")
- private Integer activityType;
- /**
- * 备注
- */
- @TableField(value = "remark")
- private String remark;
- /**
- * 审核人id
- */
- @TableField(value = "auditUserId")
- private Integer auditUserId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getActivityId() {
- return activityId;
- }
-
- public void setActivityId(Integer activityId) {
- this.activityId = activityId;
- }
-
- public String getActivityName() {
- return activityName;
- }
-
- public void setActivityName(String activityName) {
- this.activityName = activityName;
- }
-
- public Integer getAuditStatus() {
- return auditStatus;
- }
-
- public void setAuditStatus(Integer auditStatus) {
- this.auditStatus = auditStatus;
- }
-
- public Date getAuditTime() {
- return auditTime;
- }
-
- public void setAuditTime(Date auditTime) {
- this.auditTime = auditTime;
- }
-
- public Integer getActivityType() {
- return activityType;
- }
-
- public void setActivityType(Integer activityType) {
- this.activityType = activityType;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getAuditUserId() {
- return auditUserId;
- }
-
- public void setAuditUserId(Integer auditUserId) {
- this.auditUserId = auditUserId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TAuditRecord{" +
- "id=" + id +
- ", activityId=" + activityId +
- ", activityName=" + activityName +
- ", auditStatus=" + auditStatus +
- ", auditTime=" + auditTime +
- ", activityType=" + activityType +
- ", remark=" + remark +
- ", auditUserId=" + auditUserId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCar.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCar.java
deleted file mode 100644
index 6ae9afb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCar.java
+++ /dev/null
@@ -1,620 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 车辆
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_car")
-public class TCar extends Model<TCar> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- @TableField("isPlatCar")
- private Integer isPlatCar;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 加盟商id
- */
- @TableField("franchiseeId")
- private Integer franchiseeId;
- /**
- * 车辆颜色
- */
- @TableField("carColor")
- private String carColor;
- /**
- * 车型id
- */
- @TableField("carModelId")
- private Integer carModelId;
- /**
- * 车辆品牌ID
- */
- @TableField("carBrandId")
- private Integer carBrandId;
- /**
- * 车牌号
- */
- @TableField("carLicensePlate")
- private String carLicensePlate;
- /**
- * 车牌颜色
- */
- @TableField("plateColor")
- private String plateColor;
- /**
- * 车辆照片
- */
- @TableField("carPhoto")
- private String carPhoto;
- /**
- * 车辆类型
- */
- @TableField("vehicleType")
- private String vehicleType;
- /**
- * 车辆所有人
- */
- @TableField("ownerName")
- private String ownerName;
- /**
- * 发送机号
- */
- @TableField("engineId")
- private String engineId;
- /**
- * 车辆VIN码
- */
- @TableField("VIN")
- private String VIN;
- /**
- * 车辆注册日期
- */
- @TableField("certifyDateA")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date certifyDateA;
- /**
- * 车辆燃料类型
- */
- @TableField("fuelType")
- private String fuelType;
- /**
- * 发动机排量
- */
- @TableField("engineDisplace")
- private String engineDisplace;
- /**
- * 运输证字号
- */
- @TableField("certificate")
- private String certificate;
- /**
- * 车辆运输证发证机构
- */
- @TableField("transAgency")
- private String transAgency;
- /**
- * 车辆经营区域
- */
- @TableField("transArea")
- private String transArea;
- /**
- * 车辆运输证有效期起
- */
- @TableField("transDateStart")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date transDateStart;
- /**
- * 车辆运输证有效期止
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @TableField("transDateStop")
- private Date transDateStop;
- /**
- * 车辆初次登记日期
- */
- @TableField("certifyDateB")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date certifyDateB;
- /**
- * 车辆维修状态（0：未检修，1：已检修，2：未知）
- */
- @TableField("fixState")
- private Integer fixState;
- /**
- * 车辆下次年检时间
- */
- @TableField("nextFixDate")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date nextFixDate;
- /**
- * 车辆年度审核状态
- */
- @TableField("checkState")
- private String checkState;
- /**
- * 发票打印设备序列号
- */
- @TableField("feePrintId")
- private String feePrintId;
- /**
- * 卫星定位装置品牌
- */
- @TableField("GPSBrand")
- private String GPSBrand;
- /**
- * 卫星定位装置型号
- */
- @TableField("GPSModel")
- private String GPSModel;
- /**
- * 卫星定位装置IMEI号
- */
- @TableField("GPSIMEI")
- private String GPSIMEI;
- /**
- * 卫星定位装置安装时间
- */
- @TableField("GPSInstallDate")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date GPSInstallDate;
- /**
- * 车辆报备日期
- */
- @TableField("registerDate")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date registerDate;
- /**
- * 服务类型（1：网络预约出租车，2：巡游出租汽车，3：私人小客车合乘）
- */
- @TableField("commercialType")
- private Integer commercialType;
- /**
- * 行驶证号
- */
- @TableField("drivingLicenseNumber")
- private String drivingLicenseNumber;
- /**
- * 行驶证照片
- */
- @TableField("drivingLicensePhoto")
- private String drivingLicensePhoto;
- /**
- * 年检到期时间
- */
- @TableField("annualInspectionTime")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date annualInspectionTime;
- /**
- * 商业保险到期时间
- */
- @TableField("commercialInsuranceTime")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date commercialInsuranceTime;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date insertTime;
- /**
- * 状态(1=正常，2=删除)
- */
- @TableField("state")
- private Integer state;
- /**
- * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- */
- @TableField("addType")
- private Integer addType;
- /**
- * 添加司机的分公司/加盟商ID
- */
- @TableField("addObjectId")
- private Integer addObjectId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getIsPlatCar() {
- return isPlatCar;
- }
-
- public void setIsPlatCar(Integer isPlatCar) {
- this.isPlatCar = isPlatCar;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getFranchiseeId() {
- return franchiseeId;
- }
-
- public void setFranchiseeId(Integer franchiseeId) {
- this.franchiseeId = franchiseeId;
- }
-
- public String getCarColor() {
- return carColor;
- }
-
- public void setCarColor(String carColor) {
- this.carColor = carColor;
- }
-
- public Integer getCarModelId() {
- return carModelId;
- }
-
- public void setCarModelId(Integer carModelId) {
- this.carModelId = carModelId;
- }
-
- public Integer getCarBrandId() {
- return carBrandId;
- }
-
- public void setCarBrandId(Integer carBrandId) {
- this.carBrandId = carBrandId;
- }
-
- public String getCarLicensePlate() {
- return carLicensePlate;
- }
-
- public void setCarLicensePlate(String carLicensePlate) {
- this.carLicensePlate = carLicensePlate;
- }
-
- public String getCarPhoto() {
- return carPhoto;
- }
-
- public void setCarPhoto(String carPhoto) {
- this.carPhoto = carPhoto;
- }
-
- public String getDrivingLicenseNumber() {
- return drivingLicenseNumber;
- }
-
- public void setDrivingLicenseNumber(String drivingLicenseNumber) {
- this.drivingLicenseNumber = drivingLicenseNumber;
- }
-
- public String getDrivingLicensePhoto() {
- return drivingLicensePhoto;
- }
-
- public void setDrivingLicensePhoto(String drivingLicensePhoto) {
- this.drivingLicensePhoto = drivingLicensePhoto;
- }
-
- public Date getAnnualInspectionTime() {
- return annualInspectionTime;
- }
-
- public void setAnnualInspectionTime(Date annualInspectionTime) {
- this.annualInspectionTime = annualInspectionTime;
- }
-
- public Date getCommercialInsuranceTime() {
- return commercialInsuranceTime;
- }
-
- public void setCommercialInsuranceTime(Date commercialInsuranceTime) {
- this.commercialInsuranceTime = commercialInsuranceTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getAddType() {
- return addType;
- }
-
- public void setAddType(Integer addType) {
- this.addType = addType;
- }
-
- public Integer getAddObjectId() {
- return addObjectId;
- }
-
- public void setAddObjectId(Integer addObjectId) {
- this.addObjectId = addObjectId;
- }
-
- public String getPlateColor() {
- return plateColor;
- }
-
- public void setPlateColor(String plateColor) {
- this.plateColor = plateColor;
- }
-
- public String getVehicleType() {
- return vehicleType;
- }
-
- public void setVehicleType(String vehicleType) {
- this.vehicleType = vehicleType;
- }
-
- public String getOwnerName() {
- return ownerName;
- }
-
- public void setOwnerName(String ownerName) {
- this.ownerName = ownerName;
- }
-
- public String getEngineId() {
- return engineId;
- }
-
- public void setEngineId(String engineId) {
- this.engineId = engineId;
- }
-
- public String getVIN() {
- return VIN;
- }
-
- public void setVIN(String VIN) {
- this.VIN = VIN;
- }
-
- public Date getCertifyDateA() {
- return certifyDateA;
- }
-
- public void setCertifyDateA(Date certifyDateA) {
- this.certifyDateA = certifyDateA;
- }
-
- public String getFuelType() {
- return fuelType;
- }
-
- public void setFuelType(String fuelType) {
- this.fuelType = fuelType;
- }
-
- public String getEngineDisplace() {
- return engineDisplace;
- }
-
- public void setEngineDisplace(String engineDisplace) {
- this.engineDisplace = engineDisplace;
- }
-
- public String getCertificate() {
- return certificate;
- }
-
- public void setCertificate(String certificate) {
- this.certificate = certificate;
- }
-
- public String getTransAgency() {
- return transAgency;
- }
-
- public void setTransAgency(String transAgency) {
- this.transAgency = transAgency;
- }
-
- public String getTransArea() {
- return transArea;
- }
-
- public void setTransArea(String transArea) {
- this.transArea = transArea;
- }
-
- public Date getTransDateStart() {
- return transDateStart;
- }
-
- public void setTransDateStart(Date transDateStart) {
- this.transDateStart = transDateStart;
- }
-
- public Date getTransDateStop() {
- return transDateStop;
- }
-
- public void setTransDateStop(Date transDateStop) {
- this.transDateStop = transDateStop;
- }
-
- public Date getCertifyDateB() {
- return certifyDateB;
- }
-
- public void setCertifyDateB(Date certifyDateB) {
- this.certifyDateB = certifyDateB;
- }
-
- public Integer getFixState() {
- return fixState;
- }
-
- public void setFixState(Integer fixState) {
- this.fixState = fixState;
- }
-
- public Date getNextFixDate() {
- return nextFixDate;
- }
-
- public void setNextFixDate(Date nextFixDate) {
- this.nextFixDate = nextFixDate;
- }
-
- public String getCheckState() {
- return checkState;
- }
-
- public void setCheckState(String checkState) {
- this.checkState = checkState;
- }
-
- public String getFeePrintId() {
- return feePrintId;
- }
-
- public void setFeePrintId(String feePrintId) {
- this.feePrintId = feePrintId;
- }
-
- public String getGPSBrand() {
- return GPSBrand;
- }
-
- public void setGPSBrand(String GPSBrand) {
- this.GPSBrand = GPSBrand;
- }
-
- public String getGPSModel() {
- return GPSModel;
- }
-
- public void setGPSModel(String GPSModel) {
- this.GPSModel = GPSModel;
- }
-
- public String getGPSIMEI() {
- return GPSIMEI;
- }
-
- public void setGPSIMEI(String GPSIMEI) {
- this.GPSIMEI = GPSIMEI;
- }
-
- public Date getGPSInstallDate() {
- return GPSInstallDate;
- }
-
- public void setGPSInstallDate(Date GPSInstallDate) {
- this.GPSInstallDate = GPSInstallDate;
- }
-
- public Date getRegisterDate() {
- return registerDate;
- }
-
- public void setRegisterDate(Date registerDate) {
- this.registerDate = registerDate;
- }
-
- public Integer getCommercialType() {
- return commercialType;
- }
-
- public void setCommercialType(Integer commercialType) {
- this.commercialType = commercialType;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TCar{" +
- "id=" + id +
- ", isPlatCar=" + isPlatCar +
- ", companyId=" + companyId +
- ", franchiseeId=" + franchiseeId +
- ", carColor='" + carColor + '\'' +
- ", carModelId=" + carModelId +
- ", carBrandId=" + carBrandId +
- ", carLicensePlate='" + carLicensePlate + '\'' +
- ", plateColor='" + plateColor + '\'' +
- ", carPhoto='" + carPhoto + '\'' +
- ", vehicleType='" + vehicleType + '\'' +
- ", ownerName='" + ownerName + '\'' +
- ", engineId='" + engineId + '\'' +
- ", VIN='" + VIN + '\'' +
- ", certifyDateA=" + certifyDateA +
- ", fuelType='" + fuelType + '\'' +
- ", engineDisplace='" + engineDisplace + '\'' +
- ", certificate='" + certificate + '\'' +
- ", transAgency='" + transAgency + '\'' +
- ", transArea='" + transArea + '\'' +
- ", transDateStart=" + transDateStart +
- ", transDateStop=" + transDateStop +
- ", certifyDateB=" + certifyDateB +
- ", fixState=" + fixState +
- ", nextFixDate=" + nextFixDate +
- ", checkState='" + checkState + '\'' +
- ", feePrintId='" + feePrintId + '\'' +
- ", GPSBrand='" + GPSBrand + '\'' +
- ", GPSModel='" + GPSModel + '\'' +
- ", GPSIMEI='" + GPSIMEI + '\'' +
- ", GPSInstallDate=" + GPSInstallDate +
- ", registerDate=" + registerDate +
- ", commercialType=" + commercialType +
- ", drivingLicenseNumber='" + drivingLicenseNumber + '\'' +
- ", drivingLicensePhoto='" + drivingLicensePhoto + '\'' +
- ", annualInspectionTime=" + annualInspectionTime +
- ", commercialInsuranceTime=" + commercialInsuranceTime +
- ", insertTime=" + insertTime +
- ", state=" + state +
- ", addType=" + addType +
- ", addObjectId=" + addObjectId +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarBrand.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarBrand.java
deleted file mode 100644
index 197cec6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarBrand.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 车辆品牌
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_car_brand")
-public class TCarBrand extends Model<TCarBrand> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 名称
- */
- @TableField("name")
- private String name;
-
- /**
- * 图片
- */
- @TableField("imgUrl")
- private String imgUrl;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 创建时间
- */
- @TableField("insertTime")
- private Date insertTime;
-
- public Integer getLanguage() {
- return language;
- }
-
- public void setLanguage(Integer language) {
- this.language = language;
- }
-
- /**
- * 状态(1=正常，2=删除)
- */
- @TableField("state")
- private Integer state;
-
- public String getEname() {
- return ename;
- }
-
- public void setEname(String ename) {
- this.ename = ename;
- }
-
- public String getYname() {
- return yname;
- }
-
- public void setYname(String yname) {
- this.yname = yname;
- }
-
- @TableField("language")
- private Integer language;
- @TableField("ename")
- private String ename;
- @TableField("yname")
- private String yname;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImgUrl() {
- return imgUrl;
- }
-
- public void setImgUrl(String imgUrl) {
- this.imgUrl = imgUrl;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TCarBrand{" +
- "id=" + id +
- ", name=" + name +
- ", imgUrl=" + imgUrl +
- ", remark=" + remark +
- ", insertTime=" + insertTime +
- ", state=" + state +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarModel.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarModel.java
deleted file mode 100644
index 8093bde..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarModel.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import org.omg.CORBA.INTERNAL;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 车辆车型
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_car_model")
-public class TCarModel extends Model<TCarModel> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 名称
- */
- @TableField("name")
- private String name;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 创建时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 状态(1=正常，2=删除)
- */
- @TableField("state")
- private Integer state;
- /**
- * 座位数
- */
- @TableField("seat")
- private Integer seat;
- /**
- * 品牌id
- */
- @TableField("brandId")
- private Integer brandId;
-
- public Integer getLanguage() {
- return language;
- }
-
- public void setLanguage(Integer language) {
- this.language = language;
- }
-
- @TableField("language")
- private Integer language;
-
- public String getEname() {
- return ename;
- }
-
- public void setEname(String ename) {
- this.ename = ename;
- }
-
- public String getYname() {
- return yname;
- }
-
- public void setYname(String yname) {
- this.yname = yname;
- }
-
- private String ename;
-
- private String yname;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getSeat() {
- return seat;
- }
-
- public void setSeat(Integer seat) {
- this.seat = seat;
- }
-
- public Integer getBrandId() {
- return brandId;
- }
-
- public void setBrandId(Integer brandId) {
- this.brandId = brandId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TCarModel{" +
- "id=" + id +
- ", name=" + name +
- ", remark=" + remark +
- ", insertTime=" + insertTime +
- ", state=" + state +
- ", seat=" + seat +
- ", brandId=" + brandId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarService.java
deleted file mode 100644
index e5a156c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCarService.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 车辆经营业务
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_car_service")
-public class TCarService extends Model<TCarService> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 类型(1=专车，4=小件物流-同城)
- */
- @TableField("type")
- private Integer type;
- /**
- * 服务车型id
- */
- @TableField("serverCarModelId")
- private Integer serverCarModelId;
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TCarService{" +
- "id=" + id +
- ", carId=" + carId +
- ", type=" + type +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompany.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompany.java
deleted file mode 100644
index b063f31..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompany.java
+++ /dev/null
@@ -1,740 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 公司信息表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-06
- */
-@TableName("t_company")
-public class TCompany extends Model<TCompany> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 是否经营专车(1=是，2=否) 1:Y 2:N
- */
- private Integer isSpe;
- /**
- * 是否经营出租车(1=是，2=否) 1:Y 2:N
- */
- private Integer isTaxi;
- /**
- * 是否经营跨城(1=是，2=否) 1:Y 2:N
- */
- private Integer isCross;
- /**
- * 是否经营跨城物流(1=是，2=否) 1:Y 2:N
- */
- private Integer isCrossLogistics;
- /**
- * 是否经营同城物流(1=是，2=否) 1:Y 2:N
- */
- private Integer isSameLogistics;
- /**
- * 是否经营包车(1=是，2=否) 1:Y 2:N
- */
- private Integer isCharter;
- /**
- * 专车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isSpeFixedOrProportional;
- /**
- * 出租车提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isTaxiFixedOrProportional;
- /**
- * 跨城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isCrossLogisticsFixedOrProportional;
- /**
- * 同城物流提成方式(1=比例，2=固定)(1=proportional, 2=fixed)
- */
- private Integer isSameLogisticsFixedOrProportional;
- /**
- * 专车提成数值
- */
- private Double speMoney;
- /**
- * 出租车提成数值
- */
- private Double taxiMoney;
- /**
- * 跨城物流提成数值
- */
- private Double crossLogisticsMoney;
- /**
- * 同城物流
- */
- private Double sameLogisticsMoney;
- /**
- * 是否需要摆渡车(1=是，2=否) 1:Y 2:N
- */
- private Integer isNeedFerry;
- /**
- * 企业名称
- */
- private String name;
- /**
- * 企业类型（1：平台，2：分公司，3：加盟商）
- * Enterprise type (1: platform, 2: branch, 3: franchisee)
- */
- private Integer type;
- /**
- * 上级企业id
- */
- private Integer superiorId;
- /**
- * 负责人姓名
- */
- private String principalName;
- /**
- * 负责人电话
- */
- private String principalPhone;
- /**
- * 管理员姓名
- */
- private String adminName;
- /**
- * 管理员电话
- */
- private String adminPhone;
- /**
- * 紧急联系电话
- */
- private String urgentPhoen;
- /**
- * 服务机构设立日期
- */
- @DateTimeFormat
- private Date setupTime;
- /**
- * 统一社会信用代码
- */
- private String identifier;
- /**
- * 注册地行政区划分代码
- */
- private String addressCode;
- /**
- * 经营范围
- */
- private String businessScope;
- /**
- * 通信地址
- */
- private String contactAddress;
- /**
- * 行政文书送达地址
- */
- private String documentAddress;
- /**
- * 经营业户经济类型
- */
- private String economicType;
- /**
- * 注册资本
- */
- private String regCapital;
- /**
- * 法人代表姓名
- */
- private String legalName;
- /**
- * 法人代表身份证号
- */
- private String legalId;
- /**
- * 法人代表电话
- */
- private String legalPhone;
- /**
- * 法人代表身份证扫描件文件地址
- */
- private String legalPhotoUrl;
- /**
- * 经营许可证发证机构
- */
- private String licensingAgency;
- /**
- * 经营许可证初次发证日期
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date licenseTime;
- /**
- * 经营许可证有效期起
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date licenseStartTime;
- /**
- * 经营许可证有效期止
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date licenseEndTime;
- /**
- * 网络预约车经营许可证号
- */
- private String licenseNumber;
- /**
- * 注册网络预约车辆数
- */
- private Integer carNum;
- /**
- * 注册网络预约车驾驶员数量
- */
- private Integer driverNum;
- /**
- * 登录MAC地址（多个以逗号分隔）
- */
- private String mac;
- /**
- * 当前状态（0：正常，1：禁用）
- * :0:normal 2:disable
- */
- private Integer state;
- /**
- * 操作标识（1：新增，2：修改，3：删除）
- * 1:add 2:update 3:delete
- */
- private String flag;
- /**
- * 上传标识（1：未上传，2：已上传）
- * 1: Not uploaded, 2: Uploaded
- */
- private String upload;
- /**
- * 创建时间
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date insertTime;
- /**
- * 具体地址
- */
- private String detailAddress;
- /**
- * 分公司代码
- */
- private String code;
- /**
- * 分公司区划代码
- */
- private String scopeCode;
- /**
- * 经营区域
- */
- private String serviceScope;
- //身份证正面
- private String idCardPositive;
- //身份证反面
- private String idCardReverse;
-
- public String getIdCardPositive() {
- return idCardPositive;
- }
-
- public void setIdCardPositive(String idCardPositive) {
- this.idCardPositive = idCardPositive;
- }
-
- public String getIdCardReverse() {
- return idCardReverse;
- }
-
- public void setIdCardReverse(String idCardReverse) {
- this.idCardReverse = idCardReverse;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getScopeCode() {
- return scopeCode;
- }
-
- public void setScopeCode(String scopeCode) {
- this.scopeCode = scopeCode;
- }
-
- public String getServiceScope() {
- return serviceScope;
- }
-
- public void setServiceScope(String serviceScope) {
- this.serviceScope = serviceScope;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getIsSpe() {
- return isSpe;
- }
-
- public void setIsSpe(Integer isSpe) {
- this.isSpe = isSpe;
- }
-
- public Integer getIsTaxi() {
- return isTaxi;
- }
-
- public void setIsTaxi(Integer isTaxi) {
- this.isTaxi = isTaxi;
- }
-
- public Integer getIsCross() {
- return isCross;
- }
-
- public void setIsCross(Integer isCross) {
- this.isCross = isCross;
- }
-
- public Integer getIsCrossLogistics() {
- return isCrossLogistics;
- }
-
- public void setIsCrossLogistics(Integer isCrossLogistics) {
- this.isCrossLogistics = isCrossLogistics;
- }
-
- public Integer getIsSameLogistics() {
- return isSameLogistics;
- }
-
- public void setIsSameLogistics(Integer isSameLogistics) {
- this.isSameLogistics = isSameLogistics;
- }
-
- public Integer getIsCharter() {
- return isCharter;
- }
-
- public void setIsCharter(Integer isCharter) {
- this.isCharter = isCharter;
- }
-
- public Integer getIsSpeFixedOrProportional() {
- return isSpeFixedOrProportional;
- }
-
- public void setIsSpeFixedOrProportional(Integer isSpeFixedOrProportional) {
- this.isSpeFixedOrProportional = isSpeFixedOrProportional;
- }
-
- public Integer getIsTaxiFixedOrProportional() {
- return isTaxiFixedOrProportional;
- }
-
- public void setIsTaxiFixedOrProportional(Integer isTaxiFixedOrProportional) {
- this.isTaxiFixedOrProportional = isTaxiFixedOrProportional;
- }
-
- public Integer getIsCrossLogisticsFixedOrProportional() {
- return isCrossLogisticsFixedOrProportional;
- }
-
- public void setIsCrossLogisticsFixedOrProportional(Integer isCrossLogisticsFixedOrProportional) {
- this.isCrossLogisticsFixedOrProportional = isCrossLogisticsFixedOrProportional;
- }
-
- public Integer getIsSameLogisticsFixedOrProportional() {
- return isSameLogisticsFixedOrProportional;
- }
-
- public void setIsSameLogisticsFixedOrProportional(Integer isSameLogisticsFixedOrProportional) {
- this.isSameLogisticsFixedOrProportional = isSameLogisticsFixedOrProportional;
- }
-
- public Double getSpeMoney() {
- return speMoney;
- }
-
- public void setSpeMoney(Double speMoney) {
- this.speMoney = speMoney;
- }
-
- public Double getTaxiMoney() {
- return taxiMoney;
- }
-
- public void setTaxiMoney(Double taxiMoney) {
- this.taxiMoney = taxiMoney;
- }
-
- public Double getCrossLogisticsMoney() {
- return crossLogisticsMoney;
- }
-
- public void setCrossLogisticsMoney(Double crossLogisticsMoney) {
- this.crossLogisticsMoney = crossLogisticsMoney;
- }
-
- public Double getSameLogisticsMoney() {
- return sameLogisticsMoney;
- }
-
- public void setSameLogisticsMoney(Double sameLogisticsMoney) {
- this.sameLogisticsMoney = sameLogisticsMoney;
- }
-
- public Integer getIsNeedFerry() {
- return isNeedFerry;
- }
-
- public void setIsNeedFerry(Integer isNeedFerry) {
- this.isNeedFerry = isNeedFerry;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getSuperiorId() {
- return superiorId;
- }
-
- public void setSuperiorId(Integer superiorId) {
- this.superiorId = superiorId;
- }
-
- public String getPrincipalName() {
- return principalName;
- }
-
- public void setPrincipalName(String principalName) {
- this.principalName = principalName;
- }
-
- public String getPrincipalPhone() {
- return principalPhone;
- }
-
- public void setPrincipalPhone(String principalPhone) {
- this.principalPhone = principalPhone;
- }
-
- public String getAdminName() {
- return adminName;
- }
-
- public void setAdminName(String adminName) {
- this.adminName = adminName;
- }
-
- public String getAdminPhone() {
- return adminPhone;
- }
-
- public void setAdminPhone(String adminPhone) {
- this.adminPhone = adminPhone;
- }
-
- public String getUrgentPhoen() {
- return urgentPhoen;
- }
-
- public void setUrgentPhoen(String urgentPhoen) {
- this.urgentPhoen = urgentPhoen;
- }
-
- public Date getSetupTime() {
- return setupTime;
- }
-
- public void setSetupTime(Date setupTime) {
- this.setupTime = setupTime;
- }
-
- public String getIdentifier() {
- return identifier;
- }
-
- public void setIdentifier(String identifier) {
- this.identifier = identifier;
- }
-
- public String getAddressCode() {
- return addressCode;
- }
-
- public void setAddressCode(String addressCode) {
- this.addressCode = addressCode;
- }
-
- public String getBusinessScope() {
- return businessScope;
- }
-
- public void setBusinessScope(String businessScope) {
- this.businessScope = businessScope;
- }
-
- public String getContactAddress() {
- return contactAddress;
- }
-
- public void setContactAddress(String contactAddress) {
- this.contactAddress = contactAddress;
- }
-
- public String getDocumentAddress() {
- return documentAddress;
- }
-
- public void setDocumentAddress(String documentAddress) {
- this.documentAddress = documentAddress;
- }
-
- public String getEconomicType() {
- return economicType;
- }
-
- public void setEconomicType(String economicType) {
- this.economicType = economicType;
- }
-
- public String getRegCapital() {
- return regCapital;
- }
-
- public void setRegCapital(String regCapital) {
- this.regCapital = regCapital;
- }
-
- public String getLegalName() {
- return legalName;
- }
-
- public void setLegalName(String legalName) {
- this.legalName = legalName;
- }
-
- public String getLegalId() {
- return legalId;
- }
-
- public void setLegalId(String legalId) {
- this.legalId = legalId;
- }
-
- public String getLegalPhone() {
- return legalPhone;
- }
-
- public void setLegalPhone(String legalPhone) {
- this.legalPhone = legalPhone;
- }
-
- public String getLegalPhotoUrl() {
- return legalPhotoUrl;
- }
-
- public void setLegalPhotoUrl(String legalPhotoUrl) {
- this.legalPhotoUrl = legalPhotoUrl;
- }
-
- public String getLicensingAgency() {
- return licensingAgency;
- }
-
- public void setLicensingAgency(String licensingAgency) {
- this.licensingAgency = licensingAgency;
- }
-
- public Date getLicenseTime() {
- return licenseTime;
- }
-
- public void setLicenseTime(Date licenseTime) {
- this.licenseTime = licenseTime;
- }
-
- public Date getLicenseStartTime() {
- return licenseStartTime;
- }
-
- public void setLicenseStartTime(Date licenseStartTime) {
- this.licenseStartTime = licenseStartTime;
- }
-
- public Date getLicenseEndTime() {
- return licenseEndTime;
- }
-
- public void setLicenseEndTime(Date licenseEndTime) {
- this.licenseEndTime = licenseEndTime;
- }
-
- public String getLicenseNumber() {
- return licenseNumber;
- }
-
- public void setLicenseNumber(String licenseNumber) {
- this.licenseNumber = licenseNumber;
- }
-
- public Integer getCarNum() {
- return carNum;
- }
-
- public void setCarNum(Integer carNum) {
- this.carNum = carNum;
- }
-
- public Integer getDriverNum() {
- return driverNum;
- }
-
- public void setDriverNum(Integer driverNum) {
- this.driverNum = driverNum;
- }
-
- public String getMac() {
- return mac;
- }
-
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public String getUpload() {
- return upload;
- }
-
- public void setUpload(String upload) {
- this.upload = upload;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getDetailAddress() {
- return detailAddress;
- }
-
- public void setDetailAddress(String detailAddress) {
- this.detailAddress = detailAddress;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TCompany{" +
- "id=" + id +
- ", isSpe=" + isSpe +
- ", isTaxi=" + isTaxi +
- ", isCross=" + isCross +
- ", isCrossLogistics=" + isCrossLogistics +
- ", isSameLogistics=" + isSameLogistics +
- ", isCharter=" + isCharter +
- ", isSpeFixedOrProportional=" + isSpeFixedOrProportional +
- ", isTaxiFixedOrProportional=" + isTaxiFixedOrProportional +
- ", isCrossLogisticsFixedOrProportional=" + isCrossLogisticsFixedOrProportional +
- ", isSameLogisticsFixedOrProportional=" + isSameLogisticsFixedOrProportional +
- ", speMoney=" + speMoney +
- ", taxiMoney=" + taxiMoney +
- ", crossLogisticsMoney=" + crossLogisticsMoney +
- ", sameLogisticsMoney=" + sameLogisticsMoney +
- ", isNeedFerry=" + isNeedFerry +
- ", name=" + name +
- ", type=" + type +
- ", superiorId=" + superiorId +
- ", principalName=" + principalName +
- ", principalPhone=" + principalPhone +
- ", adminName=" + adminName +
- ", adminPhone=" + adminPhone +
- ", urgentPhoen=" + urgentPhoen +
- ", setupTime=" + setupTime +
- ", identifier=" + identifier +
- ", addressCode=" + addressCode +
- ", businessScope=" + businessScope +
- ", contactAddress=" + contactAddress +
- ", documentAddress=" + documentAddress +
- ", economicType=" + economicType +
- ", regCapital=" + regCapital +
- ", legalName=" + legalName +
- ", legalId=" + legalId +
- ", legalPhone=" + legalPhone +
- ", legalPhotoUrl=" + legalPhotoUrl +
- ", licensingAgency=" + licensingAgency +
- ", licenseTime=" + licenseTime +
- ", licenseStartTime=" + licenseStartTime +
- ", licenseEndTime=" + licenseEndTime +
- ", licenseNumber=" + licenseNumber +
- ", carNum=" + carNum +
- ", driverNum=" + driverNum +
- ", mac=" + mac +
- ", state=" + state +
- ", flag=" + flag +
- ", upload=" + upload +
- ", insertTime=" + insertTime +
- ", detailAddress=" + detailAddress +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompanyCity.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompanyCity.java
deleted file mode 100644
index 7f052a3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCompanyCity.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 公司经营地区
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-06
- */
-@TableName("t_company_city")
-public class TCompanyCity extends Model<TCompanyCity> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 省Code
- */
- private Integer provinceCode;
- /**
- * 市Code
- */
- private Integer cityCode;
- /**
- * 区Code
- */
- private Integer areaCode;
- /**
- * 1=正常，2=删除
- */
- private Integer state;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(Integer provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public Integer getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(Integer cityCode) {
- this.cityCode = cityCode;
- }
-
- public Integer getAreaCode() {
- return areaCode;
- }
-
- public void setAreaCode(Integer areaCode) {
- this.areaCode = areaCode;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TCompanyCity{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", provinceCode=" + provinceCode +
- ", cityCode=" + cityCode +
- ", areaCode=" + areaCode +
- ", state=" + state +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TComplaint.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TComplaint.java
deleted file mode 100644
index cdc444a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TComplaint.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 投诉管理
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_complaint")
-public class TComplaint extends Model<TComplaint> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户Id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 投诉原因
- */
-
- @TableField("reason")
- private String reason;
- /**
- * 被投诉人Id
- */
- @TableField("driverId")
- private Long driverId;
- /**
- * 描述
- */
- @TableField("description")
- private String description;
- /**
- * 是否处理（0：未处理，1：已处理）
- */
- @TableField("isHandle")
- private Integer isHandle;
- /**
- * 投诉时间
- */
- @TableField("insert_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 处理结果
- */
- @TableField("handleResult")
- private String handleResult;
- /**
- * 处理人id
- */
- @TableField("handleUserId")
- private Integer handleUserId;
- /**
- * 处理时间
- */
- @TableField("handleTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date handleTime;
-
- public Date getHandleTime() {
- return handleTime;
- }
-
- public void setHandleTime(Date handleTime) {
- this.handleTime = handleTime;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public Long getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Long driverId) {
- this.driverId = driverId;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Integer getIsHandle() {
- return isHandle;
- }
-
- public void setIsHandle(Integer isHandle) {
- this.isHandle = isHandle;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getHandleResult() {
- return handleResult;
- }
-
- public void setHandleResult(String handleResult) {
- this.handleResult = handleResult;
- }
-
- public Integer getHandleUserId() {
- return handleUserId;
- }
-
- public void setHandleUserId(Integer handleUserId) {
- this.handleUserId = handleUserId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TComplaint{" +
- "id=" + id +
- ", userId=" + userId +
- ", reason=" + reason +
- ", driverId=" + driverId +
- ", description=" + description +
- ", isHandle=" + isHandle +
- ", insertTime=" + insertTime +
- ", handleResult=" + handleResult +
- ", handleUserId=" + handleUserId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDispatch.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDispatch.java
deleted file mode 100644
index 62bdbcf..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDispatch.java
+++ /dev/null
@@ -1,177 +0,0 @@
-//package com.dsh.guns.modular.system.model;
-//
-//import com.baomidou.mybatisplus.annotation.TableName;
-//import com.baomidou.mybatisplus.extension.activerecord.Model;
-//
-//import java.util.Date;
-//import java.io.Serializable;
-//
-///**
-// * <p>
-// * 调度管理
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-01
-// */
-//@TableName("t_dispatch")
-//public class TDispatch extends Model<TDispatch> {
-//
-// private static final long serialVersionUID = 1L;
-//
-// /**
-// * 主键ID
-// */
-// private Integer id;
-// /**
-// * 添加时间
-// */
-// private Date insertTime;
-// /**
-// * 调度名称
-// */
-// private String name;
-// /**
-// * 所属分公司ID
-// */
-// private Integer companyId;
-// /**
-// * 加盟商ID
-// */
-// private Integer franchiseeId;
-// /**
-// * 联系电话
-// */
-// private String phone;
-// /**
-// * 登录账号
-// */
-// private String account;
-// /**
-// * 登录密码 加密方式:MD5 加盐:WL:x9#
-// */
-// private String password;
-// /**
-// * 添加用户ID
-// */
-// private Integer insertUserId;
-// /**
-// * 添加用户角色
-// */
-// private Integer insertUserRole;
-// /**
-// * 状态 1=正常 2=冻结 3=删除
-// */
-// private Integer state;
-//
-//
-// public Integer getId() {
-// return id;
-// }
-//
-// public void setId(Integer id) {
-// this.id = id;
-// }
-//
-// public Date getInsertTime() {
-// return insertTime;
-// }
-//
-// public void setInsertTime(Date insertTime) {
-// this.insertTime = insertTime;
-// }
-//
-// public String getName() {
-// return name;
-// }
-//
-// public void setName(String name) {
-// this.name = name;
-// }
-//
-// public Integer getCompanyId() {
-// return companyId;
-// }
-//
-// public void setCompanyId(Integer companyId) {
-// this.companyId = companyId;
-// }
-//
-// public Integer getFranchiseeId() {
-// return franchiseeId;
-// }
-//
-// public void setFranchiseeId(Integer franchiseeId) {
-// this.franchiseeId = franchiseeId;
-// }
-//
-// public String getPhone() {
-// return phone;
-// }
-//
-// public void setPhone(String phone) {
-// this.phone = phone;
-// }
-//
-// public String getAccount() {
-// return account;
-// }
-//
-// public void setAccount(String account) {
-// this.account = account;
-// }
-//
-// public String getPassword() {
-// return password;
-// }
-//
-// public void setPassword(String password) {
-// this.password = password;
-// }
-//
-// public Integer getInsertUserId() {
-// return insertUserId;
-// }
-//
-// public void setInsertUserId(Integer insertUserId) {
-// this.insertUserId = insertUserId;
-// }
-//
-// public Integer getInsertUserRole() {
-// return insertUserRole;
-// }
-//
-// public void setInsertUserRole(Integer insertUserRole) {
-// this.insertUserRole = insertUserRole;
-// }
-//
-// public Integer getState() {
-// return state;
-// }
-//
-// public void setState(Integer state) {
-// this.state = state;
-// }
-//
-// @Override
-// protected Serializable pkVal() {
-// return this.id;
-// }
-//
-// @Override
-// public String toString() {
-// return "TDispatch{" +
-// "id=" + id +
-// ", insertTime=" + insertTime +
-// ", name=" + name +
-// ", companyId=" + companyId +
-// ", franchiseeId=" + franchiseeId +
-// ", phone=" + phone +
-// ", account=" + account +
-// ", password=" + password +
-// ", insertUserId=" + insertUserId +
-// ", insertUserRole=" + insertUserRole +
-// ", state=" + state +
-// "}";
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriver.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriver.java
deleted file mode 100644
index e14b328..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriver.java
+++ /dev/null
@@ -1,937 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 司机表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-04
- */
-@TableName("t_driver")
-public class TDriver extends Model<TDriver> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 登录账号
- */
- @TableField("account")
- private String account;
- /**
- * 工号
- */
- @TableField("jobNumber")
- private String jobNumber;
- /**
- * 手机号
- */
- @TableField("phone")
- private String phone;
- /**
- * 密码
- */
- @TableField("password")
- private String password;
- /**
- * 姓名
- */
- @TableField("name")
- private String name;
- /**
- * 性别(1=男，2=女) 1:man 2:woman
- */
- @TableField("sex")
- private Integer sex;
- /**
- * 身份证号
- */
- @TableField("idCard")
- private String idCard;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 加盟商ID
- */
- @TableField("franchiseeId")
- private Integer franchiseeId;
- /**
- * 头像照片
- */
- @TableField("headImgUrl")
- private String headImgUrl;
- /**
- * 人脸识别照片
- */
- @TableField("faceImgUrl")
- private String faceImgUrl;
- /**
- * 身份证正面照片
- */
- @TableField("idCardImgUrl1")
- private String idCardImgUrl1;
- /**
- * 身份证背面照片
- */
- @TableField("idCardImgUrl2")
- private String idCardImgUrl2;
- /**
- * 网约车司机注册地行政区域
- */
- @TableField("placeOfEmployment")
- private String placeOfEmployment;
- /**
- * 生日
- */
- @TableField("birthday")
- private Date birthday;
- /**
- * 银行卡号
- */
- @TableField("bankCardNumber")
- private String bankCardNumber;
- /**
- * 国籍
- */
- @TableField("driverNationality")
- private String driverNationality;
- /**
- * 民族
- */
- @TableField("driverNation")
- private String driverNation;
- /**
- * 婚姻状况（1：未婚，2：已婚，3：离异）1:unmarried 2:married 3:devorce
- */
- @TableField("driverMaritalStatus")
- private Integer driverMaritalStatus;
- /**
- * 外语能力
- */
- @TableField("driverLanguageLevel")
- private String driverLanguageLevel;
- /**
- * 学历
- */
- @TableField("driverEducation")
- private String driverEducation;
- /**
- * 户口登记机关名称
- */
- @TableField("driverCensus")
- private String driverCensus;
- /**
- * 户口地址或常住地址
- */
- @TableField("driverAddress")
- private String driverAddress;
- /**
- * 通信地址
- */
- @TableField("driverContactAddress")
- private String driverContactAddress;
- /**
- * 驾龄
- */
- @TableField("driverAge")
- private Integer driverAge;
- /**
- * 驾驶证号
- */
- @TableField("driveCard")
- private String driveCard;
- /**
- * 驾驶证照片
- */
- @TableField("driveCardImgUrl")
- private String driveCardImgUrl;
- /**
- * 准驾车型
- */
- @TableField("driverType")
- private String driverType;
- /**
- * 初次领取驾驶证日期
- */
- @TableField("getDriverLicenseDate")
- private Date getDriverLicenseDate;
- /**
- * 驾驶证有效期限起
- */
- @TableField("driverLicenseOn")
- private Date driverLicenseOn;
- /**
- * 驾驶证有效期限止
- */
- @TableField("driverLicenseOff")
- private Date driverLicenseOff;
- /**
- * 是否巡游出租车驾驶员（0：否，1：是）0:N 1:Y
- */
- @TableField("taxiDriver")
- private Integer taxiDriver;
- /**
- * 出租车资格证号
- */
- @TableField("taxiAptitudeCard")
- private String taxiAptitudeCard;
- /**
- * 网约车资格证照片
- */
- @TableField("networkCarlssueImg")
- private String networkCarlssueImg;
- /**
- * 网络预约出租车驾驶员证发证机构
- */
- @TableField("networkCarlssueOrganization")
- private String networkCarlssueOrganization;
- /**
- * 资格证发证日期
- */
- @TableField("networkCarlssueDate")
- private Date networkCarlssueDate;
- /**
- * 初次认领资格证日期
- */
- @TableField("getNetworkCarProofDate")
- private Date getNetworkCarProofDate;
- /**
- * 资格证有效起始日期
- */
- @TableField("networkCarProofOn")
- private Date networkCarProofOn;
- /**
- * 资格证有效截至日期
- */
- @TableField("networkCarProofOff")
- private Date networkCarProofOff;
- /**
- * 报备日期
- */
- @TableField("registerDate")
- private Date registerDate;
- /**
- * 是否专职驾驶员（0：否，1：是）0:N 1:Y
- */
- @TableField("fullTimeDriver")
- private Integer fullTimeDriver;
- /**
- * 是否在驾驶员黑名单内（0：否，1：是） 0:N 1:Y
- */
- @TableField("inDriverBlacklist")
- private Integer inDriverBlacklist;
- /**
- * 服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
- * Service types (1: Online reserved taxi, 2: Regular taxi, 3: Private carpooling).
- */
- @TableField("commercialType")
- private Integer commercialType;
- /**
- * 驾驶员合同签署公司
- */
- @TableField("contractCompany")
- private String contractCompany;
- /**
- * 合同有效期起
- */
- @TableField("contractOn")
- private Date contractOn;
- /**
- * 合同有效期止
- */
- @TableField("contractOff")
- private Date contractOff;
- /**
- * 紧急联系人
- */
- @TableField("emergencyContact")
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- @TableField("emergencyContactPhone")
- private String emergencyContactPhone;
- /**
- * 紧急联系地址
- */
- @TableField("emergencyContactAddress")
- private String emergencyContactAddress;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- @TableField("isPlatCar")
- private Integer isPlatCar;
- /**
- * 司机管理车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 状态(1=待审核，2=正常，3=冻结，4=拒绝)
- * 1=Pending review, 2=Normal, 3=Frozen, 4=Rejected
- */
- @TableField("authState")
- private Integer authState;
- /**
- * 司机状态(1=离线，2=空闲，3=服务中) 1:outline ,2:leisure 3:in service
- */
- @TableField("state")
- private Integer state;
- /**
- * 1：创建，2：修改，3：删除
- */
- @TableField("flag")
- private String flag;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- @TableField("insertUser")
- private Integer insertUser;
- @TableField("updateTime")
- private Date updateTime;
- @TableField("updateUser")
- private Integer updateUser;
- /**
- * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- */
- @TableField("addType")
- private Integer addType;
- /**
- * 余额
- */
- @TableField("balance")
- private BigDecimal balance;
- /**
- * 业务总收入
- * @return
- */
-
- @TableField("businessMoney")
- private Double businessMoney;
- /**
- * 剩余未提现业务总收入
- * @return
- */
- @TableField("laveBusinessMoney")
- private Double laveBusinessMoney;
- /**
- * 添加司机的分公司/加盟商ID
- */
- @TableField("addObjectId")
- private Integer addObjectId;
-
- public BigDecimal getBalance() {
- return balance;
- }
-
- public void setBalance(BigDecimal balance) {
- this.balance = balance;
- }
-
- public Integer getAddObjectId() {
- return addObjectId;
- }
-
- public void setAddObjectId(Integer addObjectId) {
- this.addObjectId = addObjectId;
- }
-
- public Integer getFranchiseeId() {
- return franchiseeId;
- }
-
- public void setFranchiseeId(Integer franchiseeId) {
- this.franchiseeId = franchiseeId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getJobNumber() {
- return jobNumber;
- }
-
- public void setJobNumber(String jobNumber) {
- this.jobNumber = jobNumber;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getHeadImgUrl() {
- return headImgUrl;
- }
-
- public void setHeadImgUrl(String headImgUrl) {
- this.headImgUrl = headImgUrl;
- }
-
- public String getFaceImgUrl() {
- return faceImgUrl;
- }
-
- public void setFaceImgUrl(String faceImgUrl) {
- this.faceImgUrl = faceImgUrl;
- }
-
- public String getIdCardImgUrl1() {
- return idCardImgUrl1;
- }
-
- public void setIdCardImgUrl1(String idCardImgUrl1) {
- this.idCardImgUrl1 = idCardImgUrl1;
- }
-
- public String getIdCardImgUrl2() {
- return idCardImgUrl2;
- }
-
- public void setIdCardImgUrl2(String idCardImgUrl2) {
- this.idCardImgUrl2 = idCardImgUrl2;
- }
-
- public String getPlaceOfEmployment() {
- return placeOfEmployment;
- }
-
- public void setPlaceOfEmployment(String placeOfEmployment) {
- this.placeOfEmployment = placeOfEmployment;
- }
-
- public Date getBirthday() {
- return birthday;
- }
-
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
- }
-
- public String getBankCardNumber() {
- return bankCardNumber;
- }
-
- public void setBankCardNumber(String bankCardNumber) {
- this.bankCardNumber = bankCardNumber;
- }
-
- public String getDriverNationality() {
- return driverNationality;
- }
-
- public void setDriverNationality(String driverNationality) {
- this.driverNationality = driverNationality;
- }
-
- public String getDriverNation() {
- return driverNation;
- }
-
- public void setDriverNation(String driverNation) {
- this.driverNation = driverNation;
- }
-
- public Integer getDriverMaritalStatus() {
- return driverMaritalStatus;
- }
-
- public void setDriverMaritalStatus(Integer driverMaritalStatus) {
- this.driverMaritalStatus = driverMaritalStatus;
- }
-
- public String getDriverLanguageLevel() {
- return driverLanguageLevel;
- }
-
- public void setDriverLanguageLevel(String driverLanguageLevel) {
- this.driverLanguageLevel = driverLanguageLevel;
- }
-
- public String getDriverEducation() {
- return driverEducation;
- }
-
- public void setDriverEducation(String driverEducation) {
- this.driverEducation = driverEducation;
- }
-
- public String getDriverCensus() {
- return driverCensus;
- }
-
- public void setDriverCensus(String driverCensus) {
- this.driverCensus = driverCensus;
- }
-
- public String getDriverAddress() {
- return driverAddress;
- }
-
- public void setDriverAddress(String driverAddress) {
- this.driverAddress = driverAddress;
- }
-
- public String getDriverContactAddress() {
- return driverContactAddress;
- }
-
- public void setDriverContactAddress(String driverContactAddress) {
- this.driverContactAddress = driverContactAddress;
- }
-
- public Integer getDriverAge() {
- return driverAge;
- }
-
- public void setDriverAge(Integer driverAge) {
- this.driverAge = driverAge;
- }
-
- public String getDriveCard() {
- return driveCard;
- }
-
- public void setDriveCard(String driveCard) {
- this.driveCard = driveCard;
- }
-
- public String getDriveCardImgUrl() {
- return driveCardImgUrl;
- }
-
- public void setDriveCardImgUrl(String driveCardImgUrl) {
- this.driveCardImgUrl = driveCardImgUrl;
- }
-
- public String getDriverType() {
- return driverType;
- }
-
- public void setDriverType(String driverType) {
- this.driverType = driverType;
- }
-
- public Date getGetDriverLicenseDate() {
- return getDriverLicenseDate;
- }
-
- public void setGetDriverLicenseDate(Date getDriverLicenseDate) {
- this.getDriverLicenseDate = getDriverLicenseDate;
- }
-
- public Date getDriverLicenseOn() {
- return driverLicenseOn;
- }
-
- public void setDriverLicenseOn(Date driverLicenseOn) {
- this.driverLicenseOn = driverLicenseOn;
- }
-
- public Date getDriverLicenseOff() {
- return driverLicenseOff;
- }
-
- public void setDriverLicenseOff(Date driverLicenseOff) {
- this.driverLicenseOff = driverLicenseOff;
- }
-
- public Integer getTaxiDriver() {
- return taxiDriver;
- }
-
- public void setTaxiDriver(Integer taxiDriver) {
- this.taxiDriver = taxiDriver;
- }
-
- public String getTaxiAptitudeCard() {
- return taxiAptitudeCard;
- }
-
- public void setTaxiAptitudeCard(String taxiAptitudeCard) {
- this.taxiAptitudeCard = taxiAptitudeCard;
- }
-
- public String getNetworkCarlssueImg() {
- return networkCarlssueImg;
- }
-
- public void setNetworkCarlssueImg(String networkCarlssueImg) {
- this.networkCarlssueImg = networkCarlssueImg;
- }
-
- public String getNetworkCarlssueOrganization() {
- return networkCarlssueOrganization;
- }
-
- public void setNetworkCarlssueOrganization(String networkCarlssueOrganization) {
- this.networkCarlssueOrganization = networkCarlssueOrganization;
- }
-
- public Date getNetworkCarlssueDate() {
- return networkCarlssueDate;
- }
-
- public void setNetworkCarlssueDate(Date networkCarlssueDate) {
- this.networkCarlssueDate = networkCarlssueDate;
- }
-
- public Date getGetNetworkCarProofDate() {
- return getNetworkCarProofDate;
- }
-
- public void setGetNetworkCarProofDate(Date getNetworkCarProofDate) {
- this.getNetworkCarProofDate = getNetworkCarProofDate;
- }
-
- public Date getNetworkCarProofOn() {
- return networkCarProofOn;
- }
-
- public void setNetworkCarProofOn(Date networkCarProofOn) {
- this.networkCarProofOn = networkCarProofOn;
- }
-
- public Date getNetworkCarProofOff() {
- return networkCarProofOff;
- }
-
- public void setNetworkCarProofOff(Date networkCarProofOff) {
- this.networkCarProofOff = networkCarProofOff;
- }
-
- public Date getRegisterDate() {
- return registerDate;
- }
-
- public void setRegisterDate(Date registerDate) {
- this.registerDate = registerDate;
- }
-
- public Integer getFullTimeDriver() {
- return fullTimeDriver;
- }
-
- public void setFullTimeDriver(Integer fullTimeDriver) {
- this.fullTimeDriver = fullTimeDriver;
- }
-
- public Integer getInDriverBlacklist() {
- return inDriverBlacklist;
- }
-
- public void setInDriverBlacklist(Integer inDriverBlacklist) {
- this.inDriverBlacklist = inDriverBlacklist;
- }
-
- public Integer getCommercialType() {
- return commercialType;
- }
-
- public void setCommercialType(Integer commercialType) {
- this.commercialType = commercialType;
- }
-
- public String getContractCompany() {
- return contractCompany;
- }
-
- public void setContractCompany(String contractCompany) {
- this.contractCompany = contractCompany;
- }
-
- public Date getContractOn() {
- return contractOn;
- }
-
- public void setContractOn(Date contractOn) {
- this.contractOn = contractOn;
- }
-
- public Date getContractOff() {
- return contractOff;
- }
-
- public void setContractOff(Date contractOff) {
- this.contractOff = contractOff;
- }
-
- public String getEmergencyContact() {
- return emergencyContact;
- }
-
- public void setEmergencyContact(String emergencyContact) {
- this.emergencyContact = emergencyContact;
- }
-
- public String getEmergencyContactPhone() {
- return emergencyContactPhone;
- }
-
- public void setEmergencyContactPhone(String emergencyContactPhone) {
- this.emergencyContactPhone = emergencyContactPhone;
- }
-
- public String getEmergencyContactAddress() {
- return emergencyContactAddress;
- }
-
- public void setEmergencyContactAddress(String emergencyContactAddress) {
- this.emergencyContactAddress = emergencyContactAddress;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getIsPlatCar() {
- return isPlatCar;
- }
-
- public void setIsPlatCar(Integer isPlatCar) {
- this.isPlatCar = isPlatCar;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getAuthState() {
- return authState;
- }
-
- public void setAuthState(Integer authState) {
- this.authState = authState;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- public Integer getAddType() {
- return addType;
- }
-
- public void setAddType(Integer addType) {
- this.addType = addType;
- }
-
- public Double getLaveBusinessMoney() {
- return laveBusinessMoney;
- }
-
- public void setLaveBusinessMoney(Double laveBusinessMoney) {
- this.laveBusinessMoney = laveBusinessMoney;
- }
-
- public Double getBusinessMoney() {
- return businessMoney;
- }
-
- public void setBusinessMoney(Double businessMoney) {
- this.businessMoney = businessMoney;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TDriver{" +
- "id=" + id +
- ", account=" + account +
- ", jobNumber=" + jobNumber +
- ", phone=" + phone +
- ", password=" + password +
- ", name=" + name +
- ", sex=" + sex +
- ", idCard=" + idCard +
- ", companyId=" + companyId +
- ", headImgUrl=" + headImgUrl +
- ", faceImgUrl=" + faceImgUrl +
- ", idCardImgUrl1=" + idCardImgUrl1 +
- ", idCardImgUrl2=" + idCardImgUrl2 +
- ", placeOfEmployment=" + placeOfEmployment +
- ", birthday=" + birthday +
- ", bankCardNumber=" + bankCardNumber +
- ", driverNationality=" + driverNationality +
- ", driverNation=" + driverNation +
- ", driverMaritalStatus=" + driverMaritalStatus +
- ", driverLanguageLevel=" + driverLanguageLevel +
- ", driverEducation=" + driverEducation +
- ", driverCensus=" + driverCensus +
- ", driverAddress=" + driverAddress +
- ", driverContactAddress=" + driverContactAddress +
- ", driverAge=" + driverAge +
- ", driveCard=" + driveCard +
- ", driveCardImgUrl=" + driveCardImgUrl +
- ", driverType=" + driverType +
- ", getDriverLicenseDate=" + getDriverLicenseDate +
- ", driverLicenseOn=" + driverLicenseOn +
- ", driverLicenseOff=" + driverLicenseOff +
- ", taxiDriver=" + taxiDriver +
- ", taxiAptitudeCard=" + taxiAptitudeCard +
- ", networkCarlssueImg=" + networkCarlssueImg +
- ", networkCarlssueOrganization=" + networkCarlssueOrganization +
- ", networkCarlssueDate=" + networkCarlssueDate +
- ", getNetworkCarProofDate=" + getNetworkCarProofDate +
- ", networkCarProofOn=" + networkCarProofOn +
- ", networkCarProofOff=" + networkCarProofOff +
- ", registerDate=" + registerDate +
- ", fullTimeDriver=" + fullTimeDriver +
- ", inDriverBlacklist=" + inDriverBlacklist +
- ", commercialType=" + commercialType +
- ", contractCompany=" + contractCompany +
- ", contractOn=" + contractOn +
- ", contractOff=" + contractOff +
- ", emergencyContact=" + emergencyContact +
- ", emergencyContactPhone=" + emergencyContactPhone +
- ", emergencyContactAddress=" + emergencyContactAddress +
- ", remark=" + remark +
- ", isPlatCar=" + isPlatCar +
- ", carId=" + carId +
- ", authState=" + authState +
- ", state=" + state +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- ", addType=" + addType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverLine.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverLine.java
deleted file mode 100644
index 3efc106..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverLine.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 司机关联线路
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_driver_line")
-public class TDriverLine extends Model<TDriverLine> {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 线路id
- */
- private Integer lineId;
- /**
- * 创建时间
- */
- private Date createTime;
- /**
- * 添加时间【后台使用】
- */
- private String addTime;
-
- public String getAddTime() {
- return addTime;
- }
-
- public void setAddTime(String addTime) {
- this.addTime = addTime;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getLineId() {
- return lineId;
- }
-
- public void setLineId(Integer lineId) {
- this.lineId = lineId;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TDriverLine{" +
- "id=" + id +
- ", driverId=" + driverId +
- ", lineId=" + lineId +
- ", createTime=" + createTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverReqs.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverReqs.java
deleted file mode 100644
index 290f97d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverReqs.java
+++ /dev/null
@@ -1,935 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 司机表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-04
- */
-@TableName("t_driver")
-public class TDriverReqs extends Model<TDriverReqs> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 登录账号
- */
- @TableField("account")
- private String account;
- /**
- * 工号
- */
- @TableField("jobNumber")
- private String jobNumber;
- /**
- * 手机号
- */
- @TableField("phone")
- private String phone;
- /**
- * 密码
- */
- @TableField("password")
- private String password;
- /**
- * 姓名
- */
- @TableField("name")
- private String name;
- /**
- * 性别(1=男，2=女)1:man 2:woman
- */
- @TableField("sex")
- private Integer sex;
- /**
- * 身份证号
- */
- @TableField("idCard")
- private String idCard;
- /**
- * 公司id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 加盟商ID
- */
- @TableField("franchiseeId")
- private Integer franchiseeId;
- /**
- * 头像照片
- */
- @TableField("headImgUrl")
- private String headImgUrl;
- /**
- * 人脸识别照片
- */
- @TableField("faceImgUrl")
- private String faceImgUrl;
- /**
- * 身份证正面照片
- */
- @TableField("idCardImgUrl1")
- private String idCardImgUrl1;
- /**
- * 身份证背面照片
- */
- @TableField("idCardImgUrl2")
- private String idCardImgUrl2;
- /**
- * 网约车司机注册地行政区域
- */
- @TableField("placeOfEmployment")
- private String placeOfEmployment;
- /**
- * 生日
- */
- @TableField("birthday")
- private String birthday;
- /**
- * 银行卡号
- */
- @TableField("bankCardNumber")
- private String bankCardNumber;
- /**
- * 国籍
- */
- @TableField("driverNationality")
- private String driverNationality;
- /**
- * 民族
- */
- @TableField("driverNation")
- private String driverNation;
- /**
- * 婚姻状况（1：未婚，2：已婚，3：离异）1:unmarried 2:married 3:devorce
- */
- @TableField("driverMaritalStatus")
- private Integer driverMaritalStatus;
- /**
- * 外语能力
- */
- @TableField("driverLanguageLevel")
- private String driverLanguageLevel;
- /**
- * 学历
- */
- @TableField("driverEducation")
- private String driverEducation;
- /**
- * 户口登记机关名称
- */
- @TableField("driverCensus")
- private String driverCensus;
- /**
- * 户口地址或常住地址
- */
- @TableField("driverAddress")
- private String driverAddress;
- /**
- * 通信地址
- */
- @TableField("driverContactAddress")
- private String driverContactAddress;
- /**
- * 驾龄
- */
- @TableField("driverAge")
- private Integer driverAge;
- /**
- * 驾驶证号
- */
- @TableField("driveCard")
- private String driveCard;
- /**
- * 驾驶证照片
- */
- @TableField("driveCardImgUrl")
- private String driveCardImgUrl;
- /**
- * 准驾车型
- */
- @TableField("driverType")
- private String driverType;
- /**
- * 初次领取驾驶证日期
- */
- @TableField("getDriverLicenseDate")
- private String getDriverLicenseDate;
- /**
- * 驾驶证有效期限起
- */
- @TableField("driverLicenseOn")
- private String driverLicenseOn;
- /**
- * 驾驶证有效期限止
- */
- @TableField("driverLicenseOff")
- private String driverLicenseOff;
- /**
- * 是否巡游出租车驾驶员（0：否，1：是）
- */
- @TableField("taxiDriver")
- private Integer taxiDriver;
- /**
- * 出租车资格证号
- */
- @TableField("taxiAptitudeCard")
- private String taxiAptitudeCard;
- /**
- * 网约车资格证照片
- */
- @TableField("networkCarlssueImg")
- private String networkCarlssueImg;
- /**
- * 网络预约出租车驾驶员证发证机构
- */
- @TableField("networkCarlssueOrganization")
- private String networkCarlssueOrganization;
- /**
- * 资格证发证日期
- */
- @TableField("networkCarlssueDate")
- private String networkCarlssueDate;
- /**
- * 初次认领资格证日期
- */
- @TableField("getNetworkCarProofDate")
- private String getNetworkCarProofDate;
- /**
- * 资格证有效起始日期
- */
- @TableField("networkCarProofOn")
- private String networkCarProofOn;
- /**
- * 资格证有效截至日期
- */
- @TableField("networkCarProofOff")
- private String networkCarProofOff;
- /**
- * 报备日期
- */
- @TableField("registerDate")
- private String registerDate;
- /**
- * 是否专职驾驶员（0：否，1：是）
- */
- @TableField("fullTimeDriver")
- private Integer fullTimeDriver;
- /**
- * 是否在驾驶员黑名单内（0：否，1：是）
- */
- @TableField("inDriverBlacklist")
- private Integer inDriverBlacklist;
- /**
- *
- */
- @TableField("commercialType")
- private Integer commercialType;
- /**
- * 驾驶员合同签署公司
- */
- @TableField("contractCompany")
- private String contractCompany;
- /**
- * 合同有效期起
- */
- @TableField("contractOn")
- private String contractOn;
- /**
- * 合同有效期止
- */
- @TableField("contractOff")
- private String contractOff;
- /**
- * 紧急联系人
- */
- @TableField("emergencyContact")
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- @TableField("emergencyContactPhone")
- private String emergencyContactPhone;
- /**
- * 紧急联系地址
- */
- @TableField("emergencyContactAddress")
- private String emergencyContactAddress;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 是否是平台车辆(1=是，2=否) 1:Y 2:N
- */
- @TableField("isPlatCar")
- private Integer isPlatCar;
- /**
- * 司机管理车辆id
- */
- @TableField("carId")
- private Integer carId;
- /**
- * 状态(1=待审核，2=正常，3=冻结，4=拒绝)
- 1=Pending review, 2=Normal, 3=Frozen, 4=Rejected
- */
- @TableField("authState")
- private Integer authState;
- /**
- * 司机状态(1=离线，2=空闲，3=服务中) 1:outline ,2:leisure 3:in service
- */
- @TableField("state")
- private Integer state;
- /**
- * 1：创建，2：修改，3：删除
- */
- @TableField("flag")
- private String flag;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private String insertTime;
- @TableField("insertUser")
- private Integer insertUser;
- @TableField("updateTime")
- private String updateTime;
- @TableField("updateUser")
- private Integer updateUser;
- /**
- * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加
- * (1=Driver Registration 2=Platform Addition 3=Branch Office Addition 4=Franchisee Addition)
- */
- @TableField("addType")
- private Integer addType;
- /**
- * 余额
- */
- @TableField("balance")
- private BigDecimal balance;
- /**
- * 业务总收入
- * @return
- */
-
- @TableField("businessMoney")
- private Double businessMoney;
- /**
- * 剩余未提现业务总收入
- * @return
- */
- @TableField("laveBusinessMoney")
- private Double laveBusinessMoney;
- /**
- * 添加司机的分公司/加盟商ID
- */
- @TableField("addObjectId")
- private Integer addObjectId;
-
- public BigDecimal getBalance() {
- return balance;
- }
-
- public void setBalance(BigDecimal balance) {
- this.balance = balance;
- }
-
- public Integer getAddObjectId() {
- return addObjectId;
- }
-
- public void setAddObjectId(Integer addObjectId) {
- this.addObjectId = addObjectId;
- }
-
- public Integer getFranchiseeId() {
- return franchiseeId;
- }
-
- public void setFranchiseeId(Integer franchiseeId) {
- this.franchiseeId = franchiseeId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getJobNumber() {
- return jobNumber;
- }
-
- public void setJobNumber(String jobNumber) {
- this.jobNumber = jobNumber;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getHeadImgUrl() {
- return headImgUrl;
- }
-
- public void setHeadImgUrl(String headImgUrl) {
- this.headImgUrl = headImgUrl;
- }
-
- public String getFaceImgUrl() {
- return faceImgUrl;
- }
-
- public void setFaceImgUrl(String faceImgUrl) {
- this.faceImgUrl = faceImgUrl;
- }
-
- public String getIdCardImgUrl1() {
- return idCardImgUrl1;
- }
-
- public void setIdCardImgUrl1(String idCardImgUrl1) {
- this.idCardImgUrl1 = idCardImgUrl1;
- }
-
- public String getIdCardImgUrl2() {
- return idCardImgUrl2;
- }
-
- public void setIdCardImgUrl2(String idCardImgUrl2) {
- this.idCardImgUrl2 = idCardImgUrl2;
- }
-
- public String getPlaceOfEmployment() {
- return placeOfEmployment;
- }
-
- public void setPlaceOfEmployment(String placeOfEmployment) {
- this.placeOfEmployment = placeOfEmployment;
- }
-
- public String getBirthday() {
- return birthday;
- }
-
- public void setBirthday(String birthday) {
- this.birthday = birthday;
- }
-
- public String getBankCardNumber() {
- return bankCardNumber;
- }
-
- public void setBankCardNumber(String bankCardNumber) {
- this.bankCardNumber = bankCardNumber;
- }
-
- public String getDriverNationality() {
- return driverNationality;
- }
-
- public void setDriverNationality(String driverNationality) {
- this.driverNationality = driverNationality;
- }
-
- public String getDriverNation() {
- return driverNation;
- }
-
- public void setDriverNation(String driverNation) {
- this.driverNation = driverNation;
- }
-
- public Integer getDriverMaritalStatus() {
- return driverMaritalStatus;
- }
-
- public void setDriverMaritalStatus(Integer driverMaritalStatus) {
- this.driverMaritalStatus = driverMaritalStatus;
- }
-
- public String getDriverLanguageLevel() {
- return driverLanguageLevel;
- }
-
- public void setDriverLanguageLevel(String driverLanguageLevel) {
- this.driverLanguageLevel = driverLanguageLevel;
- }
-
- public String getDriverEducation() {
- return driverEducation;
- }
-
- public void setDriverEducation(String driverEducation) {
- this.driverEducation = driverEducation;
- }
-
- public String getDriverCensus() {
- return driverCensus;
- }
-
- public void setDriverCensus(String driverCensus) {
- this.driverCensus = driverCensus;
- }
-
- public String getDriverAddress() {
- return driverAddress;
- }
-
- public void setDriverAddress(String driverAddress) {
- this.driverAddress = driverAddress;
- }
-
- public String getDriverContactAddress() {
- return driverContactAddress;
- }
-
- public void setDriverContactAddress(String driverContactAddress) {
- this.driverContactAddress = driverContactAddress;
- }
-
- public Integer getDriverAge() {
- return driverAge;
- }
-
- public void setDriverAge(Integer driverAge) {
- this.driverAge = driverAge;
- }
-
- public String getDriveCard() {
- return driveCard;
- }
-
- public void setDriveCard(String driveCard) {
- this.driveCard = driveCard;
- }
-
- public String getDriveCardImgUrl() {
- return driveCardImgUrl;
- }
-
- public void setDriveCardImgUrl(String driveCardImgUrl) {
- this.driveCardImgUrl = driveCardImgUrl;
- }
-
- public String getDriverType() {
- return driverType;
- }
-
- public void setDriverType(String driverType) {
- this.driverType = driverType;
- }
-
- public String getGetDriverLicenseDate() {
- return getDriverLicenseDate;
- }
-
- public void setGetDriverLicenseDate(String getDriverLicenseDate) {
- this.getDriverLicenseDate = getDriverLicenseDate;
- }
-
- public String getDriverLicenseOn() {
- return driverLicenseOn;
- }
-
- public void setDriverLicenseOn(String driverLicenseOn) {
- this.driverLicenseOn = driverLicenseOn;
- }
-
- public String getDriverLicenseOff() {
- return driverLicenseOff;
- }
-
- public void setDriverLicenseOff(String driverLicenseOff) {
- this.driverLicenseOff = driverLicenseOff;
- }
-
- public Integer getTaxiDriver() {
- return taxiDriver;
- }
-
- public void setTaxiDriver(Integer taxiDriver) {
- this.taxiDriver = taxiDriver;
- }
-
- public String getTaxiAptitudeCard() {
- return taxiAptitudeCard;
- }
-
- public void setTaxiAptitudeCard(String taxiAptitudeCard) {
- this.taxiAptitudeCard = taxiAptitudeCard;
- }
-
- public String getNetworkCarlssueImg() {
- return networkCarlssueImg;
- }
-
- public void setNetworkCarlssueImg(String networkCarlssueImg) {
- this.networkCarlssueImg = networkCarlssueImg;
- }
-
- public String getNetworkCarlssueOrganization() {
- return networkCarlssueOrganization;
- }
-
- public void setNetworkCarlssueOrganization(String networkCarlssueOrganization) {
- this.networkCarlssueOrganization = networkCarlssueOrganization;
- }
-
- public String getNetworkCarlssueDate() {
- return networkCarlssueDate;
- }
-
- public void setNetworkCarlssueDate(String networkCarlssueDate) {
- this.networkCarlssueDate = networkCarlssueDate;
- }
-
- public String getGetNetworkCarProofDate() {
- return getNetworkCarProofDate;
- }
-
- public void setGetNetworkCarProofDate(String getNetworkCarProofDate) {
- this.getNetworkCarProofDate = getNetworkCarProofDate;
- }
-
- public String getNetworkCarProofOn() {
- return networkCarProofOn;
- }
-
- public void setNetworkCarProofOn(String networkCarProofOn) {
- this.networkCarProofOn = networkCarProofOn;
- }
-
- public String getNetworkCarProofOff() {
- return networkCarProofOff;
- }
-
- public void setNetworkCarProofOff(String networkCarProofOff) {
- this.networkCarProofOff = networkCarProofOff;
- }
-
- public String getRegisterDate() {
- return registerDate;
- }
-
- public void setRegisterDate(String registerDate) {
- this.registerDate = registerDate;
- }
-
- public Integer getFullTimeDriver() {
- return fullTimeDriver;
- }
-
- public void setFullTimeDriver(Integer fullTimeDriver) {
- this.fullTimeDriver = fullTimeDriver;
- }
-
- public Integer getInDriverBlacklist() {
- return inDriverBlacklist;
- }
-
- public void setInDriverBlacklist(Integer inDriverBlacklist) {
- this.inDriverBlacklist = inDriverBlacklist;
- }
-
- public Integer getCommercialType() {
- return commercialType;
- }
-
- public void setCommercialType(Integer commercialType) {
- this.commercialType = commercialType;
- }
-
- public String getContractCompany() {
- return contractCompany;
- }
-
- public void setContractCompany(String contractCompany) {
- this.contractCompany = contractCompany;
- }
-
- public String getContractOn() {
- return contractOn;
- }
-
- public void setContractOn(String contractOn) {
- this.contractOn = contractOn;
- }
-
- public String getContractOff() {
- return contractOff;
- }
-
- public void setContractOff(String contractOff) {
- this.contractOff = contractOff;
- }
-
- public String getEmergencyContact() {
- return emergencyContact;
- }
-
- public void setEmergencyContact(String emergencyContact) {
- this.emergencyContact = emergencyContact;
- }
-
- public String getEmergencyContactPhone() {
- return emergencyContactPhone;
- }
-
- public void setEmergencyContactPhone(String emergencyContactPhone) {
- this.emergencyContactPhone = emergencyContactPhone;
- }
-
- public String getEmergencyContactAddress() {
- return emergencyContactAddress;
- }
-
- public void setEmergencyContactAddress(String emergencyContactAddress) {
- this.emergencyContactAddress = emergencyContactAddress;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getIsPlatCar() {
- return isPlatCar;
- }
-
- public void setIsPlatCar(Integer isPlatCar) {
- this.isPlatCar = isPlatCar;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getAuthState() {
- return authState;
- }
-
- public void setAuthState(Integer authState) {
- this.authState = authState;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public String getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(String insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public String getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(String updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- public Integer getAddType() {
- return addType;
- }
-
- public void setAddType(Integer addType) {
- this.addType = addType;
- }
-
- public Double getLaveBusinessMoney() {
- return laveBusinessMoney;
- }
-
- public void setLaveBusinessMoney(Double laveBusinessMoney) {
- this.laveBusinessMoney = laveBusinessMoney;
- }
-
- public Double getBusinessMoney() {
- return businessMoney;
- }
-
- public void setBusinessMoney(Double businessMoney) {
- this.businessMoney = businessMoney;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TDriver{" +
- "id=" + id +
- ", account=" + account +
- ", jobNumber=" + jobNumber +
- ", phone=" + phone +
- ", password=" + password +
- ", name=" + name +
- ", sex=" + sex +
- ", idCard=" + idCard +
- ", companyId=" + companyId +
- ", headImgUrl=" + headImgUrl +
- ", faceImgUrl=" + faceImgUrl +
- ", idCardImgUrl1=" + idCardImgUrl1 +
- ", idCardImgUrl2=" + idCardImgUrl2 +
- ", placeOfEmployment=" + placeOfEmployment +
- ", birthday=" + birthday +
- ", bankCardNumber=" + bankCardNumber +
- ", driverNationality=" + driverNationality +
- ", driverNation=" + driverNation +
- ", driverMaritalStatus=" + driverMaritalStatus +
- ", driverLanguageLevel=" + driverLanguageLevel +
- ", driverEducation=" + driverEducation +
- ", driverCensus=" + driverCensus +
- ", driverAddress=" + driverAddress +
- ", driverContactAddress=" + driverContactAddress +
- ", driverAge=" + driverAge +
- ", driveCard=" + driveCard +
- ", driveCardImgUrl=" + driveCardImgUrl +
- ", driverType=" + driverType +
- ", getDriverLicenseDate=" + getDriverLicenseDate +
- ", driverLicenseOn=" + driverLicenseOn +
- ", driverLicenseOff=" + driverLicenseOff +
- ", taxiDriver=" + taxiDriver +
- ", taxiAptitudeCard=" + taxiAptitudeCard +
- ", networkCarlssueImg=" + networkCarlssueImg +
- ", networkCarlssueOrganization=" + networkCarlssueOrganization +
- ", networkCarlssueDate=" + networkCarlssueDate +
- ", getNetworkCarProofDate=" + getNetworkCarProofDate +
- ", networkCarProofOn=" + networkCarProofOn +
- ", networkCarProofOff=" + networkCarProofOff +
- ", registerDate=" + registerDate +
- ", fullTimeDriver=" + fullTimeDriver +
- ", inDriverBlacklist=" + inDriverBlacklist +
- ", commercialType=" + commercialType +
- ", contractCompany=" + contractCompany +
- ", contractOn=" + contractOn +
- ", contractOff=" + contractOff +
- ", emergencyContact=" + emergencyContact +
- ", emergencyContactPhone=" + emergencyContactPhone +
- ", emergencyContactAddress=" + emergencyContactAddress +
- ", remark=" + remark +
- ", isPlatCar=" + isPlatCar +
- ", carId=" + carId +
- ", authState=" + authState +
- ", state=" + state +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- ", addType=" + addType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverService.java
deleted file mode 100644
index 674a505..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TDriverService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 司机经营业务
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_driver_service")
-public class TDriverService extends Model<TDriverService> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 类型(1=专车，4=小件物流-同城)
- Business types: (1=private car, 4=courier-same city)
- */
- private Integer type;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TDriverService{" +
- "id=" + id +
- ", driverId=" + driverId +
- ", type=" + type +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeFoundation.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeFoundation.java
deleted file mode 100644
index 9dd0404..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeFoundation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 保证收入基础时间段配置
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Data
-@ToString
-@TableName("t_ensure_income_foundation")
-public class TEnsureIncomeFoundation extends Model<TEnsureIncomeFoundation> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 保证收入id
- */
- @TableField(value = "ensureIncomeId")
- private Integer ensureIncomeId;
- /**
- * 时间段开始时间
- */
- @TableField(value = "startTime")
- private String startTime;
- /**
- * 时间段结束时间
- */
- @TableField(value = "endTime")
- private String endTime;
- /**
- * 保证收入金额
- */
- @TableField(value = "amount")
- private BigDecimal amount;
- /**
- * 创建时间
- */
- @TableField(value = "createTime")
- private Date createTime;
-
- /**
- * 累计在线时长
- */
- @TableField(value = "onLineTime")
- private Integer onLineTime;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeRule.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeRule.java
deleted file mode 100644
index 6c8d092..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeRule.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 保证收入
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Data
-@ToString
-@TableName("t_ensure_income_rule")
-public class TEnsureIncomeRule extends Model<TEnsureIncomeRule> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 规则名称
- */
- @TableField(value = "ruleName")
- @ApiModelProperty(value = "规则名称")
- private String ruleName;
- /**
- * 有效期开始时间
- */
- @TableField(value = "startTime")
- @ApiModelProperty(value = "有效期开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime startTime;
- /**
- * 有效期结束时间
- */
- @TableField(value = "endTime")
- @ApiModelProperty(value = "有效期结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime endTime;
- /**
- * 期间金额上限
- */
- @ApiModelProperty(value = "期间金额上限")
- @TableField(value = "periodAmount")
- private BigDecimal periodAmount;
- /**
- * 期间每月上限
- */
- @ApiModelProperty(value = "期间每月上限")
- @TableField(value = "periodMonthAmount")
- private BigDecimal periodMonthAmount;
- /**
- * 期间每天上限
- */
- @ApiModelProperty(value = "期间每天上限")
- @TableField(value = "periodDayAmount")
- private BigDecimal periodDayAmount;
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间")
- @TableField(value = "createTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime createTime;
- /**
- * 备注
- */
- @ApiModelProperty(value = "备注")
- @TableField(value = "remark")
- private String remark;
- /**
- * 状态 1未开始 2进行中 3已结束 4暂停中
- */
- @ApiModelProperty(value = "状态 1未开始 2进行中 3已结束 4暂停中")
- @TableField(value = "status")
- private Integer status;
-
- /**
- * 公司id
- */
- @ApiModelProperty(value = "公司id")
- @TableField(value = "companyId")
- private Integer companyId;
-
- /**
- * 审核状态 1待审核 2驳回 3通过
- */
- @ApiModelProperty(value = "审核状态 1待审核 2驳回 3通过")
- @TableField(value = "state")
- private Integer state;
-
-
- @ApiModelProperty(value = "有效期")
- @TableField(exist = false)
- private String expireTime;
-
- @TableField(exist = false)
- private String startTimeString;
- @TableField(exist = false)
- private String endTimeString;
-
- @TableField(exist = false)
- private Integer joinCount;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecial.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecial.java
deleted file mode 100644
index 9c5f200..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecial.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 特殊时间段基础规则配置
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@TableName("t_ensure_income_special")
-public class TEnsureIncomeSpecial extends Model<TEnsureIncomeSpecial> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 保证收入id
- */
- @TableField(value = "ensureIncomeId")
- private Integer ensureIncomeId;
- /**
- * 特殊时间段开始时间
- */
- @TableField(value = "startTime")
- private Date startTime;
- /**
- * 期间每天上限
- */
- @TableField(value = "periodDayAmount")
- private BigDecimal periodDayAmount;
- /**
- * 创建时间
- */
- @TableField(value = "createTime")
- private Date createTime;
-
- @TableField(exist = false)
- private List<TEnsureIncomeSpecialTimeSolt> specialTimeSoltList;
-
- @TableField(exist = false)
- private String startTimeString;
-
- public String getStartTimeString() {
- return startTimeString;
- }
-
- public void setStartTimeString(String startTimeString) {
- this.startTimeString = startTimeString;
- }
-
- public List<TEnsureIncomeSpecialTimeSolt> getSpecialTimeSoltList() {
- return specialTimeSoltList;
- }
-
- public void setSpecialTimeSoltList(List<TEnsureIncomeSpecialTimeSolt> specialTimeSoltList) {
- this.specialTimeSoltList = specialTimeSoltList;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getEnsureIncomeId() {
- return ensureIncomeId;
- }
-
- public void setEnsureIncomeId(Integer ensureIncomeId) {
- this.ensureIncomeId = ensureIncomeId;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public BigDecimal getPeriodDayAmount() {
- return periodDayAmount;
- }
-
- public void setPeriodDayAmount(BigDecimal periodDayAmount) {
- this.periodDayAmount = periodDayAmount;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TEnsureIncomeSpecial{" +
- "id=" + id +
- ", ensureIncomeId=" + ensureIncomeId +
- ", startTime=" + startTime +
- ", periodDayAmount=" + periodDayAmount +
- ", createTime=" + createTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecialTimeSolt.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecialTimeSolt.java
deleted file mode 100644
index c3232bd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TEnsureIncomeSpecialTimeSolt.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 特殊时间段配置时间配置
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Data
-@ToString
-@TableName("t_ensure_income_special_time_solt")
-public class TEnsureIncomeSpecialTimeSolt extends Model<TEnsureIncomeSpecialTimeSolt> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 特殊配置id
- */
- @TableField(value = "ensureIncomeSpecialId")
- private Integer ensureIncomeSpecialId;
- /**
- * 时间段开始时间
- */
- @TableField(value = "startTime")
- private String startTime;
- /**
- * 时间段结束时间
- */
- @TableField(value = "endTime")
- private String endTime;
- /**
- * 保证收入金额
- */
- @TableField(value = "amount")
- private BigDecimal amount;
- /**
- * 创建时间
- */
- @TableField(value = "createTime")
- private Date createTime;
-
- /**
- * 累计在线时长
- */
- @TableField(value = "onLineTime")
- private Integer onLineTime;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TFeedback.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TFeedback.java
deleted file mode 100644
index 6d0cf9d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TFeedback.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 反馈管理
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@TableName("t_feedback")
-public class TFeedback extends Model<TFeedback> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 反馈人ID
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 处理人Id
- */
- @TableField("handleUserId")
- private Integer handleUserId;
- /**
- * 反馈内容
- */
- @TableField("content")
- private String content;
- /**
- * 反馈时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 图片
- */
- @TableField("imgUrl")
- private String imgUrl;
- /**
- * 状态(1=正常,2=删除)1:normal 2:delete
- */
- @TableField("flag")
- private Integer flag;
- /**
- * 处理状态 1=未处理 2=已处理
- * 1=unprocessed 2=processed
- */
- @TableField("state")
- private Integer state;
- /**
- * 处理时间
- */
- @TableField("cldate")
- private Date cldate;
- /**
- * 处理备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 1=用户，2=司机
- * 1:user 2:driver
- */
- @TableField("type")
- private Integer type;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getHandleUserId() {
- return handleUserId;
- }
-
- public void setHandleUserId(Integer handleUserId) {
- this.handleUserId = handleUserId;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getImgUrl() {
- return imgUrl;
- }
-
- public void setImgUrl(String imgUrl) {
- this.imgUrl = imgUrl;
- }
-
- public Integer getFlag() {
- return flag;
- }
-
- public void setFlag(Integer flag) {
- this.flag = flag;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getCldate() {
- return cldate;
- }
-
- public void setCldate(Date cldate) {
- this.cldate = cldate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TFeedback{" +
- "id=" + id +
- ", userId=" + userId +
- ", handleUserId=" + handleUserId +
- ", content=" + content +
- ", insertTime=" + insertTime +
- ", imgUrl=" + imgUrl +
- ", flag=" + flag +
- ", state=" + state +
- ", cldate=" + cldate +
- ", remark=" + remark +
- ", type=" + type +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralGoods.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralGoods.java
deleted file mode 100644
index e0ef9b4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralGoods.java
+++ /dev/null
@@ -1,153 +0,0 @@
-//package com.dsh.guns.modular.system.model;
-//
-//import com.baomidou.mybatisplus.enums.IdType;
-//import java.util.Date;
-//import com.baomidou.mybatisplus.annotations.TableId;
-//import com.baomidou.mybatisplus.activerecord.Model;
-//import com.baomidou.mybatisplus.annotations.TableName;
-//import java.io.Serializable;
-//
-///**
-// * <p>
-// * 积分商品管理
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//@TableName("t_integral_goods")
-//public class TIntegralGoods extends Model<TIntegralGoods> {
-//
-// private static final long serialVersionUID = 1L;
-//
-// /**
-// * 主键ID
-// */
-// @TableId(value = "id", type = IdType.AUTO)
-// private Integer id;
-// /**
-// * 添加时间
-// */
-// private Date insertTime;
-// /**
-// * 商品名称
-// */
-// private String name;
-// /**
-// * 商品图片
-// */
-// private String imgUrl;
-// /**
-// * 兑换积分
-// */
-// private Integer integral;
-// /**
-// * 商品说明
-// */
-// private String instructions;
-// /**
-// * 状态 1=正常 2=已下架 3=删除
-// */
-// private Integer state;
-// /**
-// * 添加用户ID
-// */
-// private Integer insertUserId;
-// /**
-// * 添加用户角色
-// */
-// private Integer insertUserRole;
-//
-//
-// public Integer getId() {
-// return id;
-// }
-//
-// public void setId(Integer id) {
-// this.id = id;
-// }
-//
-// public Date getInsertTime() {
-// return insertTime;
-// }
-//
-// public void setInsertTime(Date insertTime) {
-// this.insertTime = insertTime;
-// }
-//
-// public String getName() {
-// return name;
-// }
-//
-// public void setName(String name) {
-// this.name = name;
-// }
-//
-// public String getImgUrl() {
-// return imgUrl;
-// }
-//
-// public void setImgUrl(String imgUrl) {
-// this.imgUrl = imgUrl;
-// }
-//
-// public Integer getIntegral() {
-// return integral;
-// }
-//
-// public void setIntegral(Integer integral) {
-// this.integral = integral;
-// }
-//
-// public String getInstructions() {
-// return instructions;
-// }
-//
-// public void setInstructions(String instructions) {
-// this.instructions = instructions;
-// }
-//
-// public Integer getState() {
-// return state;
-// }
-//
-// public void setState(Integer state) {
-// this.state = state;
-// }
-//
-// public Integer getInsertUserId() {
-// return insertUserId;
-// }
-//
-// public void setInsertUserId(Integer insertUserId) {
-// this.insertUserId = insertUserId;
-// }
-//
-// public Integer getInsertUserRole() {
-// return insertUserRole;
-// }
-//
-// public void setInsertUserRole(Integer insertUserRole) {
-// this.insertUserRole = insertUserRole;
-// }
-//
-// @Override
-// protected Serializable pkVal() {
-// return this.id;
-// }
-//
-// @Override
-// public String toString() {
-// return "TIntegralGoods{" +
-// "id=" + id +
-// ", insertTime=" + insertTime +
-// ", name=" + name +
-// ", imgUrl=" + imgUrl +
-// ", integral=" + integral +
-// ", instructions=" + instructions +
-// ", state=" + state +
-// ", insertUserId=" + insertUserId +
-// ", insertUserRole=" + insertUserRole +
-// "}";
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralOrder.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralOrder.java
deleted file mode 100644
index a6d0ea0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TIntegralOrder.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 积分订单管理
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-02
- */
-@TableName("t_integral_order")
-public class TIntegralOrder extends Model<TIntegralOrder> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 兑换时间
- */
- private Date insertTime;
- /**
- * 兑换用户ID
- */
- private Integer userId;
- /**
- * 兑换商品ID
- */
- private Integer goodsId;
- /**
- * 兑换数量
- */
- private Integer num;
- /**
- * 收货人
- */
- private String consigneeName;
- /**
- * 收货人联系电话
- */
- private String consigneePhone;
- /**
- * 收货人收货地址
- */
- private String consigneeAddress;
- /**
- * 备注
- */
- private String remark;
- /**
- * 状态 1=未处理 2=已处理 3=已删除
- * 1 = not processed 2 = processed 3 = deleted
- */
- private Integer state;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getGoodsId() {
- return goodsId;
- }
-
- public void setGoodsId(Integer goodsId) {
- this.goodsId = goodsId;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public String getConsigneeName() {
- return consigneeName;
- }
-
- public void setConsigneeName(String consigneeName) {
- this.consigneeName = consigneeName;
- }
-
- public String getConsigneePhone() {
- return consigneePhone;
- }
-
- public void setConsigneePhone(String consigneePhone) {
- this.consigneePhone = consigneePhone;
- }
-
- public String getConsigneeAddress() {
- return consigneeAddress;
- }
-
- public void setConsigneeAddress(String consigneeAddress) {
- this.consigneeAddress = consigneeAddress;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TIntegralOrder{" +
- "id=" + id +
- ", insertTime=" + insertTime +
- ", userId=" + userId +
- ", goodsId=" + goodsId +
- ", num=" + num +
- ", consigneeName=" + consigneeName +
- ", consigneePhone=" + consigneePhone +
- ", consigneeAddress=" + consigneeAddress +
- ", remark=" + remark +
- ", state=" + state +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TInvoice.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TInvoice.java
deleted file mode 100644
index 37ef579..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TInvoice.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 发票
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_invoice")
-public class TInvoice extends Model<TInvoice> {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- /**
- * 开票金额
- */
- private Double money;
- /**
- * 开票订单数量
- */
- private Integer orderNum;
- /**
- * 开票类型（1=个人发票，2=单位发票）
- */
- private Integer type;
- /**
- * 抬头名称（公司名称/个人姓名）
- */
- private String name;
- /**
- * 税号
- */
- private String code;
- /**
- * 发票内容
- */
- private String content;
- /**
- * 备注
- */
- private String remark;
- /**
- * 地址+电话
- */
- private String address;
- /**
- * 开户行+账号
- */
- private String bank;
- /**
- * 邮箱
- */
- private String email;
- /**
- * 开票用户id
- */
- private Integer userId;
- /**
- * 状态（1=待开票，2=成功，3=失败）
- */
- private Integer state;
- /**
- * 申请时间
- */
- private Date insertTime;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getBank() {
- return bank;
- }
-
- public void setBank(String bank) {
- this.bank = bank;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TInvoice{" +
- "id=" + id +
- ", money=" + money +
- ", orderNum=" + orderNum +
- ", type=" + type +
- ", name=" + name +
- ", code=" + code +
- ", content=" + content +
- ", remark=" + remark +
- ", address=" + address +
- ", bank=" + bank +
- ", email=" + email +
- ", userId=" + userId +
- ", state=" + state +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TLocation.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TLocation.java
deleted file mode 100644
index c06fdf0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TLocation.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 地点
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-04
- */
-@TableName("t_location")
-public class TLocation extends Model<TLocation> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 站点id
- */
- private Integer siteId;
- /**
- * 区域名称
- */
- private String name;
- /**
- * 地点类型（1=行政区域，2=电子围栏）
- */
- private Integer type;
- /**
- * 省名称
- */
- private String province;
- /**
- * 省编号
- */
- private String provinceCode;
- /**
- * 市名称
- */
- private String city;
- /**
- * 市编号
- */
- private String cityCode;
- /**
- * 区县名称
- */
- private String district;
- /**
- * 区县编号
- */
- private String districtCode;
- /**
- * 电子围栏坐标，多组以下划线分隔;
- */
- private String coordinate;
- /**
- * 电子围栏gid，多组以下划线分隔
- */
- private String gid;
- /**
- * 电子围栏更新时间
- */
- private Date updateTime;
- /**
- * 状态（1=正常，2=冻结，3=删除）1:normal 2:freeze 3:delete
- */
- private Integer state;
- /**
- * 添加时间
- */
- private Date insertTime;
- /**
- * 添加时间【后端使用】
- */
- private String addTime;
-
- public String getAddTime() {
- return addTime;
- }
-
- public void setAddTime(String addTime) {
- this.addTime = addTime;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getSiteId() {
- return siteId;
- }
-
- public void setSiteId(Integer siteId) {
- this.siteId = siteId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getProvince() {
- return province;
- }
-
- public void setProvince(String province) {
- this.province = province;
- }
-
- public String getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(String provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(String cityCode) {
- this.cityCode = cityCode;
- }
-
- public String getDistrict() {
- return district;
- }
-
- public void setDistrict(String district) {
- this.district = district;
- }
-
- public String getDistrictCode() {
- return districtCode;
- }
-
- public void setDistrictCode(String districtCode) {
- this.districtCode = districtCode;
- }
-
- public String getCoordinate() {
- return coordinate;
- }
-
- public void setCoordinate(String coordinate) {
- this.coordinate = coordinate;
- }
-
- public String getGid() {
- return gid;
- }
-
- public void setGid(String gid) {
- this.gid = gid;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TLocation{" +
- "id=" + id +
- ", siteId=" + siteId +
- ", name='" + name + '\'' +
- ", type=" + type +
- ", province='" + province + '\'' +
- ", provinceCode='" + provinceCode + '\'' +
- ", city='" + city + '\'' +
- ", cityCode='" + cityCode + '\'' +
- ", district='" + district + '\'' +
- ", districtCode='" + districtCode + '\'' +
- ", coordinate='" + coordinate + '\'' +
- ", gid='" + gid + '\'' +
- ", updateTime=" + updateTime +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", addTime='" + addTime + '\'' +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCity.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCity.java
deleted file mode 100644
index 7458151..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCity.java
+++ /dev/null
@@ -1,325 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 开通城市表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@TableName("t_open_city")
-public class TOpenCity extends Model<TOpenCity> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 城市code(6位)
- */
- @TableField("code")
- private String code;
- /**
- * 经度
- */
- @TableField("lon")
- private Double lon;
- /**
- * 纬度
- */
- @TableField("lat")
- private Double lat;
- /**
- * 是否需要网约车资格(1=是，2=否) 1:Y 2:N
- */
- @TableField("isQualifications")
- private Integer isQualifications;
- /**
- * 省份名称
- */
- @TableField("areaId")
- private Integer areaId;
- @TableField("areaName")
- private String areaName;
- /**
- * 市名称
- */
- @TableField("cityId")
- private Integer cityId;
- @TableField("cityName")
- private String cityName;
- /**
- * 区县名称
- */
- @TableField("provinceId")
- private Integer provinceId;
- @TableField("provinceName")
- private String provinceName;
- //中文名称
- @TableField("chineseName")
- private String chineseName;
- //英文名称
- @TableField("englishName")
- private String englishName;
- //印尼文名称
- @TableField("indonesianName")
- private String indonesianName;
- /**
- * 电子围栏坐标
- */
- @TableField("content")
- private String content;
- /**
- * 1：创建，2：修改，3：删除
- * 1:create 2:update 3:delete
- */
- @TableField("flag")
- private String flag;
- @TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- @TableField("insertUser")
- private Integer insertUser;
- @TableField("updateTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
- @TableField("updateUser")
- private Integer updateUser;
-
- @ApiModelProperty(value = "审核状态 1待审核 2驳回 3通过")
- @TableField("status")
- private Integer status;
-
- @ApiModelProperty(value = "上一条数据id")
- @TableField("superId")
- private Integer superId;
-
- /**
- * 备注
- */
- @TableField(value = "remark")
- private String remark;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public Integer getSuperId() {
- return superId;
- }
-
- public void setSuperId(Integer superId) {
- this.superId = superId;
- }
-
- public String getChineseName() {
- return chineseName;
- }
-
- public void setChineseName(String chineseName) {
- this.chineseName = chineseName;
- }
-
- public String getEnglishName() {
- return englishName;
- }
-
- public void setEnglishName(String englishName) {
- this.englishName = englishName;
- }
-
- public String getIndonesianName() {
- return indonesianName;
- }
-
- public void setIndonesianName(String indonesianName) {
- this.indonesianName = indonesianName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getAreaId() {
- return areaId;
- }
-
- public void setAreaId(Integer areaId) {
- this.areaId = areaId;
- }
-
- public Integer getCityId() {
- return cityId;
- }
-
- public void setCityId(Integer cityId) {
- this.cityId = cityId;
- }
-
- public Integer getProvinceId() {
- return provinceId;
- }
-
- public void setProvinceId(Integer provinceId) {
- this.provinceId = provinceId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public Double getLon() {
- return lon;
- }
-
- public void setLon(Double lon) {
- this.lon = lon;
- }
-
- public Double getLat() {
- return lat;
- }
-
- public void setLat(Double lat) {
- this.lat = lat;
- }
-
- public Integer getIsQualifications() {
- return isQualifications;
- }
-
- public void setIsQualifications(Integer isQualifications) {
- this.isQualifications = isQualifications;
- }
-
- public String getAreaName() {
- return areaName;
- }
-
- public void setAreaName(String areaName) {
- this.areaName = areaName;
- }
-
- public String getCityName() {
- return cityName;
- }
-
- public void setCityName(String cityName) {
- this.cityName = cityName;
- }
-
- public String getProvinceName() {
- return provinceName;
- }
-
- public void setProvinceName(String provinceName) {
- this.provinceName = provinceName;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOpenCity{" +
- "id=" + id +
- ", code=" + code +
- ", lon=" + lon +
- ", lat=" + lat +
- ", isQualifications=" + isQualifications +
- ", areaName=" + areaName +
- ", cityName=" + cityName +
- ", provinceName=" + provinceName +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCityBusiness.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCityBusiness.java
deleted file mode 100644
index e769414..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOpenCityBusiness.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 开通城市经营业务
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@TableName("t_open_city_business")
-public class TOpenCityBusiness extends Model<TOpenCityBusiness> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 开通城市id
- */
- @TableField("openCityId")
- private Integer openCityId;
- /**
- * 业务类型(1=专车，4=同城小件物流)
- */
- @TableField("businessType")
- private Integer businessType;
- /**
- * 排序
- */
- @TableField("sort")
- private Integer sort;
- /**
- * 1：创建，2：修改，3：删除
- */
- @TableField("flag")
- private String flag;
- @TableField("insertTime")
- private Date insertTime;
- @TableField("insertUser")
- private Integer insertUser;
- @TableField("updateTime")
- private Date updateTime;
- @TableField("updateUser")
- private Integer updateUser;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getOpenCityId() {
- return openCityId;
- }
-
- public void setOpenCityId(Integer openCityId) {
- this.openCityId = openCityId;
- }
-
- public Integer getBusinessType() {
- return businessType;
- }
-
- public void setBusinessType(Integer businessType) {
- this.businessType = businessType;
- }
-
- public Integer getSort() {
- return sort;
- }
-
- public void setSort(Integer sort) {
- this.sort = sort;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOpenCityBusiness{" +
- "id=" + id +
- ", openCityId=" + openCityId +
- ", businessType=" + businessType +
- ", sort=" + sort +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharter.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharter.java
deleted file mode 100644
index 541a249..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharter.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 包车订单
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-02
- */
-@TableName("t_order_charter")
-public class TOrderCharter extends Model<TOrderCharter> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 提交时间
- */
- private Date insertTime;
- /**
- * 用户ID
- */
- private Integer userId;
- /**
- * 用车时间
- */
- private Date useTime;
- /**
- * 用车时长
- */
- private String useDuration;
- /**
- * 用车需求
- */
- private String useDemand;
- /**
- * 联系人
- */
- private String contactName;
- /**
- * 联系电话
- */
- private String contactPhone;
- /**
- * 处理备注
- */
- private String remark;
- /**
- * 状态 1=未处理 2=已处理 3=已删除
- */
- private Integer state;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Date getUseTime() {
- return useTime;
- }
-
- public void setUseTime(Date useTime) {
- this.useTime = useTime;
- }
-
- public String getUseDuration() {
- return useDuration;
- }
-
- public void setUseDuration(String useDuration) {
- this.useDuration = useDuration;
- }
-
- public String getUseDemand() {
- return useDemand;
- }
-
- public void setUseDemand(String useDemand) {
- this.useDemand = useDemand;
- }
-
- public String getContactName() {
- return contactName;
- }
-
- public void setContactName(String contactName) {
- this.contactName = contactName;
- }
-
- public String getContactPhone() {
- return contactPhone;
- }
-
- public void setContactPhone(String contactPhone) {
- this.contactPhone = contactPhone;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderCharter{" +
- "id=" + id +
- ", insertTime=" + insertTime +
- ", userId=" + userId +
- ", useTime=" + useTime +
- ", useDuration=" + useDuration +
- ", useDemand=" + useDemand +
- ", contactName=" + contactName +
- ", contactPhone=" + contactPhone +
- ", remark=" + remark +
- ", state=" + state +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharteredCar.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharteredCar.java
deleted file mode 100644
index fdb6fd6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCharteredCar.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * <p>
- * 订单-包车
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-24
- */
-@TableName("t_order_chartered_car")
-public class TOrderCharteredCar extends Model<TOrderCharteredCar> {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 订单编号
- */
- private String orderNumber;
- /**
- * 出行时间
- */
- private Date traveltime;
- /**
- * 用车时长（天）
- */
- private Integer carTime;
- /**
- * 服务车型id
- */
- private Integer serverCarModelId;
- /**
- * 车型用途
- */
- private String modelUse;
- /**
- * 乘车人数
- */
- private Integer peopleNumber;
- /**
- * 联系人
- */
- private String contactPerson;
- /**
- * 联系电话
- */
- private String contactPhone;
- /**
- * 订单状态（1=待处理，2=已处理）
- */
- private Integer state;
- /**
- * 处理备注
- */
- private String remark;
- /**
- * 删除状态（1=否，2=是）1:N,2:Y
- */
- private Integer isDelete;
- /**
- * 添加时间
- */
- private Date insertTime;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getOrderNumber() {
- return orderNumber;
- }
-
- public void setOrderNumber(String orderNumber) {
- this.orderNumber = orderNumber;
- }
-
- public Date getTraveltime() {
- return traveltime;
- }
-
- public void setTraveltime(Date traveltime) {
- this.traveltime = traveltime;
- }
-
- public Integer getCarTime() {
- return carTime;
- }
-
- public void setCarTime(Integer carTime) {
- this.carTime = carTime;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- public String getModelUse() {
- return modelUse;
- }
-
- public void setModelUse(String modelUse) {
- this.modelUse = modelUse;
- }
-
- public Integer getPeopleNumber() {
- return peopleNumber;
- }
-
- public void setPeopleNumber(Integer peopleNumber) {
- this.peopleNumber = peopleNumber;
- }
-
- public String getContactPerson() {
- return contactPerson;
- }
-
- public void setContactPerson(String contactPerson) {
- this.contactPerson = contactPerson;
- }
-
- public String getContactPhone() {
- return contactPhone;
- }
-
- public void setContactPhone(String contactPhone) {
- this.contactPhone = contactPhone;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderCharteredCar{" +
- "id=" + id +
- ", userId=" + userId +
- ", companyId=" + companyId +
- ", orderNumber=" + orderNumber +
- ", traveltime=" + traveltime +
- ", carTime=" + carTime +
- ", serverCarModelId=" + serverCarModelId +
- ", modelUse=" + modelUse +
- ", peopleNumber=" + peopleNumber +
- ", contactPerson=" + contactPerson +
- ", contactPhone=" + contactPhone +
- ", state=" + state +
- ", remark=" + remark +
- ", isDelete=" + isDelete +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCrossCity.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCrossCity.java
deleted file mode 100644
index 0da0141..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderCrossCity.java
+++ /dev/null
@@ -1,824 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 订单-跨城
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-16
- */
-@TableName("t_order_cross_city")
-public class TOrderCrossCity extends Model<TOrderCrossCity> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 接单司机ID
- */
- private Integer driverId;
- /**
- * 线路id
- */
- private Integer lineId;
- /**
- * 预约班次的id
- */
- @TableField("lineShiftDriverId")
- private Integer lineShiftDriverId;
- /**
- * 车辆id
- */
- private Integer carId;
- /**
- * 服务车型id关联t_server_carmodel表
- */
- private Integer serverCarModelId;
- /**
- * 订单号
- */
- private String orderNum;
- /**
- * 下单地点经度
- */
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- private Double placementLat;
- /**
- * 下单地点
- */
- private String placementAddress;
- /**
- * 出发地经度值
- */
- private Double startLon;
- /**
- * 出发地纬度值
- */
- private Double startLat;
- /**
- * 目的地经度
- */
- private Double endLon;
- /**
- * 出发地地点
- */
- private String startAddress;
- /**
- * 目的地纬度
- */
- private Double endLat;
- /**
- * 目的地地点
- */
- private String endAddress;
- /**
- * 上车点经度
- */
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- private Double boardingLat;
- /**
- * 上车点
- */
- private String boardingAddress;
- /**
- * 上车时间
- */
- private Date boardingTime;
- /**
- * 下车点经度
- */
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- private Double getoffLat;
- /**
- * 下车地点
- */
- private String getoffAddress;
- /**
- * 下车时间
- */
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- * 1:OK 2:Other
- */
- private Integer payManner;
- /**
- * 支付方式(1=微信，2=支付宝，3=其他)
- * 1:wechat 2:alipay 3:other
- */
- private Integer payType;
- /**
- * 订单金额
- */
- private BigDecimal orderMoney;
- /**
- * 红包抵扣金额
- */
- private BigDecimal redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- private BigDecimal couponMoney;
- /**
- * 红包记录id
- */
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 折扣
- */
- private Double discount;
- /**
- * 折扣优惠金额
- */
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- private Integer activityId;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 支付金额
- */
- private BigDecimal payMoney;
- /**
- * 出行人数
- */
- @TableField("peopleNumber")
- private Integer peopleNumber;
- /**
- * 座位编号
- */
- @TableField("seatNumber")
- private String seatNumber;
- /**
- * 乘车人
- */
- private String passengers;
- /**
- * 乘车人电话
- */
- private String passengersPhone;
- /**
- * 排序
- */
- private Integer sort;
- /**
- * 下单时间
- */
- private Date insertTime;
- /**
- * 出行时间
- */
- private Date travelTime;
- /**
- * 抢单时间
- */
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- private Date endServiceTime;
- /**
- * 出行方式（1=拼车，2=包车）
- * 1=carpooling, 2=chartering
- */
- private Integer travelMode;
- /**
- * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
- 1:App 2:scan,3:mini program 3:driver 5:dispatch
- */
- private Integer orderSource;
- /**
- * 发票id
- */
- private Integer invoiceId;
- /**
- * 高德猎鹰上的轨迹id
- */
- private String trackId;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- private Integer state;
- /**
- * 是否是改派订单（1=否，2=是）1:N 2:Y
- */
- private Integer isReassign;
- /**
- * 是否删除 1=否 2=是1:N 2:Y
- */
- private Integer isDelete;
- /**
- * 状态(改派前订单状态)
- */
- private Integer oldState;
- /**
- * 移动小号
- */
- private String telX;
- /**
- * 移动小号绑定关系id
- */
- private String bindId;
-
- public Integer getOldState() {
- return oldState;
- }
-
- public void setOldState(Integer oldState) {
- this.oldState = oldState;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getLineId() {
- return lineId;
- }
-
- public void setLineId(Integer lineId) {
- this.lineId = lineId;
- }
-
- public Integer getLineShiftDriverId() {
- return lineShiftDriverId;
- }
-
- public void setLineShiftDriverId(Integer lineShiftDriverId) {
- this.lineShiftDriverId = lineShiftDriverId;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- public String getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum) {
- this.orderNum = orderNum;
- }
-
- public Double getPlacementLon() {
- return placementLon;
- }
-
- public void setPlacementLon(Double placementLon) {
- this.placementLon = placementLon;
- }
-
- public Double getPlacementLat() {
- return placementLat;
- }
-
- public void setPlacementLat(Double placementLat) {
- this.placementLat = placementLat;
- }
-
- public String getPlacementAddress() {
- return placementAddress;
- }
-
- public void setPlacementAddress(String placementAddress) {
- this.placementAddress = placementAddress;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public Double getEndLon() {
- return endLon;
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public Double getEndLat() {
- return endLat;
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public Double getBoardingLon() {
- return boardingLon;
- }
-
- public void setBoardingLon(Double boardingLon) {
- this.boardingLon = boardingLon;
- }
-
- public Double getBoardingLat() {
- return boardingLat;
- }
-
- public void setBoardingLat(Double boardingLat) {
- this.boardingLat = boardingLat;
- }
-
- public String getBoardingAddress() {
- return boardingAddress;
- }
-
- public void setBoardingAddress(String boardingAddress) {
- this.boardingAddress = boardingAddress;
- }
-
- public Date getBoardingTime() {
- return boardingTime;
- }
-
- public void setBoardingTime(Date boardingTime) {
- this.boardingTime = boardingTime;
- }
-
- public Double getGetoffLon() {
- return getoffLon;
- }
-
- public void setGetoffLon(Double getoffLon) {
- this.getoffLon = getoffLon;
- }
-
- public Double getGetoffLat() {
- return getoffLat;
- }
-
- public void setGetoffLat(Double getoffLat) {
- this.getoffLat = getoffLat;
- }
-
- public String getGetoffAddress() {
- return getoffAddress;
- }
-
- public void setGetoffAddress(String getoffAddress) {
- this.getoffAddress = getoffAddress;
- }
-
- public Date getGetoffTime() {
- return getoffTime;
- }
-
- public void setGetoffTime(Date getoffTime) {
- this.getoffTime = getoffTime;
- }
-
- public Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Integer getPayManner() {
- return payManner;
- }
-
- public void setPayManner(Integer payManner) {
- this.payManner = payManner;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public BigDecimal getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(BigDecimal orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public BigDecimal getRedPacketMoney() {
- return redPacketMoney;
- }
-
- public void setRedPacketMoney(BigDecimal redPacketMoney) {
- this.redPacketMoney = redPacketMoney;
- }
-
- public BigDecimal getCouponMoney() {
- return couponMoney;
- }
-
- public void setCouponMoney(BigDecimal couponMoney) {
- this.couponMoney = couponMoney;
- }
-
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Double getDiscountMoney() {
- return discountMoney;
- }
-
- public void setDiscountMoney(Double discountMoney) {
- this.discountMoney = discountMoney;
- }
-
- public Integer getActivityId() {
- return activityId;
- }
-
- public void setActivityId(Integer activityId) {
- this.activityId = activityId;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public BigDecimal getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(BigDecimal payMoney) {
- this.payMoney = payMoney;
- }
-
- public String getPassengers() {
- return passengers;
- }
-
- public void setPassengers(String passengers) {
- this.passengers = passengers;
- }
-
- public String getPassengersPhone() {
- return passengersPhone;
- }
-
- public void setPassengersPhone(String passengersPhone) {
- this.passengersPhone = passengersPhone;
- }
-
- public Integer getSort() {
- return sort;
- }
-
- public void setSort(Integer sort) {
- this.sort = sort;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(Date travelTime) {
- this.travelTime = travelTime;
- }
-
- public Date getSnatchOrderTime() {
- return snatchOrderTime;
- }
-
- public void setSnatchOrderTime(Date snatchOrderTime) {
- this.snatchOrderTime = snatchOrderTime;
- }
-
- public Date getSetOutTime() {
- return setOutTime;
- }
-
- public void setSetOutTime(Date setOutTime) {
- this.setOutTime = setOutTime;
- }
-
- public Date getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(Date arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public Date getStartServiceTime() {
- return startServiceTime;
- }
-
- public void setStartServiceTime(Date startServiceTime) {
- this.startServiceTime = startServiceTime;
- }
-
- public Date getEndServiceTime() {
- return endServiceTime;
- }
-
- public void setEndServiceTime(Date endServiceTime) {
- this.endServiceTime = endServiceTime;
- }
-
- public Integer getTravelMode() {
- return travelMode;
- }
-
- public void setTravelMode(Integer travelMode) {
- this.travelMode = travelMode;
- }
-
- public Integer getOrderSource() {
- return orderSource;
- }
-
- public void setOrderSource(Integer orderSource) {
- this.orderSource = orderSource;
- }
-
- public Integer getInvoiceId() {
- return invoiceId;
- }
-
- public void setInvoiceId(Integer invoiceId) {
- this.invoiceId = invoiceId;
- }
-
- public String getTrackId() {
- return trackId;
- }
-
- public void setTrackId(String trackId) {
- this.trackId = trackId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public String getTelX() {
- return telX;
- }
-
- public void setTelX(String telX) {
- this.telX = telX;
- }
-
- public String getBindId() {
- return bindId;
- }
-
- public void setBindId(String bindId) {
- this.bindId = bindId;
- }
-
- public Integer getIsReassign() {
- return isReassign;
- }
-
- public void setIsReassign(Integer isReassign) {
- this.isReassign = isReassign;
- }
-
- public Integer getPeopleNumber() {
- return peopleNumber;
- }
-
- public void setPeopleNumber(Integer peopleNumber) {
- this.peopleNumber = peopleNumber;
- }
-
- public String getSeatNumber() {
- return seatNumber;
- }
-
- public void setSeatNumber(String seatNumber) {
- this.seatNumber = seatNumber;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderCrossCity{" +
- "id=" + id +
- ", userId=" + userId +
- ", driverId=" + driverId +
- ", lineId=" + lineId +
- ", lineShiftDriverId=" + lineShiftDriverId +
- ", carId=" + carId +
- ", serverCarModelId=" + serverCarModelId +
- ", orderNum='" + orderNum + '\'' +
- ", placementLon=" + placementLon +
- ", placementLat=" + placementLat +
- ", placementAddress='" + placementAddress + '\'' +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", endLon=" + endLon +
- ", startAddress='" + startAddress + '\'' +
- ", endLat=" + endLat +
- ", endAddress='" + endAddress + '\'' +
- ", boardingLon=" + boardingLon +
- ", boardingLat=" + boardingLat +
- ", boardingAddress='" + boardingAddress + '\'' +
- ", boardingTime=" + boardingTime +
- ", getoffLon=" + getoffLon +
- ", getoffLat=" + getoffLat +
- ", getoffAddress='" + getoffAddress + '\'' +
- ", getoffTime=" + getoffTime +
- ", mileage=" + mileage +
- ", payManner=" + payManner +
- ", payType=" + payType +
- ", orderMoney=" + orderMoney +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", redPacketId=" + redPacketId +
- ", couponId=" + couponId +
- ", discount=" + discount +
- ", discountMoney=" + discountMoney +
- ", activityId=" + activityId +
- ", companyId=" + companyId +
- ", payMoney=" + payMoney +
- ", passengers='" + passengers + '\'' +
- ", passengersPhone='" + passengersPhone + '\'' +
- ", sort=" + sort +
- ", insertTime=" + insertTime +
- ", travelTime=" + travelTime +
- ", snatchOrderTime=" + snatchOrderTime +
- ", setOutTime=" + setOutTime +
- ", arriveTime=" + arriveTime +
- ", startServiceTime=" + startServiceTime +
- ", endServiceTime=" + endServiceTime +
- ", travelMode=" + travelMode +
- ", orderSource=" + orderSource +
- ", invoiceId=" + invoiceId +
- ", trackId='" + trackId + '\'' +
- ", state=" + state +
- ", isReassign=" + isReassign +
- ", isDelete=" + isDelete +
- ", oldState=" + oldState +
- ", telX='" + telX + '\'' +
- ", bindId='" + bindId + '\'' +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderEvaluate.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderEvaluate.java
deleted file mode 100644
index ae7890b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderEvaluate.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 订单评价
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_order_evaluate")
-public class TOrderEvaluate extends Model<TOrderEvaluate> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 订单id
- */
- private Long orderId;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 1=专车，4=同城小件物流
- */
- private Integer orderType;
- /**
- * 评分 0-5
- */
- private Double fraction;
- /**
- * 评价内容
- */
- private String content;
- /**
- * 评价时间
- */
- private Date insertTime;
- /**
- * 评价用户ID
- */
- private Integer userId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Double getFraction() {
- return fraction;
- }
-
- public void setFraction(Double fraction) {
- this.fraction = fraction;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderEvaluate{" +
- "id=" + id +
- ", orderId=" + orderId +
- ", driverId=" + driverId +
- ", orderType=" + orderType +
- ", fraction=" + fraction +
- ", content=" + content +
- ", insertTime=" + insertTime +
- ", userId=" + userId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderLogistics.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderLogistics.java
deleted file mode 100644
index c187f4e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderLogistics.java
+++ /dev/null
@@ -1,795 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 订单-小件物流
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-24
- */
-@TableName("t_order_logistics")
-public class TOrderLogistics extends Model<TOrderLogistics> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
- /**
- * 订单类型（4=同城物流，5=跨城物流）
- * 4:local-city logistics 5:cross-city logistics
- */
- private Integer type;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 接单司机ID
- */
- private Integer driverId;
- /**
- * 车辆id
- */
- private Integer carId;
- /**
- * 订单号
- */
- private String orderNum;
- /**
- * 货物类型（1=普通货物，2=贵重货物）1=Regular goods, 2=Valuable goods.
- */
- private Integer cargoName;
- /**
- * 货物数量
- */
- private Integer cargoNumber;
- /**
- * 备注
- */
- private String remark;
- /**
- * 下单地点经度
- */
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- private Double placementLat;
- /**
- * 下单地点
- */
- private String placementAddress;
- /**
- * 出发地经度值
- */
- private Double startLon;
- /**
- * 出发地纬度值
- */
- private Double startLat;
- /**
- * 出发地地点
- */
- private String startAddress;
- /**
- * 目的地经度
- */
- private Double endLon;
- /**
- * 目的地纬度
- */
- private Double endLat;
- /**
- * 目的地地点
- */
- private String endAddress;
- /**
- * 收件人姓名
- */
- private String recipient;
- /**
- * 收件人电话
- */
- private String recipientPhone;
- /**
- * 上车点经度
- */
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- private Double boardingLat;
- /**
- * 上车点
- */
- private String boardingAddress;
- /**
- * 上车时间
- */
- private Date boardingTime;
- /**
- * 下车点经度
- */
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- private Double getoffLat;
- /**
- * 下车地点
- */
- private String getoffAddress;
- /**
- * 下车时间
- */
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- * 1:OK 2:Other
- */
- private Integer payManner;
- /**
- * 支付方式(1=微信，2=支付宝，3=其他)
- * 1:wechat 2:alipay 3:other
- */
- private Integer payType;
- /**
- * 订单金额
- */
- private BigDecimal orderMoney;
- /**
- * 行程费
- */
- private BigDecimal travelMoney;
- /**
- * 小费
- */
- private BigDecimal tipMoney;
- /**
- * 红包抵扣金额
- */
- private BigDecimal redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- private BigDecimal couponMoney;
- /**
- * 红包记录id
- */
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 折扣
- */
- private Double discount;
- /**
- * 折扣优惠金额
- */
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- private Integer activityId;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 支付金额
- */
- private BigDecimal payMoney;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- private Integer state;
- /**
- * 下单时间
- */
- private Date insertTime;
- /**
- * 出行时间
- */
- private Date travelTime;
- /**
- * 抢单时间
- */
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- private Date endServiceTime;
- /**
- * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
- 1:App 2:scan,3:mini program 3:driver 5:dispatch
- */
- private Integer orderSource;
- /**
- * 发票id
- */
- private Integer invoiceId;
- /**
- * 高德猎鹰上的轨迹id
- */
- private String trackId;
- /**
- * 是否删除 1=否 2=是1:N 2:Y
- */
- private Integer isDelete;
- /**
- * 改派之前的订单状态
- */
- private Integer oldState;
- /**
- * 移动小号
- */
- private String telX;
- /**
- * 移动小号绑定关系id
- */
- private String bindId;
-
- public Integer getOldState() {
- return oldState;
- }
-
- public void setOldState(Integer oldState) {
- this.oldState = oldState;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public String getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum) {
- this.orderNum = orderNum;
- }
-
- public Integer getCargoType() {
- return cargoName;
- }
-
- public void setCargoType(Integer cargoName) {
- this.cargoName = cargoName;
- }
-
- public Integer getCargoNumber() {
- return cargoNumber;
- }
-
- public void setCargoNumber(Integer cargoNumber) {
- this.cargoNumber = cargoNumber;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Double getPlacementLon() {
- return placementLon;
- }
-
- public void setPlacementLon(Double placementLon) {
- this.placementLon = placementLon;
- }
-
- public Double getPlacementLat() {
- return placementLat;
- }
-
- public void setPlacementLat(Double placementLat) {
- this.placementLat = placementLat;
- }
-
- public String getPlacementAddress() {
- return placementAddress;
- }
-
- public void setPlacementAddress(String placementAddress) {
- this.placementAddress = placementAddress;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public Double getEndLon() {
- return endLon;
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon;
- }
-
- public Double getEndLat() {
- return endLat;
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public String getRecipient() {
- return recipient;
- }
-
- public void setRecipient(String recipient) {
- this.recipient = recipient;
- }
-
- public String getRecipientPhone() {
- return recipientPhone;
- }
-
- public void setRecipientPhone(String recipientPhone) {
- this.recipientPhone = recipientPhone;
- }
-
- public Double getBoardingLon() {
- return boardingLon;
- }
-
- public void setBoardingLon(Double boardingLon) {
- this.boardingLon = boardingLon;
- }
-
- public Double getBoardingLat() {
- return boardingLat;
- }
-
- public void setBoardingLat(Double boardingLat) {
- this.boardingLat = boardingLat;
- }
-
- public String getBoardingAddress() {
- return boardingAddress;
- }
-
- public void setBoardingAddress(String boardingAddress) {
- this.boardingAddress = boardingAddress;
- }
-
- public Date getBoardingTime() {
- return boardingTime;
- }
-
- public void setBoardingTime(Date boardingTime) {
- this.boardingTime = boardingTime;
- }
-
- public Double getGetoffLon() {
- return getoffLon;
- }
-
- public void setGetoffLon(Double getoffLon) {
- this.getoffLon = getoffLon;
- }
-
- public Double getGetoffLat() {
- return getoffLat;
- }
-
- public void setGetoffLat(Double getoffLat) {
- this.getoffLat = getoffLat;
- }
-
- public String getGetoffAddress() {
- return getoffAddress;
- }
-
- public void setGetoffAddress(String getoffAddress) {
- this.getoffAddress = getoffAddress;
- }
-
- public Date getGetoffTime() {
- return getoffTime;
- }
-
- public void setGetoffTime(Date getoffTime) {
- this.getoffTime = getoffTime;
- }
-
- public Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Integer getPayManner() {
- return payManner;
- }
-
- public void setPayManner(Integer payManner) {
- this.payManner = payManner;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public BigDecimal getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(BigDecimal orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public BigDecimal getTravelMoney() {
- return travelMoney;
- }
-
- public void setTravelMoney(BigDecimal travelMoney) {
- this.travelMoney = travelMoney;
- }
-
- public BigDecimal getTipMoney() {
- return tipMoney;
- }
-
- public void setTipMoney(BigDecimal tipMoney) {
- this.tipMoney = tipMoney;
- }
-
- public BigDecimal getRedPacketMoney() {
- return redPacketMoney;
- }
-
- public void setRedPacketMoney(BigDecimal redPacketMoney) {
- this.redPacketMoney = redPacketMoney;
- }
-
- public BigDecimal getCouponMoney() {
- return couponMoney;
- }
-
- public void setCouponMoney(BigDecimal couponMoney) {
- this.couponMoney = couponMoney;
- }
-
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Double getDiscountMoney() {
- return discountMoney;
- }
-
- public void setDiscountMoney(Double discountMoney) {
- this.discountMoney = discountMoney;
- }
-
- public Integer getActivityId() {
- return activityId;
- }
-
- public void setActivityId(Integer activityId) {
- this.activityId = activityId;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public BigDecimal getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(BigDecimal payMoney) {
- this.payMoney = payMoney;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(Date travelTime) {
- this.travelTime = travelTime;
- }
-
- public Date getSnatchOrderTime() {
- return snatchOrderTime;
- }
-
- public void setSnatchOrderTime(Date snatchOrderTime) {
- this.snatchOrderTime = snatchOrderTime;
- }
-
- public Date getSetOutTime() {
- return setOutTime;
- }
-
- public void setSetOutTime(Date setOutTime) {
- this.setOutTime = setOutTime;
- }
-
- public Date getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(Date arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public Date getStartServiceTime() {
- return startServiceTime;
- }
-
- public void setStartServiceTime(Date startServiceTime) {
- this.startServiceTime = startServiceTime;
- }
-
- public Date getEndServiceTime() {
- return endServiceTime;
- }
-
- public void setEndServiceTime(Date endServiceTime) {
- this.endServiceTime = endServiceTime;
- }
-
- public Integer getOrderSource() {
- return orderSource;
- }
-
- public void setOrderSource(Integer orderSource) {
- this.orderSource = orderSource;
- }
-
- public Integer getInvoiceId() {
- return invoiceId;
- }
-
- public void setInvoiceId(Integer invoiceId) {
- this.invoiceId = invoiceId;
- }
-
- public String getTrackId() {
- return trackId;
- }
-
- public void setTrackId(String trackId) {
- this.trackId = trackId;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public String getTelX() {
- return telX;
- }
-
- public void setTelX(String telX) {
- this.telX = telX;
- }
-
- public String getBindId() {
- return bindId;
- }
-
- public void setBindId(String bindId) {
- this.bindId = bindId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderLogistics{" +
- "id=" + id +
- ", type=" + type +
- ", userId=" + userId +
- ", driverId=" + driverId +
- ", carId=" + carId +
- ", orderNum=" + orderNum +
- ", cargoName=" + cargoName +
- ", cargoNumber=" + cargoNumber +
- ", remark=" + remark +
- ", placementLon=" + placementLon +
- ", placementLat=" + placementLat +
- ", placementAddress=" + placementAddress +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", startAddress=" + startAddress +
- ", endLon=" + endLon +
- ", endLat=" + endLat +
- ", endAddress=" + endAddress +
- ", recipient=" + recipient +
- ", recipientPhone=" + recipientPhone +
- ", boardingLon=" + boardingLon +
- ", boardingLat=" + boardingLat +
- ", boardingAddress=" + boardingAddress +
- ", boardingTime=" + boardingTime +
- ", getoffLon=" + getoffLon +
- ", getoffLat=" + getoffLat +
- ", getoffAddress=" + getoffAddress +
- ", getoffTime=" + getoffTime +
- ", mileage=" + mileage +
- ", payManner=" + payManner +
- ", payType=" + payType +
- ", orderMoney=" + orderMoney +
- ", travelMoney=" + travelMoney +
- ", tipMoney=" + tipMoney +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", redPacketId=" + redPacketId +
- ", couponId=" + couponId +
- ", discount=" + discount +
- ", discountMoney=" + discountMoney +
- ", activityId=" + activityId +
- ", companyId=" + companyId +
- ", payMoney=" + payMoney +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", travelTime=" + travelTime +
- ", snatchOrderTime=" + snatchOrderTime +
- ", setOutTime=" + setOutTime +
- ", arriveTime=" + arriveTime +
- ", startServiceTime=" + startServiceTime +
- ", endServiceTime=" + endServiceTime +
- ", orderSource=" + orderSource +
- ", invoiceId=" + invoiceId +
- ", trackId=" + trackId +
- ", isDelete=" + isDelete +
- ", telX=" + telX +
- ", bindId=" + bindId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPosition.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPosition.java
deleted file mode 100644
index 87da81a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPosition.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 订单坐标信息表
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-08
- */
-@TableName("t_order_position")
-public class TOrderPosition extends Model<TOrderPosition> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 订单类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- private Integer orderType;
- /**
- * 订单id
- */
- private Long orderId;
- /**
- * 司机id
- */
- private Integer driverId;
- /**
- * 经度
- */
- private String lon;
- /**
- * 纬度
- */
- private String lat;
- /**
- * 添加时间
- */
- private Date insertTime;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public String getLon() {
- return lon;
- }
-
- public void setLon(String lon) {
- this.lon = lon;
- }
-
- public String getLat() {
- return lat;
- }
-
- public void setLat(String lat) {
- this.lat = lat;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderPosition{" +
- "id=" + id +
- ", orderType=" + orderType +
- ", orderId=" + orderId +
- ", driverId=" + driverId +
- ", lon=" + lon +
- ", lat=" + lat +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPrivateCar.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPrivateCar.java
deleted file mode 100644
index 5901929..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderPrivateCar.java
+++ /dev/null
@@ -1,873 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 订单-专车
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-02
- */
-@TableName("t_order_private_car")
-public class TOrderPrivateCar extends Model<TOrderPrivateCar> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 类型（1=普通订单，2=摆渡订单）1=Regular order, 2=Shuttle order.
- */
- private Integer type;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 接单司机ID
- */
- private Integer driverId;
- /**
- * 车辆id
- */
- private Integer carId;
- /**
- * 订单号
- */
- private String orderNum;
- /**
- * 下单地点经度
- */
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- private Double placementLat;
- /**
- * 下单地点
- */
- private String placementAddress;
- /**
- * 出发地经度值
- */
- private Double startLon;
- /**
- * 出发地纬度值
- */
- private Double startLat;
- /**
- * 目的地经度
- */
- private Double endLon;
- /**
- * 出发地地点
- */
- private String startAddress;
- /**
- * 目的地纬度
- */
- private Double endLat;
- /**
- * 目的地地点
- */
- private String endAddress;
- /**
- * 上车点经度
- */
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- private Double boardingLat;
- /**
- * 上车点
- */
- private String boardingAddress;
- /**
- * 上车时间
- */
- private Date boardingTime;
- /**
- * 下车点经度
- */
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- private Double getoffLat;
- /**
- * 下车地点
- */
- private String getoffAddress;
- /**
- * 下车时间
- */
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- */
- private Integer payManner;
- /**
- * 支付方式(1=微信，2=支付宝，3=其他)
- */
- private Integer payType;
- /**
- * 订单金额
- */
- private BigDecimal orderMoney;
- /**
- * 起步价
- */
- private BigDecimal startMoney;
- /**
- * 里程费
- */
- private BigDecimal mileageMoney;
- /**
- * 时长费
- */
- private BigDecimal durationMoney;
- /**
- * 远途费
- */
- private BigDecimal longDistanceMoney;
- /**
- * 停车费
- */
- private BigDecimal parkMoney;
- /**
- * 过路费
- */
- private BigDecimal roadTollMoney;
- /**
- * 红包抵扣金额
- */
- private BigDecimal redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- private BigDecimal couponMoney;
- /**
- * 红包记录id
- */
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 折扣
- */
- private Double discount;
- /**
- * 折扣优惠金额
- */
- private Double discountMoney;
- /**
- * 折扣活动id
- */
- private Integer activityId;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 支付金额
- */
- private BigDecimal payMoney;
- /**
- * 是否是代下单（0：否，1：是）0:N 1:Y
- */
- private Integer substitute;
- /**
- * 乘车人
- */
- private String passengers;
- /**
- * 乘车人电话
- */
- private String passengersPhone;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- private Integer state;
- /**
- * 下单时间
- */
- private Date insertTime;
- /**
- * 出行时间
- */
- private Date travelTime;
- /**
- * 抢单时间
- */
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- private Date endServiceTime;
- /**
- * 订单类型(1=普通，2=预约)1:normal ,2:booking
- */
- private Integer orderType;
- /**
- * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
- 1:App 2:scan,3:mini program 3:driver 5:dispatch
- */
- private Integer orderSource;
- /**
- * 发票id
- */
- private Integer invoiceId;
- /**
- * 是否是改派单（1=否，2=是） 1:N 2:Y
- */
- private Integer isReassign;
- /**
- * 改派通知（0=没有改派，1=改派中，2=已改派）
- * 0=notDispatch 1=dispatching 2=dispatched
- */
- private Integer reassignNotice;
- /**
- * 高德猎鹰上的轨迹id
- */
- private String trackId;
- /**
- * 是否删除 1=否 2=是1:N 2:Y
- */
- private Integer isDelete;
- /**
- * 状态(改派前订单状态)
- */
- private Integer oldState;
- /**
- * 移动小号
- */
- private String telX;
- /**
- * 移动小号绑定关系id
- */
- private String bindId;
- /**
- * 专车车型ID 关联t_server_carmodel表
- */
- private Integer serverCarModelId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public String getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum) {
- this.orderNum = orderNum;
- }
-
- public Double getPlacementLon() {
- return placementLon;
- }
-
- public void setPlacementLon(Double placementLon) {
- this.placementLon = placementLon;
- }
-
- public Double getPlacementLat() {
- return placementLat;
- }
-
- public void setPlacementLat(Double placementLat) {
- this.placementLat = placementLat;
- }
-
- public String getPlacementAddress() {
- return placementAddress;
- }
-
- public void setPlacementAddress(String placementAddress) {
- this.placementAddress = placementAddress;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public Double getEndLon() {
- return endLon;
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public Double getEndLat() {
- return endLat;
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public Double getBoardingLon() {
- return boardingLon;
- }
-
- public void setBoardingLon(Double boardingLon) {
- this.boardingLon = boardingLon;
- }
-
- public Double getBoardingLat() {
- return boardingLat;
- }
-
- public void setBoardingLat(Double boardingLat) {
- this.boardingLat = boardingLat;
- }
-
- public String getBoardingAddress() {
- return boardingAddress;
- }
-
- public void setBoardingAddress(String boardingAddress) {
- this.boardingAddress = boardingAddress;
- }
-
- public Date getBoardingTime() {
- return boardingTime;
- }
-
- public void setBoardingTime(Date boardingTime) {
- this.boardingTime = boardingTime;
- }
-
- public Double getGetoffLon() {
- return getoffLon;
- }
-
- public void setGetoffLon(Double getoffLon) {
- this.getoffLon = getoffLon;
- }
-
- public Double getGetoffLat() {
- return getoffLat;
- }
-
- public void setGetoffLat(Double getoffLat) {
- this.getoffLat = getoffLat;
- }
-
- public String getGetoffAddress() {
- return getoffAddress;
- }
-
- public void setGetoffAddress(String getoffAddress) {
- this.getoffAddress = getoffAddress;
- }
-
- public Date getGetoffTime() {
- return getoffTime;
- }
-
- public void setGetoffTime(Date getoffTime) {
- this.getoffTime = getoffTime;
- }
-
- public Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Integer getPayManner() {
- return payManner;
- }
-
- public void setPayManner(Integer payManner) {
- this.payManner = payManner;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public BigDecimal getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(BigDecimal orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public BigDecimal getStartMoney() {
- return startMoney;
- }
-
- public void setStartMoney(BigDecimal startMoney) {
- this.startMoney = startMoney;
- }
-
- public BigDecimal getMileageMoney() {
- return mileageMoney;
- }
-
- public void setMileageMoney(BigDecimal mileageMoney) {
- this.mileageMoney = mileageMoney;
- }
-
- public BigDecimal getDurationMoney() {
- return durationMoney;
- }
-
- public void setDurationMoney(BigDecimal durationMoney) {
- this.durationMoney = durationMoney;
- }
-
- public BigDecimal getLongDistanceMoney() {
- return longDistanceMoney;
- }
-
- public void setLongDistanceMoney(BigDecimal longDistanceMoney) {
- this.longDistanceMoney = longDistanceMoney;
- }
-
- public BigDecimal getParkMoney() {
- return parkMoney;
- }
-
- public void setParkMoney(BigDecimal parkMoney) {
- this.parkMoney = parkMoney;
- }
-
- public BigDecimal getRoadTollMoney() {
- return roadTollMoney;
- }
-
- public void setRoadTollMoney(BigDecimal roadTollMoney) {
- this.roadTollMoney = roadTollMoney;
- }
-
- public BigDecimal getRedPacketMoney() {
- return redPacketMoney;
- }
-
- public void setRedPacketMoney(BigDecimal redPacketMoney) {
- this.redPacketMoney = redPacketMoney;
- }
-
- public BigDecimal getCouponMoney() {
- return couponMoney;
- }
-
- public void setCouponMoney(BigDecimal couponMoney) {
- this.couponMoney = couponMoney;
- }
-
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Double getDiscountMoney() {
- return discountMoney;
- }
-
- public void setDiscountMoney(Double discountMoney) {
- this.discountMoney = discountMoney;
- }
-
- public Integer getActivityId() {
- return activityId;
- }
-
- public void setActivityId(Integer activityId) {
- this.activityId = activityId;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public BigDecimal getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(BigDecimal payMoney) {
- this.payMoney = payMoney;
- }
-
- public Integer getSubstitute() {
- return substitute;
- }
-
- public void setSubstitute(Integer substitute) {
- this.substitute = substitute;
- }
-
- public String getPassengers() {
- return passengers;
- }
-
- public void setPassengers(String passengers) {
- this.passengers = passengers;
- }
-
- public String getPassengersPhone() {
- return passengersPhone;
- }
-
- public void setPassengersPhone(String passengersPhone) {
- this.passengersPhone = passengersPhone;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(Date travelTime) {
- this.travelTime = travelTime;
- }
-
- public Date getSnatchOrderTime() {
- return snatchOrderTime;
- }
-
- public void setSnatchOrderTime(Date snatchOrderTime) {
- this.snatchOrderTime = snatchOrderTime;
- }
-
- public Date getSetOutTime() {
- return setOutTime;
- }
-
- public void setSetOutTime(Date setOutTime) {
- this.setOutTime = setOutTime;
- }
-
- public Date getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(Date arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public Date getStartServiceTime() {
- return startServiceTime;
- }
-
- public void setStartServiceTime(Date startServiceTime) {
- this.startServiceTime = startServiceTime;
- }
-
- public Date getEndServiceTime() {
- return endServiceTime;
- }
-
- public void setEndServiceTime(Date endServiceTime) {
- this.endServiceTime = endServiceTime;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getOrderSource() {
- return orderSource;
- }
-
- public void setOrderSource(Integer orderSource) {
- this.orderSource = orderSource;
- }
-
- public Integer getInvoiceId() {
- return invoiceId;
- }
-
- public void setInvoiceId(Integer invoiceId) {
- this.invoiceId = invoiceId;
- }
-
- public Integer getIsReassign() {
- return isReassign;
- }
-
- public void setIsReassign(Integer isReassign) {
- this.isReassign = isReassign;
- }
-
- public Integer getReassignNotice() {
- return reassignNotice;
- }
-
- public void setReassignNotice(Integer reassignNotice) {
- this.reassignNotice = reassignNotice;
- }
-
- public String getTrackId() {
- return trackId;
- }
-
- public void setTrackId(String trackId) {
- this.trackId = trackId;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getOldState() {
- return oldState;
- }
-
- public void setOldState(Integer oldState) {
- this.oldState = oldState;
- }
-
- public String getTelX() {
- return telX;
- }
-
- public void setTelX(String telX) {
- this.telX = telX;
- }
-
- public String getBindId() {
- return bindId;
- }
-
- public void setBindId(String bindId) {
- this.bindId = bindId;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderPrivateCar{" +
- "id=" + id +
- ", type=" + type +
- ", userId=" + userId +
- ", driverId=" + driverId +
- ", carId=" + carId +
- ", orderNum=" + orderNum +
- ", placementLon=" + placementLon +
- ", placementLat=" + placementLat +
- ", placementAddress=" + placementAddress +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", endLon=" + endLon +
- ", startAddress=" + startAddress +
- ", endLat=" + endLat +
- ", endAddress=" + endAddress +
- ", boardingLon=" + boardingLon +
- ", boardingLat=" + boardingLat +
- ", boardingAddress=" + boardingAddress +
- ", boardingTime=" + boardingTime +
- ", getoffLon=" + getoffLon +
- ", getoffLat=" + getoffLat +
- ", getoffAddress=" + getoffAddress +
- ", getoffTime=" + getoffTime +
- ", mileage=" + mileage +
- ", payManner=" + payManner +
- ", payType=" + payType +
- ", orderMoney=" + orderMoney +
- ", startMoney=" + startMoney +
- ", mileageMoney=" + mileageMoney +
- ", durationMoney=" + durationMoney +
- ", longDistanceMoney=" + longDistanceMoney +
- ", parkMoney=" + parkMoney +
- ", roadTollMoney=" + roadTollMoney +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", redPacketId=" + redPacketId +
- ", couponId=" + couponId +
- ", discount=" + discount +
- ", discountMoney=" + discountMoney +
- ", activityId=" + activityId +
- ", companyId=" + companyId +
- ", payMoney=" + payMoney +
- ", substitute=" + substitute +
- ", passengers=" + passengers +
- ", passengersPhone=" + passengersPhone +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", travelTime=" + travelTime +
- ", snatchOrderTime=" + snatchOrderTime +
- ", setOutTime=" + setOutTime +
- ", arriveTime=" + arriveTime +
- ", startServiceTime=" + startServiceTime +
- ", endServiceTime=" + endServiceTime +
- ", orderType=" + orderType +
- ", orderSource=" + orderSource +
- ", invoiceId=" + invoiceId +
- ", isReassign=" + isReassign +
- ", reassignNotice=" + reassignNotice +
- ", trackId=" + trackId +
- ", isDelete=" + isDelete +
- ", oldState=" + oldState +
- ", telX=" + telX +
- ", bindId=" + bindId +
- ", serverCarModelId=" + serverCarModelId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderTaxi.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderTaxi.java
deleted file mode 100644
index 0c34342..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TOrderTaxi.java
+++ /dev/null
@@ -1,726 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 订单-出租车
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-08
- */
-@TableName("t_order_taxi")
-public class TOrderTaxi extends Model<TOrderTaxi> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 接单司机ID
- */
- private Integer driverId;
- /**
- * 车辆id
- */
- private Integer carId;
- /**
- * 订单号
- */
- private String orderNum;
- /**
- * 下单地点经度
- */
- private Double placementLon;
- /**
- * 下单地点纬度
- */
- private Double placementLat;
- /**
- * 下单地点
- */
- private String placementAddress;
- /**
- * 出发地经度值
- */
- private Double startLon;
- /**
- * 出发地纬度值
- */
- private Double startLat;
- /**
- * 目的地经度
- */
- private Double endLon;
- /**
- * 出发地地点
- */
- private String startAddress;
- /**
- * 目的地纬度
- */
- private Double endLat;
- /**
- * 目的地地点
- */
- private String endAddress;
- /**
- * 上车点经度
- */
- private Double boardingLon;
- /**
- * 上车点纬度
- */
- private Double boardingLat;
- /**
- * 上车点
- */
- private String boardingAddress;
- /**
- * 上车时间
- */
- private Date boardingTime;
- /**
- * 下车点经度
- */
- private Double getoffLon;
- /**
- * 下车点纬度
- */
- private Double getoffLat;
- /**
- * 下车地点
- */
- private String getoffAddress;
- /**
- * 下车时间
- */
- private Date getoffTime;
- /**
- * 行驶里程数（米）
- */
- private Double mileage;
- /**
- * 支付方式（1=OK平台支付，2=其他方式支付）
- */
- private Integer payManner;
- /**
- * 支付方式(1=微信，2=支付宝，3=其他)
- */
- private Integer payType;
- /**
- * 订单金额
- */
- private BigDecimal orderMoney;
- /**
- * 行程费
- */
- private BigDecimal travelMoney;
- /**
- * 停车费
- */
- private BigDecimal parkMoney;
- /**
- * 过路费
- */
- private BigDecimal roadTollMoney;
- /**
- * 小费
- */
- private BigDecimal tipMoney;
- /**
- * 红包抵扣金额
- */
- private BigDecimal redPacketMoney;
- /**
- * 优惠券抵扣金额
- */
- private BigDecimal couponMoney;
- /**
- * 红包记录id
- */
- private Integer redPacketId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 支付金额
- */
- private BigDecimal payMoney;
- /**
- * 是否是代下单（0：否，1：是）0:N 1:Y
- */
- private Integer substitute;
- /**
- * 乘车人
- */
- private String passengers;
- /**
- * 乘车人电话
- */
- private String passengersPhone;
- /**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)
- 1=Awaiting order acceptance, 2=Awaiting departure, 3=En route to appointment location, 4=Waiting for passenger to board, 5=In-service, 6=Service completed, 7=Awaiting payment, 8=Awaiting evaluation, 9=Service completed, 10=Cancelled, 11=In process of reassigning, 12=Waiting for cancellation payment
- */
- private Integer state;
- /**
- * 状态(改派前订单状态)
- */
- private Integer oldState;
- /**
- * 下单时间
- */
- private Date insertTime;
- /**
- * 出行时间
- */
- private Date travelTime;
- /**
- * 抢单时间
- */
- private Date snatchOrderTime;
- /**
- * 司机点出发时间
- */
- private Date setOutTime;
- /**
- * 司机到达预约地点时间
- */
- private Date arriveTime;
- /**
- * 开始服务时间
- */
- private Date startServiceTime;
- /**
- * 结束服务时间
- */
- private Date endServiceTime;
- /**
- * 订单类型(1=普通，2=预约)1:normal ,2:booking
- */
- private Integer orderType;
- /**
- * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
- 1:App 2:scan,3:mini program 3:driver 5:dispatch
- */
- private Integer orderSource;
- /**
- * 发票id
- */
- private Integer invoiceId;
- /**
- * 是否是改派单（1=否，2=是）1:N 2:Y
- */
- private Integer isReassign;
- /**
- * 是否删除 1=否 2=是1:N 2:Y
- */
- private Integer isDelete;
-
- public Integer getOldState() {
- return oldState;
- }
-
- public void setOldState(Integer oldState) {
- this.oldState = oldState;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getDriverId() {
- return driverId;
- }
-
- public void setDriverId(Integer driverId) {
- this.driverId = driverId;
- }
-
- public Integer getCarId() {
- return carId;
- }
-
- public void setCarId(Integer carId) {
- this.carId = carId;
- }
-
- public String getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum) {
- this.orderNum = orderNum;
- }
-
- public Double getPlacementLon() {
- return placementLon;
- }
-
- public void setPlacementLon(Double placementLon) {
- this.placementLon = placementLon;
- }
-
- public Double getPlacementLat() {
- return placementLat;
- }
-
- public void setPlacementLat(Double placementLat) {
- this.placementLat = placementLat;
- }
-
- public String getPlacementAddress() {
- return placementAddress;
- }
-
- public void setPlacementAddress(String placementAddress) {
- this.placementAddress = placementAddress;
- }
-
- public Double getStartLon() {
- return startLon;
- }
-
- public void setStartLon(Double startLon) {
- this.startLon = startLon;
- }
-
- public Double getStartLat() {
- return startLat;
- }
-
- public void setStartLat(Double startLat) {
- this.startLat = startLat;
- }
-
- public Double getEndLon() {
- return endLon;
- }
-
- public void setEndLon(Double endLon) {
- this.endLon = endLon;
- }
-
- public String getStartAddress() {
- return startAddress;
- }
-
- public void setStartAddress(String startAddress) {
- this.startAddress = startAddress;
- }
-
- public Double getEndLat() {
- return endLat;
- }
-
- public void setEndLat(Double endLat) {
- this.endLat = endLat;
- }
-
- public String getEndAddress() {
- return endAddress;
- }
-
- public void setEndAddress(String endAddress) {
- this.endAddress = endAddress;
- }
-
- public Double getBoardingLon() {
- return boardingLon;
- }
-
- public void setBoardingLon(Double boardingLon) {
- this.boardingLon = boardingLon;
- }
-
- public Double getBoardingLat() {
- return boardingLat;
- }
-
- public void setBoardingLat(Double boardingLat) {
- this.boardingLat = boardingLat;
- }
-
- public String getBoardingAddress() {
- return boardingAddress;
- }
-
- public void setBoardingAddress(String boardingAddress) {
- this.boardingAddress = boardingAddress;
- }
-
- public Date getBoardingTime() {
- return boardingTime;
- }
-
- public void setBoardingTime(Date boardingTime) {
- this.boardingTime = boardingTime;
- }
-
- public Double getGetoffLon() {
- return getoffLon;
- }
-
- public void setGetoffLon(Double getoffLon) {
- this.getoffLon = getoffLon;
- }
-
- public Double getGetoffLat() {
- return getoffLat;
- }
-
- public void setGetoffLat(Double getoffLat) {
- this.getoffLat = getoffLat;
- }
-
- public String getGetoffAddress() {
- return getoffAddress;
- }
-
- public void setGetoffAddress(String getoffAddress) {
- this.getoffAddress = getoffAddress;
- }
-
- public Date getGetoffTime() {
- return getoffTime;
- }
-
- public void setGetoffTime(Date getoffTime) {
- this.getoffTime = getoffTime;
- }
-
- public Double getMileage() {
- return mileage;
- }
-
- public void setMileage(Double mileage) {
- this.mileage = mileage;
- }
-
- public Integer getPayManner() {
- return payManner;
- }
-
- public void setPayManner(Integer payManner) {
- this.payManner = payManner;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public BigDecimal getOrderMoney() {
- return orderMoney;
- }
-
- public void setOrderMoney(BigDecimal orderMoney) {
- this.orderMoney = orderMoney;
- }
-
- public BigDecimal getTravelMoney() {
- return travelMoney;
- }
-
- public void setTravelMoney(BigDecimal travelMoney) {
- this.travelMoney = travelMoney;
- }
-
- public BigDecimal getParkMoney() {
- return parkMoney;
- }
-
- public void setParkMoney(BigDecimal parkMoney) {
- this.parkMoney = parkMoney;
- }
-
- public BigDecimal getRoadTollMoney() {
- return roadTollMoney;
- }
-
- public void setRoadTollMoney(BigDecimal roadTollMoney) {
- this.roadTollMoney = roadTollMoney;
- }
-
- public BigDecimal getTipMoney() {
- return tipMoney;
- }
-
- public void setTipMoney(BigDecimal tipMoney) {
- this.tipMoney = tipMoney;
- }
-
- public BigDecimal getRedPacketMoney() {
- return redPacketMoney;
- }
-
- public void setRedPacketMoney(BigDecimal redPacketMoney) {
- this.redPacketMoney = redPacketMoney;
- }
-
- public BigDecimal getCouponMoney() {
- return couponMoney;
- }
-
- public void setCouponMoney(BigDecimal couponMoney) {
- this.couponMoney = couponMoney;
- }
-
- public Integer getRedPacketId() {
- return redPacketId;
- }
-
- public void setRedPacketId(Integer redPacketId) {
- this.redPacketId = redPacketId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public BigDecimal getPayMoney() {
- return payMoney;
- }
-
- public void setPayMoney(BigDecimal payMoney) {
- this.payMoney = payMoney;
- }
-
- public Integer getSubstitute() {
- return substitute;
- }
-
- public void setSubstitute(Integer substitute) {
- this.substitute = substitute;
- }
-
- public String getPassengers() {
- return passengers;
- }
-
- public void setPassengers(String passengers) {
- this.passengers = passengers;
- }
-
- public String getPassengersPhone() {
- return passengersPhone;
- }
-
- public void setPassengersPhone(String passengersPhone) {
- this.passengersPhone = passengersPhone;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getTravelTime() {
- return travelTime;
- }
-
- public void setTravelTime(Date travelTime) {
- this.travelTime = travelTime;
- }
-
- public Date getSnatchOrderTime() {
- return snatchOrderTime;
- }
-
- public void setSnatchOrderTime(Date snatchOrderTime) {
- this.snatchOrderTime = snatchOrderTime;
- }
-
- public Date getSetOutTime() {
- return setOutTime;
- }
-
- public void setSetOutTime(Date setOutTime) {
- this.setOutTime = setOutTime;
- }
-
- public Date getArriveTime() {
- return arriveTime;
- }
-
- public void setArriveTime(Date arriveTime) {
- this.arriveTime = arriveTime;
- }
-
- public Date getStartServiceTime() {
- return startServiceTime;
- }
-
- public void setStartServiceTime(Date startServiceTime) {
- this.startServiceTime = startServiceTime;
- }
-
- public Date getEndServiceTime() {
- return endServiceTime;
- }
-
- public void setEndServiceTime(Date endServiceTime) {
- this.endServiceTime = endServiceTime;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getOrderSource() {
- return orderSource;
- }
-
- public void setOrderSource(Integer orderSource) {
- this.orderSource = orderSource;
- }
-
- public Integer getInvoiceId() {
- return invoiceId;
- }
-
- public void setInvoiceId(Integer invoiceId) {
- this.invoiceId = invoiceId;
- }
-
- public Integer getIsReassign() {
- return isReassign;
- }
-
- public void setIsReassign(Integer isReassign) {
- this.isReassign = isReassign;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TOrderTaxi{" +
- "id=" + id +
- ", userId=" + userId +
- ", driverId=" + driverId +
- ", carId=" + carId +
- ", orderNum=" + orderNum +
- ", placementLon=" + placementLon +
- ", placementLat=" + placementLat +
- ", placementAddress=" + placementAddress +
- ", startLon=" + startLon +
- ", startLat=" + startLat +
- ", endLon=" + endLon +
- ", startAddress=" + startAddress +
- ", endLat=" + endLat +
- ", endAddress=" + endAddress +
- ", boardingLon=" + boardingLon +
- ", boardingLat=" + boardingLat +
- ", boardingAddress=" + boardingAddress +
- ", boardingTime=" + boardingTime +
- ", getoffLon=" + getoffLon +
- ", getoffLat=" + getoffLat +
- ", getoffAddress=" + getoffAddress +
- ", getoffTime=" + getoffTime +
- ", mileage=" + mileage +
- ", payManner=" + payManner +
- ", payType=" + payType +
- ", orderMoney=" + orderMoney +
- ", travelMoney=" + travelMoney +
- ", parkMoney=" + parkMoney +
- ", roadTollMoney=" + roadTollMoney +
- ", tipMoney=" + tipMoney +
- ", redPacketMoney=" + redPacketMoney +
- ", couponMoney=" + couponMoney +
- ", redPacketId=" + redPacketId +
- ", couponId=" + couponId +
- ", companyId=" + companyId +
- ", payMoney=" + payMoney +
- ", substitute=" + substitute +
- ", passengers=" + passengers +
- ", passengersPhone=" + passengersPhone +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", travelTime=" + travelTime +
- ", snatchOrderTime=" + snatchOrderTime +
- ", setOutTime=" + setOutTime +
- ", arriveTime=" + arriveTime +
- ", startServiceTime=" + startServiceTime +
- ", endServiceTime=" + endServiceTime +
- ", orderType=" + orderType +
- ", orderSource=" + orderSource +
- ", invoiceId=" + invoiceId +
- ", isReassign=" + isReassign +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPhone.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPhone.java
deleted file mode 100644
index deca62d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPhone.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 系统电话设置
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_phone")
-public class TPhone extends Model<TPhone> {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- /**
- * 数据类型（1：报警电话，2：客服电话）
- * 1: Emergency phone number, 2: Customer service phone number
- */
- @TableField("type")
- private Integer type;
- /**
- * 是否是平台（1=是，2=否） 1:Y 2:N
- */
- @TableField("platform")
- private Integer platform;
- /**
- * 电话号码
- */
- @TableField("phone")
- private String phone;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getPlatform() {
- return platform;
- }
-
- public void setPlatform(Integer platform) {
- this.platform = platform;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TPhone{" +
- "id=" + id +
- ", type=" + type +
- ", platform=" + platform +
- ", phone=" + phone +
- ", companyId=" + companyId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPopularizeCode.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPopularizeCode.java
deleted file mode 100644
index 03d9920..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPopularizeCode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author administrator
- * @since 2023-04-17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_popularize_code")
-public class TPopularizeCode extends Model<TPopularizeCode> {
-
- private static final long serialVersionUID=1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 推广码
- */
- private Integer code;
-
- /**
- * 过期时间
- */
- private Date expire;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TProblem.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TProblem.java
deleted file mode 100644
index 8902328..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TProblem.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 在线客服
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-24
- */
-@TableName("t_problem")
-public class TProblem extends Model<TProblem> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 提问内容
- */
- @TableField("content")
- private String content;
- /**
- * 回答内容
- */
- @TableField("answer")
- private String answer;
- /**
- * 处理人id
- */
- @TableField("handleUserId")
- private Integer handleUserId;
- /**
- * 处理时间
- */
- @TableField("handleTime")
- private Date handleTime;
- /**
- * 提问时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 状态（1=待处理，2=已处理）
- */
- @TableField("state")
- private Integer state;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getAnswer() {
- return answer;
- }
-
- public void setAnswer(String answer) {
- this.answer = answer;
- }
-
- public Integer getHandleUserId() {
- return handleUserId;
- }
-
- public void setHandleUserId(Integer handleUserId) {
- this.handleUserId = handleUserId;
- }
-
- public Date getHandleTime() {
- return handleTime;
- }
-
- public void setHandleTime(Date handleTime) {
- this.handleTime = handleTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TProblem{" +
- "id=" + id +
- ", userId=" + userId +
- ", content=" + content +
- ", answer=" + answer +
- ", handleUserId=" + handleUserId +
- ", handleTime=" + handleTime +
- ", insertTime=" + insertTime +
- ", state=" + state +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubTransactionDetails.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubTransactionDetails.java
deleted file mode 100644
index ad412bf..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubTransactionDetails.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 交易明细(司机/用户)
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-16
- */
-@TableName("t_pub_transaction_details")
-public class TPubTransactionDetails extends Model<TPubTransactionDetails> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 创建时间
- */
- private Date insertTime;
- /**
- * 备注
- */
- private String remark;
- /**
- * 金额/积分
- */
- private BigDecimal money;
- /**
- * 状态(1=增加，2=减少)
- */
- private Integer state;
- /**
- * 类型(1=金额，2=积分)
- */
- private Integer type;
- /**
- * 类型(1=用户，2=司机)
- */
- private Integer userType;
- /**
- * 订单类型(1=专车，4=小件物流，5=余额充值)
- */
- private Integer orderType;
- /**
- * 订单id
- */
- private Long orderId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TPubTransactionDetails{" +
- "id=" + id +
- ", userId=" + userId +
- ", insertTime=" + insertTime +
- ", remark=" + remark +
- ", money=" + money +
- ", state=" + state +
- ", type=" + type +
- ", userType=" + userType +
- ", orderType=" + orderType +
- ", orderId=" + orderId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubWithdrawal.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubWithdrawal.java
deleted file mode 100644
index e427efc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TPubWithdrawal.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 提现记录表(司机/用户)
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Data
-@TableName("t_pub_withdrawal")
-public class TPubWithdrawal extends Model<TPubWithdrawal> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 处理时间
- */
- private Date handleTime;
- /**
- * 原钱包余额
- */
- private BigDecimal balance;
- /**
- * 提现金额
- */
- private BigDecimal money;
- /**
- * 状态(1=待处理，2=成功，3=失败)
- */
- private Integer state;
- /**
- * 备注
- */
- private String remark;
- /**
- * 银行名称
- */
- private String bankName;
- /**
- * 银行编号
- */
- private String bankCode;
- /**
- * 银行账号
- */
- private String code;
- /**
- * 账户持有人姓名 银行账户名称
- */
- private String name;
- /**
- * 用户类型(1=用户，2=司机)
- */
- private Integer userType;
- /**
- * 提现类型（1=活动收入提现，2=业务收入提现)
- */
- private Integer type;
- /**
- * 申请时间
- */
- private Date insertTime;
- /**
- * 1：创建，2：修改，3：删除
- */
- private Integer flag;
- /**
- * 提现方式 1=银行卡 2=线下
- */
- private Integer withdrawalType;
-
- private String serialNo;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Date getHandleTime() {
- return handleTime;
- }
-
- public void setHandleTime(Date handleTime) {
- this.handleTime = handleTime;
- }
-
- public BigDecimal getBalance() {
- return balance;
- }
-
- public void setBalance(BigDecimal balance) {
- this.balance = balance;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getFlag() {
- return flag;
- }
-
- public void setFlag(Integer flag) {
- this.flag = flag;
- }
-
- public Integer getWithdrawalType() {
- return withdrawalType;
- }
-
- public void setWithdrawalType(Integer withdrawalType) {
- this.withdrawalType = withdrawalType;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TPubWithdrawal{" +
- "id=" + id +
- ", userId=" + userId +
- ", handleTime=" + handleTime +
- ", balance=" + balance +
- ", money=" + money +
- ", state=" + state +
- ", remark=" + remark +
- ", code=" + code +
- ", name=" + name +
- ", userType=" + userType +
- ", insertTime=" + insertTime +
- ", flag=" + flag +
- ", withdrawalType=" + withdrawalType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TReassign.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TReassign.java
deleted file mode 100644
index 30e0c14..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TReassign.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 订单改派
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-03
- */
-@TableName("t_reassign")
-public class TReassign extends Model<TReassign> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 订单类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- private Integer orderType;
- /**
- * 订单id
- */
- private Long orderId;
- /**
- * 申请司机id
- */
- private Integer originalDriverId;
- /**
- * 原始车辆id
- */
- private Integer originalCarId;
- /**
- * 申请时间
- */
- private Date insertTime;
- /**
- * 改派后的司机id
- */
- private Integer nowDriverId;
- /**
- * 改派后的车辆id
- */
- private Integer nowCarId;
- /**
- * 改派支付金额
- */
- private Double money;
- /**
- * 改派支付方式（1=微信，2=支付宝，3=余额）
- * 1:wechat 2:alipay 3:balance
- */
- private Integer payType;
- /**
- * 支付完成时间
- */
- private Date payTime;
- /**
- * 第三方支付订单号
- */
- private String payOrder;
- /**
- * 1=提交申请，2=已支付，3=已改派，4=已取消，5=已拒绝
- * 1:applying 2:payment 3:dispatched 4:cancel 5:reject
- */
- private Integer state;
- /**
- * 改派原因
- */
- private String reason;
- /**
- * 备注
- */
- private String remark;
- /**
- * 处理人
- */
- @TableField("reviewer")
- private Integer reviewer;
- /**
- * 处理人类型（1=调度，2=后台管理员）
- */
- @TableField("reviewerType")
- private Integer reviewerType;
- /**
- * 改派完成时间
- */
- private Date completeTime;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOriginalDriverId() {
- return originalDriverId;
- }
-
- public void setOriginalDriverId(Integer originalDriverId) {
- this.originalDriverId = originalDriverId;
- }
-
- public Integer getOriginalCarId() {
- return originalCarId;
- }
-
- public void setOriginalCarId(Integer originalCarId) {
- this.originalCarId = originalCarId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getNowDriverId() {
- return nowDriverId;
- }
-
- public void setNowDriverId(Integer nowDriverId) {
- this.nowDriverId = nowDriverId;
- }
-
- public Integer getNowCarId() {
- return nowCarId;
- }
-
- public void setNowCarId(Integer nowCarId) {
- this.nowCarId = nowCarId;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Integer getPayType() {
- return payType;
- }
-
- public void setPayType(Integer payType) {
- this.payType = payType;
- }
-
- public Date getPayTime() {
- return payTime;
- }
-
- public void setPayTime(Date payTime) {
- this.payTime = payTime;
- }
-
- public String getPayOrder() {
- return payOrder;
- }
-
- public void setPayOrder(String payOrder) {
- this.payOrder = payOrder;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Date getCompleteTime() {
- return completeTime;
- }
-
- public void setCompleteTime(Date completeTime) {
- this.completeTime = completeTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- public Integer getReviewer() {
- return reviewer;
- }
-
- public void setReviewer(Integer reviewer) {
- this.reviewer = reviewer;
- }
-
- public Integer getReviewerType() {
- return reviewerType;
- }
-
- public void setReviewerType(Integer reviewerType) {
- this.reviewerType = reviewerType;
- }
-
- @Override
- public String toString() {
- return "TReassign{" +
- "id=" + id +
- ", orderType=" + orderType +
- ", orderId=" + orderId +
- ", originalDriverId=" + originalDriverId +
- ", originalCarId=" + originalCarId +
- ", insertTime=" + insertTime +
- ", nowDriverId=" + nowDriverId +
- ", nowCarId=" + nowCarId +
- ", money=" + money +
- ", payType=" + payType +
- ", payTime=" + payTime +
- ", payOrder=" + payOrder +
- ", state=" + state +
- ", reason=" + reason +
- ", remark=" + remark +
- ", completeTime=" + completeTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TRegion.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TRegion.java
deleted file mode 100644
index b00b780..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TRegion.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 省市区三级联动
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@TableName("t_region")
-public class TRegion extends Model<TRegion> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 城市名称
- */
- private String name;
- private String code;
- private String citycode;
- /**
- * 父级ID
- */
- @TableField("parent_id")
- private Integer parentId;
- /**
- * 英文名称
- */
- private String english;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getCitycode() {
- return citycode;
- }
-
- public void setCitycode(String citycode) {
- this.citycode = citycode;
- }
-
- public Integer getParentId() {
- return parentId;
- }
-
- public void setParentId(Integer parentId) {
- this.parentId = parentId;
- }
-
- public String getEnglish() {
- return english;
- }
-
- public void setEnglish(String english) {
- this.english = english;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TRegion{" +
- "id=" + id +
- ", name=" + name +
- ", code=" + code +
- ", citycode=" + citycode +
- ", parentId=" + parentId +
- ", english=" + english +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TServerCarmodel.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TServerCarmodel.java
deleted file mode 100644
index ce4a629..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TServerCarmodel.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 服务车型设置
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-@TableName("t_server_carmodel")
-public class TServerCarmodel extends Model<TServerCarmodel> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 业务类型（1=专车） 1 = Special vehicle
- */
- @TableField("type")
- private Integer type;
- /**
- * 车型名称
- */
- @TableField("name")
- private String name;
- /**
- * 车型图片
- */
- @TableField("img")
- private String img;
- /**
- * 包车价格（100-300）
- */
- @TableField("price")
- private String price;
- /**
- * 状态（1=正常，2=冻结，3=删除）1:normal 2:freeze 3:delete
- */
- @TableField("state")
- private Integer state;
-
- private String ename;
- private String yname;
-
- public String getEname() {
- return ename;
- }
-
- public void setEname(String ename) {
- this.ename = ename;
- }
-
- public String getYname() {
- return yname;
- }
-
- public void setYname(String yname) {
- this.yname = yname;
- }
-
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImg() {
- return img;
- }
-
- public void setImg(String img) {
- this.img = img;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TServerCarmodel{" +
- "id=" + id +
- ", type=" + type +
- ", name=" + name +
- ", img=" + img +
- ", state=" + state +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
deleted file mode 100644
index 7272eb9..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 线路站点
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-04
- */
-@TableName("t_site")
-public class TSite extends Model<TSite> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 站点名称
- */
- private String name;
- /**
- * 省名称
- */
- private String province;
- /**
- * 省编号
- */
- private String provinceCode;
- /**
- * 市名称
- */
- private String city;
- /**
- * 市编号
- */
- private String cityCode;
- /**
- * 区县名称
- */
- private String district;
- /**
- * 区县编号
- */
- private String districtCode;
- /**
- * 状态（1=正常，2=冻结，3=删除）1:normal 2:freeze 3:delete
- */
- private Integer state;
- /**
- * 添加时间
- */
- private Date insertTime;
- /**
- * 添加人id
- */
- private Integer insertUserId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getProvince() {
- return province;
- }
-
- public void setProvince(String province) {
- this.province = province;
- }
-
- public String getProvinceCode() {
- return provinceCode;
- }
-
- public void setProvinceCode(String provinceCode) {
- this.provinceCode = provinceCode;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(String cityCode) {
- this.cityCode = cityCode;
- }
-
- public String getDistrict() {
- return district;
- }
-
- public void setDistrict(String district) {
- this.district = district;
- }
-
- public String getDistrictCode() {
- return districtCode;
- }
-
- public void setDistrictCode(String districtCode) {
- this.districtCode = districtCode;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUserId() {
- return insertUserId;
- }
-
- public void setInsertUserId(Integer insertUserId) {
- this.insertUserId = insertUserId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSite{" +
- "id=" + id +
- ", name=" + name +
- ", province=" + province +
- ", provinceCode=" + provinceCode +
- ", city=" + city +
- ", cityCode=" + cityCode +
- ", district=" + district +
- ", districtCode=" + districtCode +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", insertUserId=" + insertUserId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSmsrecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSmsrecord.java
deleted file mode 100644
index c54bc54..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSmsrecord.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 验证码
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@TableName("t_smsrecord")
-public class TSmsrecord extends Model<TSmsrecord> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 类型：1=用户端注册/登录，2=用户端更换手机,3=用户端忘记密码，4=用户修改密码，5=司机注册，6=司机忘记密码，7=司机修改手机号，8=司机修改密码
- Type: 1=User registration/login, 2=User change phone, 3=User forgot password, 4=User change password, 5=Driver registration, 6=Driver forgot password, 7=Driver change phone number, 8=Driver change password.
- */
- private Integer type;
- /**
- * 电话
- */
- private String phone;
- /**
- * 验证码
- */
- private String code;
- /**
- * 短信内容
- */
- private String content;
- /**
- * 添加时间
- */
- private Date createTime;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSmsrecord{" +
- "id=" + id +
- ", type=" + type +
- ", phone=" + phone +
- ", code=" + code +
- ", content=" + content +
- ", createTime=" + createTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysCancleOrder.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysCancleOrder.java
deleted file mode 100644
index c6e5406..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysCancleOrder.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 系统设置-取消订单
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_sys_cancle_order")
-public class TSysCancleOrder extends Model<TSysCancleOrder> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 时间(分钟)
- */
- @TableField("minuteNum")
- private Integer minuteNum;
- /**
- * 金额
- */
- @TableField("money")
- private BigDecimal money;
- /**
- * 1=普通单取消，2=预约单取消
- */
- @TableField("type")
- private Integer type;
- /**
- * 1=专车
- */
- @TableField("orderType")
- private Integer orderType;
-
-
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getMinuteNum() {
- return minuteNum;
- }
-
- public void setMinuteNum(Integer minuteNum) {
- this.minuteNum = minuteNum;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysCancleOrder{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", minuteNum=" + minuteNum +
- ", money=" + money +
- ", type=" + type +
- ", orderType=" + orderType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysFaceDistinguish.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysFaceDistinguish.java
deleted file mode 100644
index bdb313e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysFaceDistinguish.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 系统设置-人脸识别
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_sys_face_distinguish")
-public class TSysFaceDistinguish extends Model<TSysFaceDistinguish> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 是否打开(1=是，2=否) 1:Y 2:N
- */
- @TableField("isOpen")
- private Integer isOpen;
- /**
- * 间隔分钟数
- */
- @TableField("minuteNum")
- private Integer minuteNum;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getIsOpen() {
- return isOpen;
- }
-
- public void setIsOpen(Integer isOpen) {
- this.isOpen = isOpen;
- }
-
- public Integer getMinuteNum() {
- return minuteNum;
- }
-
- public void setMinuteNum(Integer minuteNum) {
- this.minuteNum = minuteNum;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysFaceDistinguish{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", isOpen=" + isOpen +
- ", minuteNum=" + minuteNum +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysIntegral.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysIntegral.java
deleted file mode 100644
index fdba921..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysIntegral.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 系统设置-积分
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_sys_integral")
-public class TSysIntegral extends Model<TSysIntegral> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 积分
- */
- private Integer integral;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getIntegral() {
- return integral;
- }
-
- public void setIntegral(Integer integral) {
- this.integral = integral;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysIntegral{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", integral=" + integral +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysPushOrder.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysPushOrder.java
deleted file mode 100644
index 2250a72..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysPushOrder.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 系统设置-推单
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_sys_push_order")
-public class TSysPushOrder extends Model<TSysPushOrder> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 推单距离(公里)
- */
- @TableField("pushType")
- private Integer pushType;
- /**
- * 推单时间(秒)
- */
- @TableField("content")
- private String content;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getPushType() {
- return pushType;
- }
-
- public void setPushType(Integer pushType) {
- this.pushType = pushType;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- /**
- * 推单占所有司机百分比
- */
-// @TableField("driverProportion")
-// private Double driverProportion;
-// /**
-// * 1=第一轮，2=第二轮，3=第三轮
-// */
-// @TableField("type")
-// private Integer type;
-// /**
-// * 1=专车
-// */
-// @TableField("pushType")
-// private Integer pushType;
-
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysReformist.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysReformist.java
deleted file mode 100644
index b33a9cf..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysReformist.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 系统设置-改派
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_sys_reformist")
-public class TSysReformist extends Model<TSysReformist> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 金额
- */
- @TableField("money")
- private BigDecimal money;
- /**
- * 专车改派 1=否 2=是 1:N 2:Y
- */
- @TableField("isSpecialCar")
- private Integer isSpecialCar;
- /**
- * 出租车改派 1=否 2=是 1:N 2:Y
- */
- @TableField("isTaxiCar")
- private Integer isTaxiCar;
-
- public Integer getIsSpecialCar() {
- return isSpecialCar;
- }
-
- public void setIsSpecialCar(Integer isSpecialCar) {
- this.isSpecialCar = isSpecialCar;
- }
-
- public Integer getIsTaxiCar() {
- return isTaxiCar;
- }
-
- public void setIsTaxiCar(Integer isTaxiCar) {
- this.isTaxiCar = isTaxiCar;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysReformist{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", money=" + money +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSensitiveWords.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSensitiveWords.java
deleted file mode 100644
index a17b291..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSensitiveWords.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统设置-敏感词
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_sys_sensitive_words")
-public class TSysSensitiveWords extends Model<TSysSensitiveWords> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 创建时间
- */
- @TableField("createTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
- /**
- * 敏感词
- */
- @TableField("content")
- private String content;
-
- public Integer getLanguage() {
- return language;
- }
-
- public void setLanguage(Integer language) {
- this.language = language;
- }
-
- @TableField("language")
- private Integer language;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysSensitiveWords{" +
- "id=" + id +
- ", createTime=" + createTime +
- ", content=" + content +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSet.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSet.java
deleted file mode 100644
index 3316cd8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSysSet.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 系统设置-推单
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Data
-public class TSysSet {
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 推单时间(秒)
- */
- @TableField("content")
- private String content;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- /**
- * 推单占所有司机百分比
- */
-// @TableField("driverProportion")
-// private Double driverProportion;
-// /**
-// * 1=第一轮，2=第二轮，3=第三轮
-// */
-// @TableField("type")
-// private Integer type;
-// /**
-// * 1=专车
-// */
-// @TableField("pushType")
-// private Integer pushType;
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemNotice.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemNotice.java
deleted file mode 100644
index 664332d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemNotice.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统通知
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@TableName("t_system_notice")
-public class TSystemNotice extends Model<TSystemNotice> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 1=公告，2=系统消息
- */
- private Integer type;
- /**
- * 1=用户，2=司机
- */
- private Integer userType;
- /**
- * 公告id
- */
- private Integer noticesId;
- /**
- * 消息内容
- */
- private String content;
- /**
- * 接收对象id
- */
- private Integer userId;
- /**
- * 添加时间
- */
- private Date insertTime;
-
- public Integer getLanguage() {
- return language;
- }
-
- public void setLanguage(Integer language) {
- this.language = language;
- }
-
- /**
- * 1=未读，2=已读
- */
- private Integer read;
-
- private Integer language;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Integer getNoticesId() {
- return noticesId;
- }
-
- public void setNoticesId(Integer noticesId) {
- this.noticesId = noticesId;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getRead() {
- return read;
- }
-
- public void setRead(Integer read) {
- this.read = read;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSystemNotice{" +
- "id=" + id +
- ", type=" + type +
- ", userType=" + userType +
- ", noticesId=" + noticesId +
- ", content=" + content +
- ", userId=" + userId +
- ", insertTime=" + insertTime +
- ", read=" + read +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPrice.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPrice.java
deleted file mode 100644
index 391021d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPrice.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 服务价格规则
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-@TableName("t_system_price")
-public class TSystemPrice extends Model<TSystemPrice> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
-
- private Integer id;
- /**
- * 业务类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 2=taxi, 3=inter-city, 4=courier-same city, 5=courier-intercity, 6=chartered)
- */
- @TableField("type")
- private Integer type;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 服务车型id
- */
- @TableField("serverCarModelId")
- private Integer serverCarModelId;
- @TableField("orderType")
- private Integer orderType;
- @TableField("userType")
- private Integer userType;
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- @TableField("cityId")
- private Integer cityId;
-
- @TableField("openCityId")
- private Integer openCityId;
-
- public Integer getOpenCityId() {
- return openCityId;
- }
-
- public void setOpenCityId(Integer openCityId) {
- this.openCityId = openCityId;
- }
-
- public Integer getCityId() {
- return cityId;
- }
-
- public void setCityId(Integer cityId) {
- this.cityId = cityId;
- }
-
- /**
- * 价格规则，每个输入框为一个参数{"num1":1,"num2":2.3}
- */
- @TableField("content")
- private String content;
- /**
- * 运价类型说明
- */
- @TableField("fareTypeNote")
- private String fareTypeNote;
- /**
- * 状态（1=正常，2=冻结，3=删除）1:normal 2:freeze 3:delete
- */
- @TableField("state")
- private Integer state;
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getFareTypeNote() {
- return fareTypeNote;
- }
-
- public void setFareTypeNote(String fareTypeNote) {
- this.fareTypeNote = fareTypeNote;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSystemPrice{" +
- "id=" + id +
- ", type=" + type +
- ", companyId=" + companyId +
- ", serverCarModelId=" + serverCarModelId +
- ", content='" + content + '\'' +
- ", fareTypeNote='" + fareTypeNote + '\'' +
- ", state=" + state +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPriceService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPriceService.java
deleted file mode 100644
index ac1c349..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSystemPriceService.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 服务价格规则
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-@TableName("t_system_price_check")
-public class TSystemPriceService extends Model<TSystemPriceService> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
-
- private Integer id;
- /**
- * 业务类型（1=专车，4=小件物流-同城）
- Business types: (1=private car, 4=courier-same city)
- */
- @TableField("type")
- private Integer type;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- @TableField("userType")
- private Integer userType;
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- /**
- * 服务车型id
- */
- @TableField("serverCarModelId")
- private Integer serverCarModelId;
- /**
- * 价格规则，每个输入框为一个参数{"num1":1,"num2":2.3}
- */
- @TableField("content")
- private String content;
- @TableField("cityId")
- private Integer cityId;
- @TableField("orderType")
- private Integer orderType;
-
- /**
- * 开通城市id
- */
- @TableField("openCityId")
- private Integer openCityId;
-
- public Integer getOpenCityId() {
- return openCityId;
- }
-
- public void setOpenCityId(Integer openCityId) {
- this.openCityId = openCityId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getCityId() {
- return cityId;
- }
-
- public void setCityId(Integer cityId) {
- this.cityId = cityId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- /**
- * 运价类型说明
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 状态（1=正常，2=冻结，3=删除）1:normal 2:freeze 3:delete
- */
- @TableField("state")
- private Integer state;
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
- }
-
- public void setServerCarModelId(Integer serverCarModelId) {
- this.serverCarModelId = serverCarModelId;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUser.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUser.java
deleted file mode 100644
index 239f043..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUser.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 用户信息
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-01
- */
-@TableName("t_user")
-public class TUser extends Model<TUser> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 企业id
- */
- private Integer companyId;
- /**
- * 注册ip
- */
- private String registIp;
- /**
- * 注册地区县code
- */
- private String registAreaCode;
- /**
- * 手机号
- */
- private String phone;
- /**
- * 昵称
- */
- private String nickName;
- /**
- * 头像
- */
- private String avatar;
- /**
- * 生日
- */
- private Date birthday;
- /**
- * 性别（1：男，2：女）1:man 2:woman
- */
- private Integer sex;
- /**
- * 紧急联系人
- */
- private String emergencyContact;
- /**
- * 紧急联系电话
- */
- private String emergencyContactNumber;
- /**
- * 是否实名认证(1=否，2=是)1:N,2:Y
- */
- private Integer isAuth;
- /**
- * 真实姓名
- */
- private String name;
- /**
- * 身份证号
- */
- private String idCard;
- /**
- * 身份证正面
- */
- private String idCardFront;
- /**
- * 身份证反面
- */
- private String idCardReverse;
- /**
- * 历史消费
- */
- private BigDecimal consumption;
- /**
- * 余额
- */
- private BigDecimal balance;
- /**
- * 积分
- */
- private Integer integral;
- /**
- * 密码
- */
- private String passWord;
- /**
- * 微信openid
- */
- private String openId;
- /**
- * 微信unionid
- */
- private String unionid;
- /**
- * 备注
- */
- private String remark;
- /**
- * 1=正常，2=冻结 1:normal 2:freeze
- */
- private Integer state;
- /**
- * 1：创建，2：修改，3：删除 1:create 2:update 3:delete
- */
- private String flag;
- private Date insertTime;
- private Integer insertUser;
- private Date updateTime;
- private Integer updateUser;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public String getRegistIp() {
- return registIp;
- }
-
- public void setRegistIp(String registIp) {
- this.registIp = registIp;
- }
-
- public String getRegistAreaCode() {
- return registAreaCode;
- }
-
- public void setRegistAreaCode(String registAreaCode) {
- this.registAreaCode = registAreaCode;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getNickName() {
- return nickName;
- }
-
- public void setNickName(String nickName) {
- this.nickName = nickName;
- }
-
- public String getAvatar() {
- return avatar;
- }
-
- public void setAvatar(String avatar) {
- this.avatar = avatar;
- }
-
- public Date getBirthday() {
- return birthday;
- }
-
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public String getEmergencyContact() {
- return emergencyContact;
- }
-
- public void setEmergencyContact(String emergencyContact) {
- this.emergencyContact = emergencyContact;
- }
-
- public String getEmergencyContactNumber() {
- return emergencyContactNumber;
- }
-
- public void setEmergencyContactNumber(String emergencyContactNumber) {
- this.emergencyContactNumber = emergencyContactNumber;
- }
-
- public Integer getIsAuth() {
- return isAuth;
- }
-
- public void setIsAuth(Integer isAuth) {
- this.isAuth = isAuth;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public String getIdCardFront() {
- return idCardFront;
- }
-
- public void setIdCardFront(String idCardFront) {
- this.idCardFront = idCardFront;
- }
-
- public String getIdCardReverse() {
- return idCardReverse;
- }
-
- public void setIdCardReverse(String idCardReverse) {
- this.idCardReverse = idCardReverse;
- }
-
- public BigDecimal getConsumption() {
- return consumption;
- }
-
- public void setConsumption(BigDecimal consumption) {
- this.consumption = consumption;
- }
-
- public BigDecimal getBalance() {
- return balance;
- }
-
- public void setBalance(BigDecimal balance) {
- this.balance = balance;
- }
-
- public Integer getIntegral() {
- return integral;
- }
-
- public void setIntegral(Integer integral) {
- this.integral = integral;
- }
-
- public String getPassWord() {
- return passWord;
- }
-
- public void setPassWord(String passWord) {
- this.passWord = passWord;
- }
-
- public String getOpenId() {
- return openId;
- }
-
- public void setOpenId(String openId) {
- this.openId = openId;
- }
-
- public String getUnionid() {
- return unionid;
- }
-
- public void setUnionid(String unionid) {
- this.unionid = unionid;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getInsertUser() {
- return insertUser;
- }
-
- public void setInsertUser(Integer insertUser) {
- this.insertUser = insertUser;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(Integer updateUser) {
- this.updateUser = updateUser;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TUser{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", registIp=" + registIp +
- ", registAreaCode=" + registAreaCode +
- ", phone=" + phone +
- ", nickName=" + nickName +
- ", avatar=" + avatar +
- ", birthday=" + birthday +
- ", sex=" + sex +
- ", emergencyContact=" + emergencyContact +
- ", emergencyContactNumber=" + emergencyContactNumber +
- ", isAuth=" + isAuth +
- ", name=" + name +
- ", idCard=" + idCard +
- ", idCardFront=" + idCardFront +
- ", idCardReverse=" + idCardReverse +
- ", consumption=" + consumption +
- ", balance=" + balance +
- ", integral=" + integral +
- ", passWord=" + passWord +
- ", openId=" + openId +
- ", unionid=" + unionid +
- ", remark=" + remark +
- ", state=" + state +
- ", flag=" + flag +
- ", insertTime=" + insertTime +
- ", insertUser=" + insertUser +
- ", updateTime=" + updateTime +
- ", updateUser=" + updateUser +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserLargeCoupon.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserLargeCoupon.java
deleted file mode 100644
index f9f230b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserLargeCoupon.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 车辆车型
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@TableName("t_user_large_coupon")
-public class TUserLargeCoupon extends Model<TUserLargeCoupon> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 名称
- */
- @TableField("name")
- private String name;
- /**
- * 开始时间
- */
- @TableField("startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
- /**
- * 结束时间
- */
- @TableField("endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- /**
- * 1满减 2折扣
- */
- @TableField("type")
- private Integer type;
- /**
- * 满金额
- */
- @TableField("fullMoney")
- private BigDecimal fullMoney;
- /**
- * 减金额
- */
- @TableField("subtractMoney")
- private BigDecimal subtractMoney;
- @TableField("state")
- private Integer state;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @TableField("remark")
- private String remark;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public BigDecimal getFullMoney() {
- return fullMoney;
- }
-
- public void setFullMoney(BigDecimal fullMoney) {
- this.fullMoney = fullMoney;
- }
-
- public BigDecimal getSubtractMoney() {
- return subtractMoney;
- }
-
- public void setSubtractMoney(BigDecimal subtractMoney) {
- this.subtractMoney = subtractMoney;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Integer getPeopleNumber() {
- return peopleNumber;
- }
-
- public void setPeopleNumber(Integer peopleNumber) {
- this.peopleNumber = peopleNumber;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- /**
- * 折扣率
- */
- @TableField("discount")
- private Double discount;
- /**
- * 人数
- */
- @TableField("peopleNumber")
- private Integer peopleNumber;
- /**
- * 创建时间
- */
- @TableField("createTime")
- private Date createTime;
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- /**
- * 1未开始 2进行中 3已结束
- */
- @TableField("status")
- private Integer status;
- @TableField("companyId")
- private Integer companyId;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserRedPacketRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserRedPacketRecord.java
deleted file mode 100644
index f586623..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TUserRedPacketRecord.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 用户红包记录
- * </p>
- *
- * @author stylefeng
- * @since 2020-07-10
- */
-@TableName("t_user_red_packet_record")
-public class TUserRedPacketRecord extends Model<TUserRedPacketRecord> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 金额
- */
- private BigDecimal money;
- /**
- * 过期时间
- */
- private Date expirationTime;
- /**
- * 获取时间
- */
- private Date insertTime;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 状态(0=临时，1=未使用，2=已使用，3=已过期)
- */
- private Integer state;
- /**
- * 订单id
- */
- private Long orderId;
- /**
- * 订单类型(1=专车，4=小件物流)
- */
- private Integer orderType;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 活动id
- */
- private Integer redPacketActivityId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public Date getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(Date expirationTime) {
- this.expirationTime = expirationTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getRedPacketActivityId() {
- return redPacketActivityId;
- }
-
- public void setRedPacketActivityId(Integer redPacketActivityId) {
- this.redPacketActivityId = redPacketActivityId;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TUserRedPacketRecord{" +
- "id=" + id +
- ", money=" + money +
- ", expirationTime=" + expirationTime +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", state=" + state +
- ", orderId=" + orderId +
- ", orderType=" + orderType +
- ", userId=" + userId +
- ", redPacketActivityId=" + redPacketActivityId +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVerified.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVerified.java
deleted file mode 100644
index cc3a6ba..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVerified.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 实名认证
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@TableName("t_verified")
-public class TVerified extends Model<TVerified> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 认证姓名
- */
- private String name;
- /**
- * 身份证号码
- */
- private String idcode;
- /**
- * 身份证正面照
- */
- private String img1;
- /**
- * 身份证背面照
- */
- private String img2;
- /**
- * 认证结果（1=待认证，2=认证通过，3=认证失败）
- */
- private Integer state;
- /**
- * 请求时间
- */
- private Date insertTime;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIdcode() {
- return idcode;
- }
-
- public void setIdcode(String idcode) {
- this.idcode = idcode;
- }
-
- public String getImg1() {
- return img1;
- }
-
- public void setImg1(String img1) {
- this.img1 = img1;
- }
-
- public String getImg2() {
- return img2;
- }
-
- public void setImg2(String img2) {
- this.img2 = img2;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TVerified{" +
- "id=" + id +
- ", userId=" + userId +
- ", name=" + name +
- ", idcode=" + idcode +
- ", img1=" + img1 +
- ", img2=" + img2 +
- ", state=" + state +
- ", insertTime=" + insertTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVersionManagement.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVersionManagement.java
deleted file mode 100644
index ce6ac26..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TVersionManagement.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 版本管理
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@TableName("t_version_management")
-public class TVersionManagement extends Model<TVersionManagement> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 包路径
- */
- @TableField("url")
- private String url;
- /**
- * 版本号
- */
-
- @TableField("version")
- private String version;
- /**
- * 更新公告
- */
- @TableField("content")
- private String content;
- /**
- * 是否强制升级(1=是 2=否） 1:Y 2:N
- */
- @TableField("mandatory")
- private Integer mandatory;
- /**
- * 更新时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 类型(1=安卓，2=ios) 1:android 2:ios
- */
- @TableField("type")
- private Integer type;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getMandatory() {
- return mandatory;
- }
-
- public void setMandatory(Integer mandatory) {
- this.mandatory = mandatory;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TVersionManagement{" +
- "id=" + id +
- ", url=" + url +
- ", version=" + version +
- ", content=" + content +
- ", mandatory=" + mandatory +
- ", insertTime=" + insertTime +
- ", type=" + type +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbBanner.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbBanner.java
deleted file mode 100644
index 77bc80a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbBanner.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.util.Date;
-
-/**
- * <p>
- * banner信息表
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@TableName("t_img")
-public class TbBanner extends Model<TbBanner> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 图片
- */
- @TableField("type")
- private Integer type;
- @TableField("usePort")
- private Integer usePort;
-
- @TableField("name")
- private String name;
- @TableField("url")
- private String url;
- /**
- * 创建时间
- */
- @TableField("")
- private Integer sort;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getUsePort() {
- return usePort;
- }
-
- public void setUsePort(Integer usePort) {
- this.usePort = usePort;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public Integer getSort() {
- return sort;
- }
-
- public void setSort(Integer sort) {
- this.sort = sort;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getShowStartTime() {
- return showStartTime;
- }
-
- public void setShowStartTime(String showStartTime) {
- this.showStartTime = showStartTime;
- }
-
- public String getShowStopTime() {
- return showStopTime;
- }
-
- public void setShowStopTime(String showStopTime) {
- this.showStopTime = showStopTime;
- }
-
- /**
- * 更新时间
- */
- @TableField("state")
- private Integer state;
- @TableField("insertTime")
- private Date insertTime;
- @TableField("showStartTime")
- private String showStartTime;
- @TableField("showStopTime")
- private String showStopTime;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbChatSet.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbChatSet.java
deleted file mode 100644
index 5a69846..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbChatSet.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * <p>
- * banner信息表
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@TableName("t_chat_set")
-public class TbChatSet extends Model<TbChatSet> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 图片
- */
- @TableField("createTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
- @TableField("type")
- private Integer type;
-
- @TableField("content")
- private String content;
-
- public Integer getLanguage() {
- return language;
- }
-
- public void setLanguage(Integer language) {
- this.language = language;
- }
-
- @TableField("state")
- private Integer state;
- @TableField("language")
- private Integer language;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbGuidePage.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbGuidePage.java
deleted file mode 100644
index 0f1abb5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbGuidePage.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * <p>
- * banner信息表
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@TableName("t_guide_page")
-public class TbGuidePage extends Model<TbGuidePage> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 图片
- */
- @TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- @TableField("type")
- private Integer type;
-
- @TableField("name")
- private String name;
- @TableField("state")
- private Integer state;
- @TableField("url")
- private String url;
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public Integer getSort() {
- return sort;
- }
-
- public void setSort(Integer sort) {
- this.sort = sort;
- }
-
- @TableField("sort")
- private Integer sort;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbHotAddress.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbHotAddress.java
deleted file mode 100644
index 3660d8c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbHotAddress.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * <p>
- * banner信息表
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@TableName("t_hot_address")
-public class TbHotAddress extends Model<TbHotAddress> {
- private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 图片
- */
- @TableField("cityId")
- private Integer cityId;
- @TableField("name")
- private String name;
- @TableField("areaId")
- private Integer areaId;
-
- public Integer getAreaId() {
- return areaId;
- }
-
- public void setAreaId(Integer areaId) {
- this.areaId = areaId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCityId() {
- return cityId;
- }
-
- public void setCityId(Integer cityId) {
- this.cityId = cityId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public Double getLon() {
- return lon;
- }
-
- public void setLon(Double lon) {
- this.lon = lon;
- }
-
- public Double getLat() {
- return lat;
- }
-
- public void setLat(Double lat) {
- this.lat = lat;
- }
-
- public Integer getHide() {
- return hide;
- }
-
- public void setHide(Integer hide) {
- this.hide = hide;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Integer getSort() {
- return sort;
- }
-
- public void setSort(Integer sort) {
- this.sort = sort;
- }
-
- @TableField("address")
- private String address;
- @TableField("lon")
- private Double lon;
- @TableField("lat")
- private Double lat;
-
- // 是否隐藏(1是 0否)
- @TableField("hide")
- private Integer hide;
- @TableField("createTime")
- private Date createTime;
- @TableField("sort")
- private Integer sort;
-
- public String getPname() {
- return pname;
- }
-
- public void setPname(String pname) {
- this.pname = pname;
- }
-
- @TableField(exist = false)
- private String pname;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbStartPage.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbStartPage.java
deleted file mode 100644
index cca9a65..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbStartPage.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * <p>
- * banner信息表
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@TableName("t_start_page")
-public class TbStartPage extends Model<TbStartPage> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 图片
- */
- @TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- @TableField("type")
- private Integer type;
-
- @TableField("name")
- private String name;
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- @TableField("state")
- private Integer state;
- @TableField("url")
- private String url;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbUserExit.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbUserExit.java
deleted file mode 100644
index 7607460..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbUserExit.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@TableName("t_user_exit")
-@Data
-public class TbUserExit extends Model<TbUserExit> {
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- @TableField("userId")
- private Integer userId;
- @TableField("balance")
- private BigDecimal balance;
- @TableField("insertTime")
- private Date insertTime;
- @TableField("remark")
- private String remark;
- @TableField("state")
- private Integer state;
-
- @TableField("userName")
- private String userName;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbVoice.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbVoice.java
deleted file mode 100644
index f3dbe60..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TbVoice.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.util.Date;
-
-@TableName("t_voice")
-@Data
-public class TbVoice extends Model<TbVoice> {
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @TableField("voiceType")
- private Integer voiceType;
- @TableField("url")
- private String url;
- @TableField("language")
- private Integer language;
- @TableField("state")
- private Integer state;
- @TableField("createTime")
- private Date createTime;
- @TableField("updateTime")
- private Date updateTime;
- @TableField("name")
- private String name;
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TransactionDetails.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TransactionDetails.java
deleted file mode 100644
index ef963f6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TransactionDetails.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 交易明细
- */
-@TableName("t_pub_transaction_details")
-public class TransactionDetails {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 对象id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
- /**
- * 金额/积分
- */
- @TableField("money")
- private Double money;
- /**
- * 状态（1=增加，2=减少）
- */
- @TableField("state")
- private Integer state;
- /**
- * 类型（1=金额，2：积分）
- */
- @TableField("type")
- private Integer type;
- /**
- * 类型（1=用户，2=司机）
- */
- @TableField("userType")
- private Integer userType;
- /**
- * 订单类型（1=专车，4=小件物流）
- */
- @TableField("orderType")
- private Integer orderType;
- /**
- * 订单id
- */
- @TableField("orderId")
- private Long orderId;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getUserType() {
- return userType;
- }
-
- public void setUserType(Integer userType) {
- this.userType = userType;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- @Override
- public String toString() {
- return "TransactionDetails{" +
- "id=" + id +
- ", userId=" + userId +
- ", insertTime=" + insertTime +
- ", remark='" + remark + '\'' +
- ", money=" + money +
- ", state=" + state +
- ", type=" + type +
- ", userType=" + userType +
- ", orderType=" + orderType +
- ", orderId=" + orderId +
- '}';
- }
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
deleted file mode 100644
index 6cee96e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 管理员表
- * </p>
- *
- * @author stylefeng
- * @since 2017-07-11
- */
-@TableName("sys_user")
-public class User extends Model<User> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value="id", type= IdType.AUTO)
- private Integer id;
- /**
- * 头像
- */
- private String avatar;
- /**
- * 账号
- */
- private String account;
- /**
- * 密码
- */
- private String password;
- /**
- * 密码修改时间
- */
- @TableField("passWordUpdate")
- private Date passWordUpdate;
- /**
- * md5密码盐
- */
- private String salt;
- /**
- * 名字
- */
- private String name;
- /**
- * 生日
- */
- private Date birthday;
- /**
- * 性别（1：男 2：女）
- */
- private Integer sex;
- /**
- * 电子邮件
- */
- private String email;
- /**
- * 电话
- */
- private String phone;
- /**
- * 角色id
- */
- private String roleid;
- /**
- * 部门id
- */
- private Integer deptid;
- /**
- * 状态(1：启用 2：冻结 3：删除）
- */
- private Integer status;
- /**
- * 创建时间
- */
- private Date createtime;
- /**
- * 保留字段
- */
- private Integer version;
- /**
- * 角色类型 1=平台 2=分公司 3=加盟商
- */
- @TableField("roleType")
- private Integer roleType;
- /**
- * 对象ID
- */
- @TableField("objectId")
- private Integer objectId;
-
- public Integer getRoleType() {
- return roleType;
- }
-
- public void setRoleType(Integer roleType) {
- this.roleType = roleType;
- }
-
- public Integer getObjectId() {
- return objectId;
- }
-
- public void setObjectId(Integer objectId) {
- this.objectId = objectId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAvatar() {
- return avatar;
- }
-
- public void setAvatar(String avatar) {
- this.avatar = avatar;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getPassword() {
- return password;
- }
-
- public Date getPassWordUpdate() {
- return passWordUpdate;
- }
-
- public void setPassWordUpdate(Date passWordUpdate) {
- this.passWordUpdate = passWordUpdate;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getSalt() {
- return salt;
- }
-
- public void setSalt(String salt) {
- this.salt = salt;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getBirthday() {
- return birthday;
- }
-
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getRoleid() {
- return roleid;
- }
-
- public void setRoleid(String roleid) {
- this.roleid = roleid;
- }
-
- public Integer getDeptid() {
- return deptid;
- }
-
- public void setDeptid(Integer deptid) {
- this.deptid = deptid;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public Integer getVersion() {
- return version;
- }
-
- public void setVersion(Integer version) {
- this.version = version;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "User{" +
- "id=" + id +
- ", avatar=" + avatar +
- ", account=" + account +
- ", password=" + password +
- ", salt=" + salt +
- ", name=" + name +
- ", birthday=" + birthday +
- ", sex=" + sex +
- ", email=" + email +
- ", phone=" + phone +
- ", roleid=" + roleid +
- ", deptid=" + deptid +
- ", status=" + status +
- ", createtime=" + createtime +
- ", version=" + version +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivity.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivity.java
deleted file mode 100644
index 61cdebc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivity.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户活动主表
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity")
-public class UserActivity extends Model<UserActivity> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 活动名称
- */
- private String name;
- /**
- * 有效期开始时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
- /**
- * 有效期结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
- /**
- * 添加时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 状态(1=待审核，2=驳回，3=通过，)
- */
- private Integer status;
- /**
- * 备注
- */
- private String remark;
- /**
- * 1=平台 2=分公司 3=加盟商
- */
- private Integer companyType;
-
- private Integer companyId;
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getCompanyType() {
- return companyType;
- }
-
- public void setCompanyType(Integer companyType) {
- this.companyType = companyType;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivity{" +
- "id=" + id +
- ", name=" + name +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", insertTime=" + insertTime +
- ", status=" + status +
- ", remark=" + remark +
- ", companyType=" + companyType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityBalance.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityBalance.java
deleted file mode 100644
index 7b3dd2a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityBalance.java
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户活动-充值
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity_balance")
-public class UserActivityBalance extends Model<UserActivityBalance> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 1=不启用，2=启用
- */
- private Integer enable;
- /**
- * 用户活动主表id
- */
- private Integer userActivityId;
- /**
- * 充值金额
- */
- private Double money;
- /**
- * 通用优惠券数量
- */
- private Integer generalNum;
- /**
- * 通用优惠券id
- */
- private Integer generalCouponId;
- /**
- * 专车优惠券数量
- */
- private Integer specialNum;
- /**
- * 专车优惠券id
- */
- private Integer specialCouponId;
- /**
- * 出租车优惠券数量
- */
- private Integer taxiNum;
- /**
- * 出租车优惠券id
- */
- private Integer taxiCouponId;
- /**
- * 城际优惠券数量
- */
- private Integer intercityNum;
- /**
- * 城际优惠券id
- */
- private Integer intercityCouponId;
- /**
- * 添加时间
- */
- private Date insertTime;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 有效天数
- */
- private Integer effective;
- /**
- * 通用券金额
- */
- private Double generalCouponMoney;
- /**
- * 专车券金额
- */
- private Double specialCouponMoney;
- /**
- * 出租车券金额
- */
- private Double taxiCouponMoney;
- /**
- * 城际券金额
- */
- private Double intercityCouponMoney;
- /**
- * 总金额上限
- * @return
- */
- private Double totalPrice;
- /**
- * 剩余总金额上限
- * @return
- */
- private Double lavePrice;
-
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
-
- public Double getGeneralCouponMoney() {
- return generalCouponMoney;
- }
-
- public void setGeneralCouponMoney(Double generalCouponMoney) {
- this.generalCouponMoney = generalCouponMoney;
- }
-
- public Double getSpecialCouponMoney() {
- return specialCouponMoney;
- }
-
- public void setSpecialCouponMoney(Double specialCouponMoney) {
- this.specialCouponMoney = specialCouponMoney;
- }
-
- public Double getTaxiCouponMoney() {
- return taxiCouponMoney;
- }
-
- public void setTaxiCouponMoney(Double taxiCouponMoney) {
- this.taxiCouponMoney = taxiCouponMoney;
- }
-
- public Double getIntercityCouponMoney() {
- return intercityCouponMoney;
- }
-
- public void setIntercityCouponMoney(Double intercityCouponMoney) {
- this.intercityCouponMoney = intercityCouponMoney;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getEnable() {
- return enable;
- }
-
- public void setEnable(Integer enable) {
- this.enable = enable;
- }
-
- public Integer getUserActivityId() {
- return userActivityId;
- }
-
- public void setUserActivityId(Integer userActivityId) {
- this.userActivityId = userActivityId;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Integer getGeneralNum() {
- return generalNum;
- }
-
- public void setGeneralNum(Integer generalNum) {
- this.generalNum = generalNum;
- }
-
- public Integer getGeneralCouponId() {
- return generalCouponId;
- }
-
- public void setGeneralCouponId(Integer generalCouponId) {
- this.generalCouponId = generalCouponId;
- }
-
- public Integer getSpecialNum() {
- return specialNum;
- }
-
- public void setSpecialNum(Integer specialNum) {
- this.specialNum = specialNum;
- }
-
- public Integer getSpecialCouponId() {
- return specialCouponId;
- }
-
- public void setSpecialCouponId(Integer specialCouponId) {
- this.specialCouponId = specialCouponId;
- }
-
- public Integer getTaxiNum() {
- return taxiNum;
- }
-
- public void setTaxiNum(Integer taxiNum) {
- this.taxiNum = taxiNum;
- }
-
- public Integer getTaxiCouponId() {
- return taxiCouponId;
- }
-
- public void setTaxiCouponId(Integer taxiCouponId) {
- this.taxiCouponId = taxiCouponId;
- }
-
- public Integer getIntercityNum() {
- return intercityNum;
- }
-
- public void setIntercityNum(Integer intercityNum) {
- this.intercityNum = intercityNum;
- }
-
- public Integer getIntercityCouponId() {
- return intercityCouponId;
- }
-
- public void setIntercityCouponId(Integer intercityCouponId) {
- this.intercityCouponId = intercityCouponId;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Double getTotalPrice() {
- return totalPrice;
- }
-
- public void setTotalPrice(Double totalPrice) {
- this.totalPrice = totalPrice;
- }
-
- public Double getLavePrice() {
- return lavePrice;
- }
-
- public void setLavePrice(Double lavePrice) {
- this.lavePrice = lavePrice;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivityBalance{" +
- "id=" + id +
- ", enable=" + enable +
- ", userActivityId=" + userActivityId +
- ", money=" + money +
- ", generalNum=" + generalNum +
- ", generalCouponId=" + generalCouponId +
- ", specialNum=" + specialNum +
- ", specialCouponId=" + specialCouponId +
- ", taxiNum=" + taxiNum +
- ", taxiCouponId=" + taxiCouponId +
- ", intercityNum=" + intercityNum +
- ", intercityCouponId=" + intercityCouponId +
- ", insertTime=" + insertTime +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount1.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount1.java
deleted file mode 100644
index b0eb3b4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount1.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * <p>
- * 用户活动-折扣1
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity_discount1")
-public class UserActivityDiscount1 extends Model<UserActivityDiscount1> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户活动主表id
- */
- private Integer userActivityId;
- /**
- * 专车打折（8.5）
- */
- private Double special;
- /**
- * 出租车打折（8.5）
- */
- private Double taxi;
- /**
- * 小件物流打折（8.5）
- */
- private Double logistics;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 1=不启用，2=启用
- */
- private Integer enable;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserActivityId() {
- return userActivityId;
- }
-
- public void setUserActivityId(Integer userActivityId) {
- this.userActivityId = userActivityId;
- }
-
- public Double getSpecial() {
- return special;
- }
-
- public void setSpecial(Double special) {
- this.special = special;
- }
-
- public Double getTaxi() {
- return taxi;
- }
-
- public void setTaxi(Double taxi) {
- this.taxi = taxi;
- }
-
- public Double getLogistics() {
- return logistics;
- }
-
- public void setLogistics(Double logistics) {
- this.logistics = logistics;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getEnable() {
- return enable;
- }
-
- public void setEnable(Integer enable) {
- this.enable = enable;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivityDiscount1{" +
- "id=" + id +
- ", userActivityId=" + userActivityId +
- ", special=" + special +
- ", taxi=" + taxi +
- ", logistics=" + logistics +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", enable=" + enable +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount2.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount2.java
deleted file mode 100644
index 0560d38..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityDiscount2.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户活动-折扣2（跨城）
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity_discount2")
-public class UserActivityDiscount2 extends Model<UserActivityDiscount2> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户活动主表id
- */
- private Integer userActivityId;
- /**
- * 跨城线路id
- */
- private Integer lineId;
- /**
- * 折扣（8.5）
- */
- private Double discount;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 1=不启用，2=启用
- */
- private Integer enable;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserActivityId() {
- return userActivityId;
- }
-
- public void setUserActivityId(Integer userActivityId) {
- this.userActivityId = userActivityId;
- }
-
- public Integer getLineId() {
- return lineId;
- }
-
- public void setLineId(Integer lineId) {
- this.lineId = lineId;
- }
-
- public Double getDiscount() {
- return discount;
- }
-
- public void setDiscount(Double discount) {
- this.discount = discount;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getEnable() {
- return enable;
- }
-
- public void setEnable(Integer enable) {
- this.enable = enable;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivityDiscount2{" +
- "id=" + id +
- ", userActivityId=" + userActivityId +
- ", lineId=" + lineId +
- ", discount=" + discount +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", enable=" + enable +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityInvite.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityInvite.java
deleted file mode 100644
index bfc67b6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityInvite.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户活动-邀请
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity_invite")
-public class UserActivityInvite extends Model<UserActivityInvite> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户活动主表id
- */
- private Integer userActivityId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 优惠券总数量
- */
- private Integer totalNum;
- /**
- * 剩余数量
- */
- private Integer laveNum;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 1=不启用，2=启用
- */
- private Integer enable;
- /**
- * 有效天数
- */
- private Integer effective;
- /**
- * 总金额上限
- * @return
- */
- private Double totalPrice;
- /**
- * 剩余总金额上限
- * @return
- */
- private Double lavePrice;
-
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserActivityId() {
- return userActivityId;
- }
-
- public void setUserActivityId(Integer userActivityId) {
- this.userActivityId = userActivityId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Integer getTotalNum() {
- return totalNum;
- }
-
- public void setTotalNum(Integer totalNum) {
- this.totalNum = totalNum;
- }
-
- public Integer getLaveNum() {
- return laveNum;
- }
-
- public void setLaveNum(Integer laveNum) {
- this.laveNum = laveNum;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getEnable() {
- return enable;
- }
-
- public void setEnable(Integer enable) {
- this.enable = enable;
- }
-
- public Double getTotalPrice() {
- return totalPrice;
- }
-
- public void setTotalPrice(Double totalPrice) {
- this.totalPrice = totalPrice;
- }
-
- public Double getLavePrice() {
- return lavePrice;
- }
-
- public void setLavePrice(Double lavePrice) {
- this.lavePrice = lavePrice;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivityInvite{" +
- "id=" + id +
- ", userActivityId=" + userActivityId +
- ", couponId=" + couponId +
- ", totalNum=" + totalNum +
- ", laveNum=" + laveNum +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", enable=" + enable +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRedenvelope.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRedenvelope.java
deleted file mode 100644
index c389ba8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRedenvelope.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户活动-红包
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity_redenvelope")
-public class UserActivityRedenvelope extends Model<UserActivityRedenvelope> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户活动主表id
- */
- private Integer userActivityId;
- /**
- * 红包id
- */
- private Integer redEnvelopeId;
- /**
- * 总金额
- */
- private Double totalMoney;
- /**
- * 剩余金额
- */
- private Double laveMoney;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 1=不启用，2=启用 1:enable 2:unable
- */
- private Integer enable;
- /**
- * 总金额上限
- * @return
- */
- private Double totalPrice;
- /**
- * 剩余总金额上限
- * @return
- */
- private Double lavePrice;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserActivityId() {
- return userActivityId;
- }
-
- public void setUserActivityId(Integer userActivityId) {
- this.userActivityId = userActivityId;
- }
-
- public Integer getRedEnvelopeId() {
- return redEnvelopeId;
- }
-
- public void setRedEnvelopeId(Integer redEnvelopeId) {
- this.redEnvelopeId = redEnvelopeId;
- }
-
- public Double getTotalMoney() {
- return totalMoney;
- }
-
- public void setTotalMoney(Double totalMoney) {
- this.totalMoney = totalMoney;
- }
-
- public Double getLaveMoney() {
- return laveMoney;
- }
-
- public void setLaveMoney(Double laveMoney) {
- this.laveMoney = laveMoney;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getEnable() {
- return enable;
- }
-
- public void setEnable(Integer enable) {
- this.enable = enable;
- }
-
- public Double getTotalPrice() {
- return totalPrice;
- }
-
- public void setTotalPrice(Double totalPrice) {
- this.totalPrice = totalPrice;
- }
-
- public Double getLavePrice() {
- return lavePrice;
- }
-
- public void setLavePrice(Double lavePrice) {
- this.lavePrice = lavePrice;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivityRedenvelope{" +
- "id=" + id +
- ", userActivityId=" + userActivityId +
- ", redEnvelopeId=" + redEnvelopeId +
- ", totalMoney=" + totalMoney +
- ", laveMoney=" + laveMoney +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", enable=" + enable +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRegistered.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRegistered.java
deleted file mode 100644
index c12ec23..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserActivityRegistered.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户活动-注册
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-@TableName("t_user_activity_registered")
-public class UserActivityRegistered extends Model<UserActivityRegistered> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户活动id
- */
- private Integer userActivityId;
- /**
- * 优惠券id
- */
- private Integer couponId;
- /**
- * 优惠券总数
- */
- private Integer totalNum;
- /**
- * 剩余数量
- */
- private Integer laveNum;
- /**
- * 有效期开始时间
- */
- private Date startTime;
- /**
- * 有效期结束时间
- */
- private Date endTime;
- /**
- * 1=不启用，2=启用
- */
- private Integer enable;
- /**
- * 有效天数
- */
- private Integer effective;
- /**
- * 总金额上限
- * @return
- */
- private Double totalPrice;
- /**
- * 剩余总金额上限
- * @return
- */
- private Double lavePrice;
-
- public Integer getEffective() {
- return effective;
- }
-
- public void setEffective(Integer effective) {
- this.effective = effective;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserActivityId() {
- return userActivityId;
- }
-
- public void setUserActivityId(Integer userActivityId) {
- this.userActivityId = userActivityId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Integer getTotalNum() {
- return totalNum;
- }
-
- public void setTotalNum(Integer totalNum) {
- this.totalNum = totalNum;
- }
-
- public Integer getLaveNum() {
- return laveNum;
- }
-
- public void setLaveNum(Integer laveNum) {
- this.laveNum = laveNum;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getEnable() {
- return enable;
- }
-
- public void setEnable(Integer enable) {
- this.enable = enable;
- }
-
- public Double getTotalPrice() {
- return totalPrice;
- }
-
- public void setTotalPrice(Double totalPrice) {
- this.totalPrice = totalPrice;
- }
-
- public Double getLavePrice() {
- return lavePrice;
- }
-
- public void setLavePrice(Double lavePrice) {
- this.lavePrice = lavePrice;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserActivityRegistered{" +
- "id=" + id +
- ", userActivityId=" + userActivityId +
- ", couponId=" + couponId +
- ", totalNum=" + totalNum +
- ", laveNum=" + laveNum +
- ", startTime=" + startTime +
- ", endTime=" + endTime +
- ", enable=" + enable +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserCouponRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserCouponRecord.java
deleted file mode 100644
index ae9de12..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserCouponRecord.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 用户优惠券记录
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@TableName("t_user_coupon_record")
-public class UserCouponRecord extends Model<UserCouponRecord> {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 金额
- */
- private BigDecimal money;
- /**
- * 满减金额
- */
- private BigDecimal fullMoney;
- /**
- * 过期时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date expirationTime;
- /**
- * 获取时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date insertTime;
- /**
- * 公司id
- */
- private Integer companyId;
- /**
- * 状态(1=未使用，2=已使用，3=已过期)
- */
- private Integer state;
- /**
- * 使用结束时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
- /**
- * 优惠券使用类型(0=通用，1=专车，4=小件物流)
- */
- private Integer couponUseType;
- /**
- * 优惠券类型(1=抵扣，2=满减)
- */
- private Integer couponType;
- /**
- * 用户id
- */
- private Integer userId;
- /**
- * 优惠券发放id
- */
- private Integer couponId;
- /**
- * 活动id
- */
- private Integer couponActivityId;
- /**
- * 活动类型(1=赠送活动，2=注册，3=邀请，4=充值)
- */
- private Integer activityType;
-
- private Integer type;
-
- private Double totalAmount;
-
- private Double residualAmount;
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
- public Double getTotalAmount() {
- return totalAmount;
- }
-
- public void setTotalAmount(Double totalAmount) {
- this.totalAmount = totalAmount;
- }
-
- public Double getResidualAmount() {
- return residualAmount;
- }
-
- public void setResidualAmount(Double residualAmount) {
- this.residualAmount = residualAmount;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public BigDecimal getFullMoney() {
- return fullMoney;
- }
-
- public void setFullMoney(BigDecimal fullMoney) {
- this.fullMoney = fullMoney;
- }
-
- public Date getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(Date expirationTime) {
- this.expirationTime = expirationTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getCouponUseType() {
- return couponUseType;
- }
-
- public void setCouponUseType(Integer couponUseType) {
- this.couponUseType = couponUseType;
- }
-
- public Integer getCouponType() {
- return couponType;
- }
-
- public void setCouponType(Integer couponType) {
- this.couponType = couponType;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getCouponId() {
- return couponId;
- }
-
- public void setCouponId(Integer couponId) {
- this.couponId = couponId;
- }
-
- public Integer getCouponActivityId() {
- return couponActivityId;
- }
-
- public void setCouponActivityId(Integer couponActivityId) {
- this.couponActivityId = couponActivityId;
- }
-
- public Integer getActivityType() {
- return activityType;
- }
-
- public void setActivityType(Integer activityType) {
- this.activityType = activityType;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "UserCouponRecord{" +
- "id=" + id +
- ", money=" + money +
- ", fullMoney=" + fullMoney +
- ", expirationTime=" + expirationTime +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", state=" + state +
- ", couponUseType=" + couponUseType +
- ", couponType=" + couponType +
- ", userId=" + userId +
- ", couponId=" + couponId +
- ", couponActivityId=" + couponActivityId +
- ", activityType=" + activityType +
- "}";
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserRedPacketRecord.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserRedPacketRecord.java
deleted file mode 100644
index 844ec6c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserRedPacketRecord.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.dsh.guns.modular.system.model;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-/**
- * 用户红包记录
- */
-@TableName("t_user_red_packet_record")
-public class UserRedPacketRecord {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 金额
- */
- @TableField("money")
- private Double money;
- /**
- * 过期时间
- */
- @TableField("expirationTime")
- private Date expirationTime;
- /**
- * 添加时间
- */
- @TableField("insertTime")
- private Date insertTime;
- /**
- * 企业id
- */
- @TableField("companyId")
- private Integer companyId;
- /**
- * 状态（0=临时，1=未使用，2=已使用，3=已过期）
- */
- @TableField("state")
- private Integer state;
- /**
- * 使用结束时间
- */
- private Date endTime;
- /**
- * 订单id(获取红包的订单)
- */
- @TableField("orderId")
- private Long orderId;
- /**
- * 订单类型（1=专车，4=小件物流）
- */
- @TableField("orderType")
- private Integer orderType;
- /**
- * 用户id
- */
- @TableField("userId")
- private Integer userId;
- /**
- * 活动id
- * @return
- */
- @TableField("redPacketActivityId")
- private Integer redPacketActivityId;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Date getExpirationTime() {
- return expirationTime;
- }
-
- public void setExpirationTime(Date expirationTime) {
- this.expirationTime = expirationTime;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Long getOrderId() {
- return orderId;
- }
-
- public void setOrderId(Long orderId) {
- this.orderId = orderId;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public Integer getRedPacketActivityId() {
- return redPacketActivityId;
- }
-
- public void setRedPacketActivityId(Integer redPacketActivityId) {
- this.redPacketActivityId = redPacketActivityId;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- @Override
- public String toString() {
- return "UserRedPacketRecord{" +
- "id=" + id +
- ", money=" + money +
- ", expirationTime=" + expirationTime +
- ", insertTime=" + insertTime +
- ", companyId=" + companyId +
- ", state=" + state +
- ", orderId=" + orderId +
- ", orderType=" + orderType +
- ", userId=" + userId +
- ", redPacketActivityId=" + redPacketActivityId +
- '}';
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/DriverVerifyService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/DriverVerifyService.java
deleted file mode 100644
index 26c3051..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/DriverVerifyService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.Dict;
-import com.dsh.guns.modular.system.model.DriverVerify;
-
-public interface DriverVerifyService extends IService<DriverVerify> {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IDriverOnlineService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IDriverOnlineService.java
deleted file mode 100644
index 8272825..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IDriverOnlineService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.DriverOnline;
-
-import java.util.Map;
-
-public interface IDriverOnlineService extends IService<DriverOnline> {
-
-
- /**
- * 获取列表数据
- * @param name
- * @param phone
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryOnlineDriver(String name, String phone, Integer offset, Integer limit) throws Exception;
-
-
- int queryOnlineDriverCount(String name, String phone);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponActivityService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponActivityService.java
deleted file mode 100644
index f3861aa..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponActivityService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.SysCouponActivity;
-
-/**
- * <p>
- * 系统设置-优惠券活动 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-public interface ISysCouponActivityService extends IService<SysCouponActivity> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponRecordService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponRecordService.java
deleted file mode 100644
index 74b0510..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysCouponRecordService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.SysCouponRecord;
-
-/**
- * <p>
- * 系统设置-优惠券记录 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-15
- */
-public interface ISysCouponRecordService extends IService<SysCouponRecord> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysRedPacketRecordService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysRedPacketRecordService.java
deleted file mode 100644
index 21516a4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ISysRedPacketRecordService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.SysRedPacketRecord;
-
-/**
- * <p>
- * 系统设置-红包记录 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-13
- */
-public interface ISysRedPacketRecordService extends IService<SysRedPacketRecord> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAdvertisementService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAdvertisementService.java
deleted file mode 100644
index 9b98883..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAdvertisementService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TAdvertisement;
-//import com.baomidou.mybatisplus.service.IService;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 广告 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-02
-// */
-//public interface ITAdvertisementService extends IService<TAdvertisement> {
-//
-// /**
-// * 根据条件查询广告列表
-// * @param page 分页
-// * @param beginTime 开始时间
-// * @param endTime 结束时间
-// * @param type 类型
-// * @param name 名称
-// * @return
-// */
-// List<Map<String,Object>> getAdvertisementList(@Param("page") Page<Map<String, Object>> page,
-// @Param("beginTime") String beginTime,
-// @Param("endTime") String endTime,
-// @Param("type") Integer type,
-// @Param("name") String name);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAgreementService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAgreementService.java
deleted file mode 100644
index 94ad325..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAgreementService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TAgreement;
-
-/**
- * <p>
- * 平台协议 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-01
- */
-public interface ITAgreementService extends IService<TAgreement> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAuditRecordService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAuditRecordService.java
deleted file mode 100644
index d45f269..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITAuditRecordService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TAuditRecord;
-
-/**
- * <p>
- * 审核记录表 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-25
- */
-public interface ITAuditRecordService extends IService<TAuditRecord> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarBrandService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarBrandService.java
deleted file mode 100644
index dcb84cd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarBrandService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TCarBrand;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆品牌 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface ITCarBrandService extends IService<TCarBrand> {
-
- /**
- * 根据条件查询车辆品牌列表
- * @return
- */
- List<Map<String,Object>> getCarBrandList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarModelService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarModelService.java
deleted file mode 100644
index 023e864..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarModelService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TCarModel;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆车型 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface ITCarModelService extends IService<TCarModel> {
-
- /**
- * 根据条件查询车辆车型列表
- * @return
- */
- List<Map<String,Object>> getCarModelList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarService.java
deleted file mode 100644
index c16f78e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TCar;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface ITCarService extends IService<TCar> {
-
- /**
- * 根据条件查询车辆列表
- * @param page
- * @return
- */
- List<Map<String,Object>> getCarList(@Param("page") Page<Map<String, Object>> page,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("id") String id,
- @Param("brandName") String brandName,
- @Param("modelName") String modelName,
- @Param("carColor") String carColor,
- @Param("serverStr") String serverStr,
- @Param("carLicensePlate") String carLicensePlate,
- @Param("driverName") String driverName,
- @Param("companyName") String companyName,
- @Param("franchiseeName") String franchiseeName);
-
- /**
- * 根据条件查询车辆列表不分页
- * @return
- */
- List<Map<String,Object>> getCarListNoPage(@Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId);
-
- TCar getById1(Integer carId1);
-
- TCar getCarID(String newCarId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarServiceService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarServiceService.java
deleted file mode 100644
index a6db71c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCarServiceService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TCarService;
-
-/**
- * <p>
- * 车辆经营业务 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface ITCarServiceService extends IService<TCarService> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCompanyService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCompanyService.java
deleted file mode 100644
index 9b6b9a9..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITCompanyService.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TCompany;
-import com.dsh.guns.modular.system.util.ResultUtil;
-import org.apache.ibatis.annotations.Param;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 公司信息表 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-06
- */
-public interface ITCompanyService extends IService<TCompany> {
-
- /**
- * 根据条件查询分公司列表
- * @return
- */
- List<Map<String,Object>> getCompanyList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,
- @Param("principalName") String principalName,
- @Param("principalPhone") String principalPhone,
- @Param("adminName") String adminName,
- @Param("adminPhone") String adminPhone,
- @Param("serviceStr") String serviceStr,
- @Param("state") Integer state);
-
- /**
- * 根据公司ID获取公司经营区域
- * @param id
- * @return
- */
- List<Map<String,Object>> getCompanyScopeById(@Param("id") Integer id);
-
- /**
- * 根据条件查询加盟商列表
- * @return
- */
- List<Map<String,Object>> getFranchiseeList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,
- @Param("account") String account,
- @Param("principalName") String principalName,
- @Param("principalPhone") String principalPhone,
- @Param("serviceStr") String serviceStr,
- @Param("state") Integer state,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId);
-
- /**
- * 根据企业id查询详情
- * @param id
- * @return
- * @throws Exception
- */
- ResultUtil selectCompanyInfoById(String id) throws Exception;
-
-
- /**
- * 获取运营汇总数据
- * @param type
- * @param start
- * @param end
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryOperationalData(Integer type, String start, String end, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载运营汇总数据
- * @param type
- * @param companyId
- * @return
- * @throws Exception
- */
- HSSFWorkbook downloadOperationalData(Integer type, String start, String end, Integer companyId) throws Exception;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDispatchService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDispatchService.java
deleted file mode 100644
index 8e2abb1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDispatchService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TDispatch;
-//import com.baomidou.mybatisplus.service.IService;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 调度管理 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-01
-// */
-//public interface ITDispatchService extends IService<TDispatch> {
-//
-// /**
-// * 根据条件查询调度列表
-// * @return
-// */
-// List<Map<String,Object>> getDispatchList(@Param("page") Page<Map<String, Object>> page,
-// @Param("roleType") Integer roleType,
-// @Param("nowUserId") Integer nowUserId,
-// @Param("beginTime") String beginTime,
-// @Param("endTime") String endTime,
-// @Param("name") String name,
-// @Param("companyName") String companyName,
-// @Param("franchiseeName") String franchiseeName,
-// @Param("account") String account,
-// @Param("state") Integer state);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverLineService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverLineService.java
deleted file mode 100644
index e24724f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverLineService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.dsh.guns.modular.system.model.TDriverLine;
-//import com.baomidou.mybatisplus.service.IService;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 司机关联线路 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-05
-// */
-//public interface ITDriverLineService extends IService<TDriverLine> {
-//
-// /**
-// * 根据司机ID查询司机关联线路列表
-// * @param driverId
-// * @return
-// */
-// List<Map<String,Object>> getDriverLineListByDriverId(@Param("driverId") Integer driverId);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverService.java
deleted file mode 100644
index 7e87da8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverService.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TDriver;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 司机表 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-04
- */
-public interface ITDriverService extends IService<TDriver> {
-
- /**
- * 根据条件查询待审核司机列表
- * @return
- */
- List<Map<String,Object>> getAuthDriverList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("companyName") String companyName,
- @Param("phone") String phone,
- @Param("account") String account,
- @Param("addType") Integer addType,
- @Param("authState") Integer authState);
-
- /**
- * 根据用户ID获取用户详情
- * @param driverId
- * @return
- */
- Map<String,Object> getDriverById(@Param("driverId") Integer driverId);
-
- /**
- * 根据审核通过的司机列表
- * @return
- */
- List<Map<String,Object>> getDriverList(@Param("page") Page<Map<String, Object>> page,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("companyName") String companyName,
- @Param("phone") String phone,
- @Param("name") String name,
- @Param("addType") Integer addType,
- @Param("authState") Integer authState);
-
- /**
- * 查询已被使用的车辆ID
- * @return
- */
- String getUseCarIdStr(@Param("carId") Integer carId);
-
- /**
- * 查询当前可被选择的车辆列表
- * @return
- */
- List<Map<String,Object>> getCanSelectCarList(@Param("page") Page<Map<String, Object>> page,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("carIdStr") String carIdStr,
- @Param("carLicensePlate") String carLicensePlate,
- @Param("brandName") String brandName,
- @Param("modelName") String modelName,
- @Param("color") String color,
- @Param("serverStr") String serverStr);
-
- /**
- * 修改分公司司机的状态
- */
- void updateCompanyDriverState( @Param("authState") Integer authState, @Param("companyId") Integer companyId);
-
- /**
- * 修改加盟商司机的状态
- */
- void updateFranchiseeDriverState( @Param("authState") Integer authState, @Param("franchiseeId") Integer franchiseeId);
-
- /**
- * 根据审核通过的司机列表无分页
- * @return
- * @return
- */
- List<Map<String,Object>> getDriverListNoPage(@Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverServiceService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverServiceService.java
deleted file mode 100644
index 082131f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITDriverServiceService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.extension.service.IService;
-//import com.dsh.guns.modular.system.model.TDriverService;
-//
-///**
-// * <p>
-// * 司机经营业务 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-05
-// */
-//public interface ITDriverServiceService extends IService<TDriverService> {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeFoundationService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeFoundationService.java
deleted file mode 100644
index 03fd716..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeFoundationService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TEnsureIncomeFoundation;
-
-/**
- * <p>
- * 保证收入基础时间段配置 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface ITEnsureIncomeFoundationService extends IService<TEnsureIncomeFoundation> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeRuleService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeRuleService.java
deleted file mode 100644
index 650472f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeRuleService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TEnsureIncomeRule;
-
-/**
- * <p>
- * 保证收入 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface ITEnsureIncomeRuleService extends IService<TEnsureIncomeRule> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialService.java
deleted file mode 100644
index 47037ef..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecial;
-
-/**
- * <p>
- * 特殊时间段基础规则配置 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface ITEnsureIncomeSpecialService extends IService<TEnsureIncomeSpecial> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialTimeSoltService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialTimeSoltService.java
deleted file mode 100644
index 9981e5d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITEnsureIncomeSpecialTimeSoltService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecialTimeSolt;
-
-/**
- * <p>
- * 特殊时间段配置时间配置 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-public interface ITEnsureIncomeSpecialTimeSoltService extends IService<TEnsureIncomeSpecialTimeSolt> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITFeedbackService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITFeedbackService.java
deleted file mode 100644
index 96a57bd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITFeedbackService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TFeedback;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 反馈管理 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface ITFeedbackService extends IService<TFeedback> {
-
- /**
- * 根据条件查询用反馈记录列表
- * @return
- */
- List<Map<String,Object>> getFeedbackList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("type") Integer type,
- @Param("name") String name,
- @Param("phone") String phone,
- @Param("state") Integer state);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralGoodsService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralGoodsService.java
deleted file mode 100644
index 898cc24..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralGoodsService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TIntegralGoods;
-//import com.baomidou.mybatisplus.service.IService;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 积分商品管理 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//public interface ITIntegralGoodsService extends IService<TIntegralGoods> {
-//
-// /**
-// * 根据条件查询积分商品列表
-// * @return
-// */
-// List<Map<String,Object>> getIntegralGoodsList(@Param("page") Page<Map<String, Object>> page,
-// @Param("beginTime") String beginTime,
-// @Param("endTime") String endTime,
-// @Param("name") String name,
-// @Param("state") Integer state);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralOrderService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralOrderService.java
deleted file mode 100644
index f2b3165..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITIntegralOrderService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.baomidou.mybatisplus.extension.service.IService;
-//import com.dsh.guns.modular.system.model.TIntegralOrder;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 积分订单管理 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//public interface ITIntegralOrderService extends IService<TIntegralOrder> {
-//
-// /**
-// * 根据条件查询兑换订单列表
-// * @return
-// */
-// List<Map<String,Object>> getIntegralOrderList(@Param("page") Page<Map<String, Object>> page,
-// @Param("beginTime") String beginTime,
-// @Param("endTime") String endTime,
-// @Param("userName") String userName,
-// @Param("goodsName") String goodsName,
-// @Param("consigneeName") String consigneeName,
-// @Param("consigneePhone") String consigneePhone,
-// @Param("state") Integer state);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLineShiftService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLineShiftService.java
deleted file mode 100644
index ffb1b34..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLineShiftService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.dsh.guns.modular.system.model.TLineShift;
-//import com.baomidou.mybatisplus.service.IService;
-//
-///**
-// * <p>
-// * 线路班次 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-16
-// */
-//public interface ITLineShiftService extends IService<TLineShift> {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLocationService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLocationService.java
deleted file mode 100644
index b3b200a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITLocationService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TLocation;
-
-/**
- * <p>
- * 地点 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-04
- */
-public interface ITLocationService extends IService<TLocation> {
-
-
- /**
- * 定时任务更新线上围栏的有效时间
- * @throws Exception
- */
- void updateFence() throws Exception;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITMotorModelService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITMotorModelService.java
deleted file mode 100644
index f15db7f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITMotorModelService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.course.entity.MotorModel;
-
-/**
- * <p>
- * 车辆车型 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface ITMotorModelService extends IService<MotorModel> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITNoticesService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITNoticesService.java
deleted file mode 100644
index 8d72576..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITNoticesService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.course.entity.TNotices;
-import com.dsh.course.model.dto.TNoticeWarpper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 发布公告和滚动消息 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface ITNoticesService extends IService<TNotices> {
-
-
- /**
- * 获取公告列表
- * @param type
- * @return
- * @throws Exception
- */
- List<TNoticeWarpper> queryNotices(Integer type) throws Exception;
-
-
- /**
- * 根据条件查询滚动消息列表
- * @return
- */
- List<Map<String,Object>> getRollingNoticeList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("typeValue") Integer typeValue,
- @Param("content") String content,Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityBusinessService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityBusinessService.java
deleted file mode 100644
index 1c2840d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityBusinessService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TOpenCityBusiness;
-
-/**
- * <p>
- * 开通城市经营业务 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-public interface ITOpenCityBusinessService extends IService<TOpenCityBusiness> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityService.java
deleted file mode 100644
index fa4d44f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOpenCityService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TOpenCity;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 开通城市表 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-public interface ITOpenCityService extends IService<TOpenCity> {
-
- /**
- * 根据条件查询开通城市列表
- * @param page 分页
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @return
- */
- List<Map<String,Object>> getOpenCityList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("name") String name,
- @Param("language") Integer language);
-
- /**
- * 根据城市ID获取经营业务
- * @param openCityId
- * @return
- */
- List<Map<String,Object>> getBusinessByCityId(@Param("openCityId") Integer openCityId);
-
- List<Map<String,Object>> getBusinessListByCityId(@Param("openCityId") Integer openCityId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderCharterService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderCharterService.java
deleted file mode 100644
index 84f1936..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderCharterService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TOrderCharter;
-//import com.baomidou.mybatisplus.service.IService;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 包车订单 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//public interface ITOrderCharterService extends IService<TOrderCharter> {
-//
-// /**
-// * 根据条件查询包车订单列表
-// * @return
-// */
-// List<Map<String,Object>> getCharterOrderList(@Param("page") Page<Map<String, Object>> page,
-// @Param("beginTime") String beginTime,
-// @Param("endTime") String endTime,
-// @Param("userName") String userName,
-// @Param("contactName") String contactName,
-// @Param("contactPhone") String contactPhone,
-// @Param("useDemand") String useDemand,
-// @Param("state") Integer state);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderEvaluateService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderEvaluateService.java
deleted file mode 100644
index b723b8a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderEvaluateService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TOrderEvaluate;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 订单评价 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITOrderEvaluateService extends IService<TOrderEvaluate> {
-
- /**
- * 根据条件查询评价列表
- * @return
- */
- List<Map<String,Object>> getOrderEvaluateList(@Param("page") Page<Map<String, Object>> page,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("userName") String userName,
- @Param("userPhone") String userPhone,
- @Param("driverName") String driverName,
- @Param("driverPhone") String driverPhone,
- @Param("fraction") String fraction,
- @Param("orderType") Integer orderType,
- @Param("orderNum") String orderNum
-
- );
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderLogisticsService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderLogisticsService.java
deleted file mode 100644
index a2d3c75..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderLogisticsService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TOrderLogistics;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 订单-小件物流 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-24
- */
-public interface ITOrderLogisticsService extends IService<TOrderLogistics> {
-
- /**
- * 根据条件查询小件物流订单列表
- * @return
- */
- List<Map<String,Object>> getLogisticsOrderList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("orderNum") String orderNum,
- @Param("orderSource") Integer orderSource,
- @Param("type") Integer type,
- @Param("userName") String userName,
- @Param("userPhone") String userPhone,
- @Param("recipient") String recipient,
- @Param("recipientPhone") String recipientPhone,
- @Param("driver") String driver,
- @Param("state") Integer state);
-
- /**
- * 根据专车订单ID获取小件物流订单详情
- * @param orderId
- * @return
- */
- Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Long orderId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPositionService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPositionService.java
deleted file mode 100644
index 9321a5f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPositionService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TOrderPosition;
-
-/**
- * <p>
- * 订单坐标信息表 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-08
- */
-public interface ITOrderPositionService extends IService<TOrderPosition> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPrivateCarService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPrivateCarService.java
deleted file mode 100644
index ecb6d0c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITOrderPrivateCarService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TOrderPrivateCar;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 订单-专车 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-09-02
- */
-public interface ITOrderPrivateCarService extends IService<TOrderPrivateCar> {
-
- /**
- * 根据条件查询专车订单列表
- * @return
- */
- List<Map<String,Object>> getPrivateCarOrderList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("orderNum") String orderNum,
- @Param("orderSource") Integer orderSource,
- @Param("userName") String userName,
- @Param("userPhone") String userPhone,
- @Param("passengers") String passengers,
- @Param("passengersPhone") String passengersPhone,
- @Param("serverCarModelId") Integer serverCarModelId,
- @Param("driver") String driver,
- @Param("state") Integer state);
-
- /**
- * 根据专车订单ID获取专车订单详情
- * @param orderId
- * @return
- */
- Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Long orderId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPhoneService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPhoneService.java
deleted file mode 100644
index bb100a1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPhoneService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TPhone;
-import com.dsh.guns.modular.system.model.TSysSet;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 系统电话设置 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITPhoneService extends IService<TPhone> {
-
- TSysSet getWaitOver(Integer companyId);
-
-
- TSysSet getRegister(Integer companyId);
-
-
- TSysSet getUserLevel(Integer companyId);
-
- void updateWait(String json1,Integer companyId);
-
-
- void updateRegister(String json2,Integer companyId);
-
- void updateUserLevel(String json3,Integer companyId);
-
-
- void updateMotorPushOrder(String json4,Integer companyId);
-
- void updateSendOrder(String json5,Integer companyId);
-
- void updateCancel(Integer ptCancel1, BigDecimal ptCancel2,Integer companyId);
-
-
- void updateYyCancel(Integer yyCancel1, BigDecimal yyCancel2,Integer companyId);
-
- void updatePolice(String phone1,Integer companyId);
-
- void updateTalk(String phone2,Integer companyId);
-
- TSysSet getMin(Integer companyId);
-
- void updateMin(BigDecimal min,Integer companyId);
-
- TSysSet getIntegral(Integer companyId);
-
-
- void updateIntegral(String json0,Integer companyId);
-
- void addIntegral(String json0, Integer companyId);
-
-
- void addWait(String json1, Integer companyId);
-
- void addRegister(String json2, Integer companyId);
-
- void addUserLevel(String json3, Integer companyId);
-
- void addMotorPushOrder(String json4, Integer companyId);
-
- void addSendOrder(String json5, Integer companyId);
-
- void addCancel(Integer companyId);
-
-
- void addYyCancel(Integer companyId);
-
- void addPolice(Integer companyId);
-
- void addTalk(Integer companyId);
-
- void addMin(Integer companyId);
-
-
- BigDecimal getMinMoney();
-
-
- void updateMinMoney(Double minMoney);
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITProblemService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITProblemService.java
deleted file mode 100644
index 91e0e2f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITProblemService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TProblem;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 在线客服 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-24
- */
-public interface ITProblemService extends IService<TProblem> {
-
- /**
- * 根据条件查询用户留言列表
- * @return
- */
- List<Map<String,Object>> getProblemList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("userName") String userName,
- @Param("state") Integer state);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubTransactionDetailsService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubTransactionDetailsService.java
deleted file mode 100644
index d144393..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubTransactionDetailsService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.dsh.guns.modular.system.model.TPubTransactionDetails;
-//import com.baomidou.mybatisplus.service.IService;
-//
-///**
-// * <p>
-// * 交易明细(司机/用户) 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-16
-// */
-//public interface ITPubTransactionDetailsService extends IService<TPubTransactionDetails> {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubWithdrawalService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubWithdrawalService.java
deleted file mode 100644
index 0244813..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITPubWithdrawalService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-//package com.dsh.guns.modular.system.service;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TPubWithdrawal;
-//import com.baomidou.mybatisplus.service.IService;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 提现记录表(司机/用户) 服务类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-09
-// */
-//public interface ITPubWithdrawalService extends IService<TPubWithdrawal> {
-//
-// /**
-// * 根据条件查询提现列表
-// * @return
-// */
-// List<Map<String,Object>> getWithdrawalList(@Param("page") Page<Map<String, Object>> page,
-// @Param("beginTime") String beginTime,
-// @Param("endTime") String endTime,
-// @Param("name") String name,
-// @Param("withdrawalType") Integer withdrawalType);
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITRegionService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITRegionService.java
deleted file mode 100644
index 51f8854..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITRegionService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TRegion;
-
-/**
- * <p>
- * 省市区三级联动 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-public interface ITRegionService extends IService<TRegion> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITServerCarmodelService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITServerCarmodelService.java
deleted file mode 100644
index b5e24f6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITServerCarmodelService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TServerCarmodel;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务车型设置 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-public interface ITServerCarmodelService extends IService<TServerCarmodel> {
-
- /**
- * 根据条件查询服务车型列表
- */
- List<Map<String,Object>> getServerCarModelList(@Param("page") Page<Map<String, Object>> page,
- @Param("type") Integer type,
- @Param("name") String name,
- @Param("state") Integer state);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysCancleOrderService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysCancleOrderService.java
deleted file mode 100644
index 15a8485..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysCancleOrderService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSysCancleOrder;
-
-/**
- * <p>
- * 系统设置-取消订单 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITSysCancleOrderService extends IService<TSysCancleOrder> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysFaceDistinguishService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysFaceDistinguishService.java
deleted file mode 100644
index 740cd6d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysFaceDistinguishService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSysFaceDistinguish;
-
-/**
- * <p>
- * 系统设置-人脸识别 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITSysFaceDistinguishService extends IService<TSysFaceDistinguish> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysIntegralService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysIntegralService.java
deleted file mode 100644
index 8aba757..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysIntegralService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSysIntegral;
-
-/**
- * <p>
- * 系统设置-积分 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITSysIntegralService extends IService<TSysIntegral> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysPushOrderService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysPushOrderService.java
deleted file mode 100644
index 46b487f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysPushOrderService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSysPushOrder;
-
-/**
- * <p>
- * 系统设置-推单 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITSysPushOrderService extends IService<TSysPushOrder> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysReformistService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysReformistService.java
deleted file mode 100644
index 6f005bc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysReformistService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSysReformist;
-
-/**
- * <p>
- * 系统设置-改派 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITSysReformistService extends IService<TSysReformist> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysSensitiveWordsService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysSensitiveWordsService.java
deleted file mode 100644
index 9cc5bcb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSysSensitiveWordsService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSysSensitiveWords;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 系统设置-敏感词 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-public interface ITSysSensitiveWordsService extends IService<TSysSensitiveWords> {
-
- /**
- * 根据条件查询敏感词列表
- * @return
- */
- List<Map<String,Object>> getSensitiveWordList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("content") String content,Integer yy);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemNoticeService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemNoticeService.java
deleted file mode 100644
index 6165667..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemNoticeService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-
-/**
- * <p>
- * 系统通知 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface ITSystemNoticeService extends IService<TSystemNotice> {
-
- void save1(TSystemNotice notice);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceService.java
deleted file mode 100644
index 6548730..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSystemPrice;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务价格规则 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-public interface ITSystemPriceService extends IService<TSystemPrice> {
-
- /**
- * 查询专车价格设置
- */
- List<Map<String,Object>> getSpecialPriceList(@Param("page") Page<Map<String, Object>> page,
- @Param("companyId") Integer companyId,
- @Param("name") String name,
- @Param("state") Integer state);
-
- void saveService(Integer type, Integer openCityId, Integer type1,String json2,String code,Integer userId,String remark);
-
- List<Map<String, Object>> getServicePriceList(Page<Map<String, Object>> page ,String time, String company, String phone, String account, Integer state);
-
-
- List<TSystemPriceService> getService(String tSystemPriceId);
-
-
- void updateCheck(String id, Integer check);
-
-
- void updateState(String tSystemPriceId);
-
-
- void saveMotoService(Integer openCityId, Integer serverCarModelId, Integer type, String json1, Integer i, String randomNumber,Integer userId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceServiceService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceServiceService.java
deleted file mode 100644
index 91ebf6c..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITSystemPriceServiceService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-
-/**
- * @author zhibing.pu
- * @date 2023/3/25 18:11
- */
-public interface ITSystemPriceServiceService extends IService<TSystemPriceService> {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserLargeService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserLargeService.java
deleted file mode 100644
index d33b637..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserLargeService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TCarModel;
-import com.dsh.guns.modular.system.model.TUserLargeCoupon;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆车型 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-public interface ITUserLargeService extends IService<TUserLargeCoupon> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserService.java
deleted file mode 100644
index 72c0dd5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITUserService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TUser;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 用户信息 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-01
- */
-@Component
-public interface ITUserService extends IService<TUser> {
-
- /**
- * 根据条件查询用户列表
- * @param page 分页
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @param isAuth 是否实名认证
- * @param state 状态
- * @param id 用户ID
- * @param nickName 用户昵称
- * @return
- */
- List<Map<String,Object>> getUserList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId,
- @Param("isAuth") Integer isAuth,
- @Param("state") Integer state,
- @Param("id") String id,
- @Param("nickName") String nickName,
- @Param("phone") String phone,
- @Param("companyName") String companyName);
-
- /**
- * 根据用户ID获取用户详情
- * @param userId
- * @return
- */
- Map<String,Object> getUserDetailById(@Param("userId") Integer userId);
-
- /**
- * 根据条件查询用户列表-无分页
- * @return
- */
- List<Map<String,Object>> getUserListNoPage(@Param("roleType") Integer roleType,
- @Param("nowUserId") Integer nowUserId);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITVersionManagementService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITVersionManagementService.java
deleted file mode 100644
index 9da25b6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITVersionManagementService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TVersionManagement;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 版本管理 服务类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-public interface ITVersionManagementService extends IService<TVersionManagement> {
-
- /**
- * 根据条件查询版本列表
- * @return
- */
- List<Map<String,Object>> getVersionList(@Param("page") Page<Map<String, Object>> page,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime,
- @Param("version") String version);
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbBannerService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbBannerService.java
deleted file mode 100644
index 87427ca..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbBannerService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbBanner;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface ITbBannerService extends IService<TbBanner> {
-
- List<TbBanner> selectAll(String time);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbChatSetService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbChatSetService.java
deleted file mode 100644
index 6dcdc22..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbChatSetService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbChatSet;
-
-import java.util.List;
-
-public interface ITbChatSetService extends IService<TbChatSet> {
- List<TbChatSet> getList(String time, Integer type,Integer yy);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbGuidePageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbGuidePageService.java
deleted file mode 100644
index 2069e55..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbGuidePageService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbGuidePage;
-import com.dsh.guns.modular.system.model.TbStartPage;
-
-/**
- * <p>
- * banner信息表 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface ITbGuidePageService extends IService<TbGuidePage> {
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbHotAddressService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbHotAddressService.java
deleted file mode 100644
index 0537a33..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbHotAddressService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbGuidePage;
-import com.dsh.guns.modular.system.model.TbHotAddress;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface ITbHotAddressService extends IService<TbHotAddress> {
-
-
- List<TbHotAddress> getList(String time, String name);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbStartPageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbStartPageService.java
deleted file mode 100644
index aac7399..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbStartPageService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbBanner;
-import com.dsh.guns.modular.system.model.TbStartPage;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-public interface ITbStartPageService extends IService<TbStartPage> {
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbUserExitService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbUserExitService.java
deleted file mode 100644
index 481866e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbUserExitService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbUserExit;
-import com.dsh.guns.modular.system.model.TbVoice;
-
-import java.util.List;
-
-public interface ITbUserExitService extends IService<TbUserExit> {
-
- List<TbUserExit> getList(String time, String name, Integer state);
-
- void getSevenDay();
-
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbVoiceService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbVoiceService.java
deleted file mode 100644
index b587d02..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ITbVoiceService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TbStartPage;
-import com.dsh.guns.modular.system.model.TbVoice;
-
-import java.util.List;
-
-public interface ITbVoiceService extends IService<TbVoice> {
- List<TbVoice> getList(String name, Integer state);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserActivityDiscount1Service.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserActivityDiscount1Service.java
deleted file mode 100644
index 329884d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserActivityDiscount1Service.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.UserActivityDiscount1;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.Map;
-
-/**
- * <p>
- * 用户活动-折扣1 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-19
- */
-public interface IUserActivityDiscount1Service extends IService<UserActivityDiscount1> {
-
-
- /**
- * 获取折扣
- * @param name
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryDiscount1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载折扣优惠
- * @param name
- * @param time
- * @param companyId
- * @return
- * @throws Exception
- */
- HSSFWorkbook downloadDiscount1(String name, String time, Integer companyId) throws Exception;
-
-
- /**
- * 获取折扣优惠券详情
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryDiscountInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载折扣优惠详情
- * @param name
- * @param time
- * @param companyId
- * @return
- * @throws Exception
- */
- HSSFWorkbook downloadDiscountInfo(String name, String time, Integer companyId) throws Exception;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserCouponRecordService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserCouponRecordService.java
deleted file mode 100644
index 4ecd46e..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserCouponRecordService.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.UserCouponRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 用户优惠券记录 服务类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-public interface IUserCouponRecordService extends IService<UserCouponRecord> {
-
- List<Map<String,Object>> getList(Page<Map<String, Object>> page,
- String beginTime,
- String endTime,
- String userName,
- String userPhone,
- Integer couponActivityId,
- Integer activityType, Integer state);
-
- List<Map<String,Object>> getRedList(Page<Map<String, Object>> page,
- String beginTime,
- String endTime,
- String userName,
- String userPhone,
- Integer couponActivityId,Integer state);
-
- /**
- * 统计优惠券
- * @param beginTime
- * @param endTime
- * @param activityId
- * @param activityType
- * @return
- */
- Map<String,Object> getCouponStatic(
- String beginTime,
- String endTime,
- Integer activityId,
- Integer activityType);
-
- /**
- * 统计红包
- * @param beginTime
- * @param endTime
- * @param activityId
- * @return
- */
- Map<String,Object> getRedStatic(
- String beginTime,
- String endTime,
- Integer activityId);
-
-
- /**
- * 获取充值统计
- * @param beginTime
- * @param endTime
- * @param activityId
- * @return
- */
- Map<String,Object> getRegStatic(
- String beginTime,
- String endTime,
- Integer activityId);
-
- /**
- * 获取打折统计
- * @param beginTime
- * @param endTime
- * @param activityId
- * @return
- */
- Map<String,Object> getDiscountStatic(
- String beginTime,
- String endTime,
- Integer activityId);
-
- /**
- * 获取充值记录
- * @param page
- * @param beginTime
- * @param endTime
- * @param activityId
- * @return
- */
- List<Map<String,Object>> getBlanceList( Page<Map<String, Object>> page,
- String beginTime,
- String endTime,
- Integer activityId);
-
-
- /**
- * 获取优惠券领取数据
- * @param type
- * @param name
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryCouponRegister(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载优惠券领取数据
- * @param type
- * @param name
- * @param time
- * @param companyId
- * @return
- * @throws Exception
- */
- HSSFWorkbook downloadCouponRegister(Integer type, String name, String time, Integer companyId) throws Exception;
-
-
- /**
- * 获取优惠券统计明细
- * @param type
- * @param name
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryCouponRegisterInfo(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载优惠券统计明细
- * @param type
- * @param name
- * @param time
- * @param companyId
- * @return
- */
- HSSFWorkbook downloadCouponRegisterInfo(Integer type, String name, String time, Integer companyId);
-
-
-
- /**
- * 获取充值优惠券明细
- * @param name
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryCouponRegisterInfo1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载充值优惠券明细
- * @param name
- * @param time
- * @param companyId
- * @return
- */
- HSSFWorkbook downloadCouponRegisterInfo1(String name, String time, Integer companyId);
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserRedPacketRecordService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserRedPacketRecordService.java
deleted file mode 100644
index 8ded564..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IUserRedPacketRecordService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.UserRedPacketRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IUserRedPacketRecordService extends IService<UserRedPacketRecord> {
-
-
- /**
- * 获取红包统计数据
- * @param name
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryRedEnvelopes(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载红包统计数据
- * @param name
- * @param time
- * @param companyId
- * @return
- * @throws Exception
- */
- HSSFWorkbook downloadRedEnvelopes(String name, String time, Integer companyId) throws Exception;
-
-
- /**
- * 获取红包统计明细
- * @param name
- * @param time
- * @param companyId
- * @param offset
- * @param limit
- * @return
- * @throws Exception
- */
- Map<String, Object> queryRedEnvelopesInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
-
-
- /**
- * 下载红包统计明细
- * @param name
- * @param time
- * @param companyId
- * @return
- * @throws Exception
- */
- HSSFWorkbook downloadRedEnvelopesInfo(String name, String time, Integer companyId) throws Exception;
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/TPopularizeCodeService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/TPopularizeCodeService.java
deleted file mode 100644
index 113f954..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/TPopularizeCodeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsh.guns.modular.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.guns.modular.system.model.TPopularizeCode;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author administrator
- * @since 2023-04-17
- */
-public interface TPopularizeCodeService extends IService<TPopularizeCode> {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
deleted file mode 100644
index cbb7ddd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.DeptMapper;
-import com.dsh.course.model.node.ZTreeNode;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.dsh.guns.modular.system.model.Dept;
-import com.dsh.guns.modular.system.service.IDeptService;
-
-@Service
-@Transactional
-public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
-
- @Resource
- private DeptMapper deptMapper;
-
- @Override
- public void deleteDept(Integer deptId) {
- Dept dept = deptMapper.selectById(deptId);
-
- QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper = wrapper.like("pids", "%[" + dept.getId() + "]%");
- List<Dept> subDepts = deptMapper.selectList(wrapper);
- for (Dept temp : subDepts) {
- temp.deleteById();
- }
-
- dept.deleteById();
- }
-
- @Override
- public List<ZTreeNode> tree() {
- return this.baseMapper.tree();
- }
-
- @Override
- public List<Map<String, Object>> list(String condition) {
- return this.baseMapper.list(condition);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DictServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DictServiceImpl.java
deleted file mode 100644
index 4489569..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DictServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import static com.dsh.guns.core.common.constant.factory.MutiStrFactory.MUTI_STR_CODE;
-import static com.dsh.guns.core.common.constant.factory.MutiStrFactory.MUTI_STR_NAME;
-import static com.dsh.guns.core.common.constant.factory.MutiStrFactory.MUTI_STR_NUM;
-import static com.dsh.guns.core.common.constant.factory.MutiStrFactory.parseKeyValue;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.DictMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.dsh.guns.core.common.exception.BizExceptionEnum;
-import com.dsh.guns.core.exception.GunsException;
-import com.dsh.guns.modular.system.model.Dict;
-import com.dsh.guns.modular.system.service.IDictService;
-
-@Service
-@Transactional
-public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements IDictService {
-
- @Resource
- private DictMapper dictMapper;
-
- @Override
- public void addDict(String dictCode,String dictName,String dictTips, String dictValues) {
- //判断有没有该字典
- //Check if the dictionary exists
- List<Dict> dicts = dictMapper.selectList(new QueryWrapper<Dict>().eq("code", dictCode).eq("pid", 0));
- if (dicts != null && dicts.size() > 0) {
- throw new GunsException(BizExceptionEnum.DICT_EXISTED);
- }
-
- //解析dictValues
- List<Map<String, String>> items = parseKeyValue(dictValues);
-
- //添加字典 add dict
- Dict dict = new Dict();
- dict.setName(dictName);
- dict.setCode(dictCode);
- dict.setTips(dictTips);
- dict.setNum(0);
- dict.setPid(0);
- this.dictMapper.insert(dict);
-
- //添加字典条目 Add dictionary entry
- for (Map<String, String> item : items) {
- String code = item.get(MUTI_STR_CODE);
- String name = item.get(MUTI_STR_NAME);
- String num = item.get(MUTI_STR_NUM);
- Dict itemDict = new Dict();
- itemDict.setPid(dict.getId());
- itemDict.setCode(code);
- itemDict.setName(name);
-
- try {
- itemDict.setNum(Integer.valueOf(num));
- } catch (NumberFormatException e) {
- throw new GunsException(BizExceptionEnum.DICT_MUST_BE_NUMBER);
- }
- this.dictMapper.insert(itemDict);
- }
- }
-
- @Override
- public void editDict(Integer dictId,String dictCode, String dictName,String dictTips, String dicts) {
- //删除之前的字典 add before dict
- this.delteDict(dictId);
-
- //重新添加新的字典 Add a new dictionary again
- this.addDict(dictCode,dictName,dictTips, dicts);
- }
-
- @Override
- public void delteDict(Integer dictId) {
- //删除这个字典的子词典 Delete the sub-dictionary of this dictionary.
- QueryWrapper<Dict> dictEntityWrapper = new QueryWrapper<>();
- dictEntityWrapper = dictEntityWrapper.eq("pid", dictId);
- dictMapper.delete(dictEntityWrapper);
-
- //删除这个词典 Delete the dictionary
- dictMapper.deleteById(dictId);
- }
-
- @Override
- public List<Dict> selectByCode(String code) {
- return this.baseMapper.selectByCode(code);
- }
-
- @Override
- public List<Dict> selectByParentCode(String code) {
- return this.baseMapper.selectByParentCode(code);
- }
-
-
- @Override
- public List<Map<String, Object>> list(String conditiion) {
- return this.baseMapper.list(conditiion);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverOnlineServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
deleted file mode 100644
index a26f996..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import com.dsh.guns.modular.system.dao.DriverOnlineMapper;
-//import com.dsh.guns.modular.system.model.DriverOnline;
-//import com.dsh.guns.modular.system.service.IDriverOnlineService;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//
-//@Service
-//public class DriverOnlineServiceImpl extends ServiceImpl<DriverOnlineMapper, DriverOnline> implements IDriverOnlineService {
-//
-// @Resource
-// private DriverOnlineMapper driverOnlineMapper;
-//
-//
-//
-//
-// /**
-// * 获取列表数据
-// * @param name
-// * @param phone
-// * @param offset
-// * @param limit
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public Map<String, Object> queryOnlineDriver(String name, String phone, Integer offset, Integer limit) throws Exception {
-// Map<String, Object> map = new HashMap<>();
-// List<Map<String, Object>> list = driverOnlineMapper.queryOnlineDriver(name, phone, offset, limit);
-// int i = driverOnlineMapper.queryOnlineDriverCount(name, phone);
-// map.put("rows", list);
-// map.put("total", i);
-// return map;
-// }
-//
-// @Override
-// public int queryOnlineDriverCount(String name, String phone) {
-// return driverOnlineMapper.queryOnlineDriverCount(name, phone);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverVerifyServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverVerifyServiceImpl.java
deleted file mode 100644
index 0c02e16..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DriverVerifyServiceImpl.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.DriverVerifyMapper;
-import com.dsh.guns.modular.system.model.DriverVerify;
-import com.dsh.guns.modular.system.service.DriverVerifyService;
-import org.springframework.stereotype.Service;
-@Service
-public class DriverVerifyServiceImpl extends ServiceImpl<DriverVerifyMapper, DriverVerify> implements DriverVerifyService {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/LoginLogServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/LoginLogServiceImpl.java
deleted file mode 100644
index 10e9e45..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/LoginLogServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.LoginLogMapper;
-import org.springframework.stereotype.Service;
-
-import com.dsh.guns.modular.system.model.LoginLog;
-import com.dsh.guns.modular.system.service.ILoginLogService;
-
-/**
- * <p>
- * 登录记录 服务实现类
- * </p>
- *
- * @author stylefeng123
- * @since 2018-02-22
- */
-@Service
-public class LoginLogServiceImpl extends ServiceImpl<LoginLogMapper, LoginLog> implements ILoginLogService {
-
- @Override
- public List<Map<String, Object>> getLoginLogs(Page<LoginLog> page, String beginTime, String endTime, String logName, String orderByField, boolean asc) {
- return this.baseMapper.getLoginLogs(page, beginTime, endTime, logName, orderByField, asc);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
deleted file mode 100644
index fe4a69a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.MenuMapper;
-import com.dsh.course.model.node.MenuNode;
-import com.dsh.course.model.node.ZTreeNode;
-import org.springframework.stereotype.Service;
-
-import com.dsh.guns.modular.system.model.Menu;
-import com.dsh.guns.modular.system.service.IMenuService;
-
-/**
- * 菜单服务
- *
- * @author fengshuonan
- * @date 2017-05-05 22:20
- */
-@Service
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
-
- @Resource
- private MenuMapper menuMapper;
-
- @Override
- public void delMenu(Long menuId) {
-
- //删除菜单 delete menu
- this.menuMapper.deleteById(menuId);
-
- //删除关联的delete relation
- this.menuMapper.deleteRelationByMenu(menuId);
- }
-
- @Override
- public void delMenuContainSubMenus(Long menuId) {
-
- Menu menu = menuMapper.selectById(menuId);
-
- //删除当前菜单 dele current menu
- delMenu(menuId);
-
- //删除所有子菜单 delete all sub menu
- QueryWrapper<Menu> wrapper = new QueryWrapper<>();
- wrapper = wrapper.like("pcodes", "%[" + menu.getCode() + "]%");
- List<Menu> menus = menuMapper.selectList(wrapper);
- for (Menu temp : menus) {
- delMenu(temp.getId());
- }
- }
-
- @Override
- public List<Map<String, Object>> selectMenus(String condition, String level) {
- return this.baseMapper.selectMenus(condition, level);
- }
-
- @Override
- public List<Long> getMenuIdsByRoleId(Integer roleId) {
- return this.baseMapper.getMenuIdsByRoleId(roleId);
- }
-
- @Override
- public List<ZTreeNode> menuTreeList() {
- return this.baseMapper.menuTreeList();
- }
-
- @Override
- public List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds) {
- return this.baseMapper.menuTreeListByMenuIds(menuIds);
- }
-
- @Override
- public int deleteRelationByMenu(Long menuId) {
- return this.baseMapper.deleteRelationByMenu(menuId);
- }
-
- @Override
- public List<String> getResUrlsByRoleId(Integer roleId) {
- return this.baseMapper.getResUrlsByRoleId(roleId);
- }
-
- @Override
- public List<MenuNode> getMenusByRoleIds(List<String> roleIds) {
- return this.baseMapper.getMenusByRoleIds(roleIds);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/NoticeServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/NoticeServiceImpl.java
deleted file mode 100644
index efbcc9a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/NoticeServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.NoticeMapper;
-import org.springframework.stereotype.Service;
-
-import com.dsh.guns.modular.system.model.Notice;
-import com.dsh.guns.modular.system.service.INoticeService;
-
-/**
- * <p>
- * 通知表 服务实现类
- * </p>
- *
- * @author stylefeng123
- * @since 2018-02-22
- */
-@Service
-public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
-
- @Override
- public List<Map<String, Object>> list(String condition) {
- return this.baseMapper.list(condition);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/OperationLogServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/OperationLogServiceImpl.java
deleted file mode 100644
index 3eeebf4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/OperationLogServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.OperationLogMapper;
-import org.springframework.stereotype.Service;
-
-import com.dsh.guns.modular.system.model.OperationLog;
-import com.dsh.guns.modular.system.service.IOperationLogService;
-
-/**
- * <p>
- * 操作日志 服务实现类
- * </p>
- *
- * @author stylefeng123
- * @since 2018-02-22
- */
-@Service
-public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, OperationLog> implements IOperationLogService {
-
- @Override
- public List<Map<String, Object>> getOperationLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String s) {
- return this.baseMapper.getOperationLogs(page, beginTime, endTime, logName, s);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RelationServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RelationServiceImpl.java
deleted file mode 100644
index 38e81bd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RelationServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.RelationMapper;
-import org.springframework.stereotype.Service;
-
-import com.dsh.guns.modular.system.model.Relation;
-import com.dsh.guns.modular.system.service.IRelationService;
-
-/**
- * <p>
- * 角色和菜单关联表 服务实现类
- * </p>
- *
- * @author stylefeng123
- * @since 2018-02-22
- */
-@Service
-public class RelationServiceImpl extends ServiceImpl<RelationMapper, Relation> implements IRelationService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
deleted file mode 100644
index 2e2f50a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.RelationMapper;
-import com.dsh.course.mapper.RoleMapper;
-import com.dsh.course.model.node.ZTreeNode;
-import com.dsh.guns.modular.system.controller.util.Convert;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.dsh.guns.modular.system.model.Relation;
-import com.dsh.guns.modular.system.model.Role;
-import com.dsh.guns.modular.system.service.IRoleService;
-
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
-
- @Resource
- private RoleMapper roleMapper;
-
- @Resource
- private RelationMapper relationMapper;
-
- @Override
- @Transactional(readOnly = false)
- public void setAuthority(Integer roleId, String ids) {
-
- // 删除该角色所有的权限 Delete all permissions for this role.
- this.roleMapper.deleteRolesById(roleId);
-
- // 添加新的权限 add new permissions
- for (Long id : Convert.toLongArray(true, Convert.toStrArray(",", ids))) {
- Relation relation = new Relation();
- relation.setRoleid(roleId);
- relation.setMenuid(id);
- this.relationMapper.insert(relation);
- }
- }
-
- @Override
- @Transactional(readOnly = false)
- public void delRoleById(Integer roleId) {
- //删除角色 delete role
- this.roleMapper.deleteById(roleId);
-
- // 删除该角色所有的权限 Delete all permissions for this role.
- this.roleMapper.deleteRolesById(roleId);
- }
-
- @Override
- public List<Map<String, Object>> selectRoles(String condition) {
- return this.baseMapper.selectRoles(condition);
- }
-
- @Override
- public int deleteRolesById(Integer roleId) {
- return this.baseMapper.deleteRolesById(roleId);
- }
-
- @Override
- public List<ZTreeNode> roleTreeList() {
- return this.baseMapper.roleTreeList();
- }
-
- @Override
- public List<ZTreeNode> roleTreeListByRoleId(String[] roleId) {
- return this.baseMapper.roleTreeListByRoleId(roleId);
- }
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java
deleted file mode 100644
index b0ebd45..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.SysCouponActivityMapper;
-import com.dsh.guns.modular.system.model.SysCouponActivity;
-import com.dsh.guns.modular.system.service.ISysCouponActivityService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-优惠券活动 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-17
- */
-@Service
-public class SysCouponActivityServiceImpl extends ServiceImpl<SysCouponActivityMapper, SysCouponActivity> implements ISysCouponActivityService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java
deleted file mode 100644
index 6412098..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.SysCouponRecordMapper;
-import com.dsh.guns.modular.system.model.SysCouponRecord;
-import com.dsh.guns.modular.system.service.ISysCouponRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-优惠券记录 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-15
- */
-@Service
-public class SysCouponRecordServiceImpl extends ServiceImpl<SysCouponRecordMapper, SysCouponRecord> implements ISysCouponRecordService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
deleted file mode 100644
index 0d92abc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.SysRedPacketRecordMapper;
-import com.dsh.guns.modular.system.model.SysRedPacketRecord;
-import com.dsh.guns.modular.system.service.ISysRedPacketRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-红包记录 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2020-06-13
- */
-@Service
-public class SysRedPacketRecordServiceImpl extends ServiceImpl<SysRedPacketRecordMapper, SysRedPacketRecord> implements ISysRedPacketRecordService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAgreementServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAgreementServiceImpl.java
deleted file mode 100644
index 1849aef..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAgreementServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TAgreementMapper;
-import com.dsh.guns.modular.system.model.TAgreement;
-import com.dsh.guns.modular.system.service.ITAgreementService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 平台协议 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-01
- */
-@Service
-public class TAgreementServiceImpl extends ServiceImpl<TAgreementMapper, TAgreement> implements ITAgreementService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAuditRecordServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAuditRecordServiceImpl.java
deleted file mode 100644
index 8d77ede..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TAuditRecordServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TAuditRecordMapper;
-import com.dsh.guns.modular.system.model.TAuditRecord;
-import com.dsh.guns.modular.system.service.ITAuditRecordService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 审核记录表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-25
- */
-@Service
-public class TAuditRecordServiceImpl extends ServiceImpl<TAuditRecordMapper, TAuditRecord> implements ITAuditRecordService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarBrandServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarBrandServiceImpl.java
deleted file mode 100644
index 36f739a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarBrandServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TCarBrandMapper;
-import com.dsh.guns.modular.system.model.TCarBrand;
-import com.dsh.guns.modular.system.service.ITCarBrandService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆品牌 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@Service
-public class TCarBrandServiceImpl extends ServiceImpl<TCarBrandMapper, TCarBrand> implements ITCarBrandService {
-
- @Override
- public List<Map<String, Object>> getCarBrandList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,Integer yy) {
- return this.baseMapper.getCarBrandList(page, beginTime, endTime, name,yy);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarModelServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarModelServiceImpl.java
deleted file mode 100644
index 8abb2db..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarModelServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TCarModelMapper;
-import com.dsh.guns.modular.system.model.TCarModel;
-import com.dsh.guns.modular.system.service.ITCarModelService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆车型 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@Service
-public class TCarModelServiceImpl extends ServiceImpl<TCarModelMapper, TCarModel> implements ITCarModelService {
-
- @Override
- public List<Map<String, Object>> getCarModelList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,Integer yy) {
- return this.baseMapper.getCarModelList(page, beginTime, endTime, name,yy);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceImpl.java
deleted file mode 100644
index f55c526..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.activity.model.DriverNameReq;
-import com.dsh.course.feignClient.activity.model.DriverNameRes;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.mapper.TCarMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.modular.system.model.Driver;
-import com.dsh.guns.modular.system.model.TCar;
-import com.dsh.guns.modular.system.service.ITCarService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 车辆 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@Service
-public class TCarServiceImpl extends ServiceImpl<TCarMapper, TCar> implements ITCarService {
-
- @Autowired
- private DriverClient driverClient;
-
- @Autowired
- private CompanyClient companyClient;
-
- @Override
- public List<Map<String, Object>> getCarList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String id, String brandName, String modelName, String carColor, String serverStr, String carLicensePlate, String driverName, String companyName, String franchiseeName) {
- List<Map<String, Object>> list = new ArrayList<>();
- if(id=="")
- id=null;
- if(brandName=="")
- brandName=null;
- if(modelName=="")
- modelName=null;
- if(carColor=="")
- carColor=null;
- if(serverStr=="")
- serverStr=null;
- if(carLicensePlate=="")
- carLicensePlate=null;
- if(driverName=="")
- driverName=null;
- if(companyName=="")
- companyName=null;
- if(franchiseeName=="")
- franchiseeName=null;
- if(driverName==null || driverName=="") {
- Integer language = UserExt.getLanguage();
- String ids = driverClient.getGroupConcat(nowUserId);
- List<Map<String, Object>> carList = this.baseMapper.getCarList(page, roleType, nowUserId, beginTime, endTime, id, brandName, modelName, carColor, serverStr, carLicensePlate, driverName, companyName, franchiseeName,language,ids);
- for (Map<String, Object> stringObjectMap : carList) {
- stringObjectMap.put("carColor",stringObjectMap.get("color"));
- }
- ArrayList<Integer> integers = new ArrayList<>();
-
- for (Map<String, Object> data : carList) {
- integers.add((Integer) data.get("id"));
- // 所属机构 Affiliated institution
- Integer companyId = (Integer)data.get("companyId");
- CompanyInfoRes companyInfoRes = companyClient.queryById(companyId);
- data.put("companyName", null == companyInfoRes ? "" : companyInfoRes.getName());
- }
- // 关联司机 Associated driver
- List<DriverNameRes> name = driverClient.getDriverName(new DriverNameReq(integers, driverName,companyName,franchiseeName));
- for (DriverNameRes driverNameRes : name) {
- for (Map<String, Object> stringObjectMap : carList) {
- if (((Integer) stringObjectMap.get("id")).equals(driverNameRes.getId())) {
- stringObjectMap.put("driverName", driverNameRes.getDriverName());
-// if(driverNameRes.getFname()!=null){
-// stringObjectMap.put("companyName", driverNameRes.getFname());
-// }
-// if(driverNameRes.getCname()!=null){
-// stringObjectMap.put("companyName", driverNameRes.getCname());
-// }
-
- list.add(stringObjectMap);
- }
- }
- }
-
- return list;
- }else {
- List<Driver> drivers = driverClient.getdriverFromName(driverName);
- ArrayList<Integer> integers = new ArrayList<>();
- for (Driver driver : drivers) {
- integers.add(driver.getCarId());
- }
- if(integers.size()==0){
- integers.add(-1);
- }
- String ids = driverClient.getGroupConcat(nowUserId);
- List<Map<String, Object>> carList = this.baseMapper.getCarList1(page, roleType, nowUserId, beginTime, endTime, id, brandName, modelName, carColor, serverStr, carLicensePlate, driverName, companyName, franchiseeName,integers,ids);
- for (Map<String, Object> stringObjectMap : carList) {
- for (Driver driver : drivers) {
- if(stringObjectMap.get("id").equals(driver.getCarId())){
- stringObjectMap.put("driverName",driver.getName());
- list.add(stringObjectMap);
- }
- }
- }
- return list;
- }
- }
-
- @Override
- public List<Map<String, Object>> getCarListNoPage(Integer roleType, Integer nowUserId) {
- return this.baseMapper.getCarListNoPage(roleType, nowUserId);
- }
-
- @Override
- public TCar getById1(Integer carId1) {
- return this.baseMapper.getById1(carId1);
-
- }
-
- @Override
- public TCar getCarID(String newCarId) {
- return this.baseMapper.getCarID(newCarId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceServiceImpl.java
deleted file mode 100644
index f547168..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TCarServiceServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TCarServiceMapper;
-import com.dsh.guns.modular.system.model.TCarService;
-import com.dsh.guns.modular.system.service.ITCarServiceService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 车辆经营业务 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@Service
-public class TCarServiceServiceImpl extends ServiceImpl<TCarServiceMapper, TCarService> implements ITCarServiceService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDispatchServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDispatchServiceImpl.java
deleted file mode 100644
index de7e34f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDispatchServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.dsh.guns.modular.system.model.TDispatch;
-//import com.dsh.guns.modular.system.service.ITDispatchService;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 调度管理 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-01
-// */
-//@Service
-//public class TDispatchServiceImpl extends ServiceImpl<TDispatchMapper, TDispatch> implements ITDispatchService {
-//
-// @Override
-// public List<Map<String, Object>> getDispatchList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String name, String companyName, String franchiseeName, String account, Integer state) {
-// return this.baseMapper.getDispatchList(page, roleType, nowUserId, beginTime, endTime, name, companyName, franchiseeName, account, state);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceImpl.java
deleted file mode 100644
index 9a872bd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TDriver;
-//import com.dsh.guns.modular.system.dao.TDriverMapper;
-//import com.dsh.guns.modular.system.service.ITDriverService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 司机表 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-04
-// */
-//@Service
-//public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {
-//
-// @Override
-// public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
-// return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
-// }
-//
-// @Override
-// public Map<String, Object> getDriverById(Integer driverId) {
-// return this.baseMapper.getDriverById(driverId);
-// }
-//
-// @Override
-// public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
-// return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
-// }
-//
-// @Override
-// public String getUseCarIdStr(Integer carId) {
-// return this.baseMapper.getUseCarIdStr(carId);
-// }
-//
-// @Override
-// public List<Map<String, Object>> getCanSelectCarList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String carIdStr, String carLicensePlate, String brandName, String modelName, String color, String serverStr) {
-// return this.baseMapper.getCanSelectCarList(page, roleType, nowUserId, carIdStr, carLicensePlate, brandName, modelName, color, serverStr);
-// }
-//
-// @Override
-// public void updateCompanyDriverState(Integer authState, Integer companyId) {
-// this.baseMapper.updateCompanyDriverState(authState, companyId);
-// }
-//
-// @Override
-// public void updateFranchiseeDriverState(Integer authState, Integer franchiseeId) {
-// this.baseMapper.updateFranchiseeDriverState(authState, franchiseeId);
-// }
-//
-// @Override
-// public List<Map<String, Object>> getDriverListNoPage(Integer roleType, Integer nowUserId) {
-// return this.baseMapper.getDriverListNoPage(roleType, nowUserId);
-// }
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceServiceImpl.java
deleted file mode 100644
index b21ed72..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TDriverServiceServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.modular.system.model.TDriverService;
-//import com.dsh.guns.modular.system.dao.TDriverServiceMapper;
-//import com.dsh.guns.modular.system.service.ITDriverServiceService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 司机经营业务 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-05
-// */
-//@Service
-//public class TDriverServiceServiceImpl extends ServiceImpl<TDriverServiceMapper, TDriverService> implements ITDriverServiceService {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeFoundationServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeFoundationServiceImpl.java
deleted file mode 100644
index 2a75853..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeFoundationServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TEnsureIncomeFoundationMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeFoundation;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeFoundationService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 保证收入基础时间段配置 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Service
-public class TEnsureIncomeFoundationServiceImpl extends ServiceImpl<TEnsureIncomeFoundationMapper, TEnsureIncomeFoundation> implements ITEnsureIncomeFoundationService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeRuleServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeRuleServiceImpl.java
deleted file mode 100644
index fbbebe0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeRuleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TEnsureIncomeRuleMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeRule;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeRuleService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 保证收入 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Service
-public class TEnsureIncomeRuleServiceImpl extends ServiceImpl<TEnsureIncomeRuleMapper, TEnsureIncomeRule> implements ITEnsureIncomeRuleService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialServiceImpl.java
deleted file mode 100644
index b14ab77..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TEnsureIncomeSpecialMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecial;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeSpecialService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 特殊时间段基础规则配置 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Service
-public class TEnsureIncomeSpecialServiceImpl extends ServiceImpl<TEnsureIncomeSpecialMapper, TEnsureIncomeSpecial> implements ITEnsureIncomeSpecialService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialTimeSoltServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialTimeSoltServiceImpl.java
deleted file mode 100644
index da1209a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TEnsureIncomeSpecialTimeSoltServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TEnsureIncomeSpecialTimeSoltMapper;
-import com.dsh.guns.modular.system.model.TEnsureIncomeSpecialTimeSolt;
-import com.dsh.guns.modular.system.service.ITEnsureIncomeSpecialTimeSoltService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 特殊时间段配置时间配置 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2023-04-20
- */
-@Service
-public class TEnsureIncomeSpecialTimeSoltServiceImpl extends ServiceImpl<TEnsureIncomeSpecialTimeSoltMapper, TEnsureIncomeSpecialTimeSolt> implements ITEnsureIncomeSpecialTimeSoltService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TFeedbackServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TFeedbackServiceImpl.java
deleted file mode 100644
index 65a17d0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TFeedbackServiceImpl.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.feignClient.account.UserClient;
-import com.dsh.course.feignClient.account.model.GetUserInfoByNameOrPhone;
-import com.dsh.course.feignClient.driver.DriverClient;
-import com.dsh.course.mapper.TFeedbackMapper;
-import com.dsh.guns.modular.system.model.TFeedback;
-import com.dsh.guns.modular.system.service.ITFeedbackService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 反馈管理 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@Service
-public class TFeedbackServiceImpl extends ServiceImpl<TFeedbackMapper, TFeedback> implements ITFeedbackService {
-
- @Autowired
- private UserClient userClient;
-
- @Autowired
- private DriverClient driverClient;
- @Override
- public List<Map<String, Object>> getFeedbackList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer type, String name, String phone, Integer state) {
- if (type == 2) {
- List<Map<String, Object>> userInfoByNameOrPhone = driverClient.getDriverInfoByNameOrPhone(new GetUserInfoByNameOrPhone(name, phone));
- ArrayList<Integer> integers = new ArrayList<>();
- if (userInfoByNameOrPhone.size() > 0) {
- for (Map<String, Object> stringObjectMap : userInfoByNameOrPhone) {
- integers.add((Integer) stringObjectMap.get("id"));
- }
- } else {
- integers.add(-1);
- }
- List<Map<String, Object>> feedbackList = this.baseMapper.getFeedbackList(page, beginTime, endTime, type, integers, state);
- for (Map<String, Object> stringObjectMap : feedbackList) {
- for (Map<String, Object> objectMap : userInfoByNameOrPhone) {
- if (stringObjectMap.get("userId").toString().equals(objectMap.get("id").toString())) {
- stringObjectMap.put("userName", objectMap.get("nickName").toString());
- stringObjectMap.put("userPhone", objectMap.get("phone").toString());
- }
- }
- }
- return feedbackList;
- }else {
-
- List<Map<String, Object>> userInfoByNameOrPhone = userClient.getUserInfoByNameOrPhone(new GetUserInfoByNameOrPhone(name, phone));
- ArrayList<Integer> integers = new ArrayList<>();
- if (userInfoByNameOrPhone.size() > 0) {
- for (Map<String, Object> stringObjectMap : userInfoByNameOrPhone) {
- integers.add((Integer) stringObjectMap.get("id"));
- }
- } else {
- integers.add(-1);
- }
- List<Map<String, Object>> feedbackList = this.baseMapper.getFeedbackList(page, beginTime, endTime, type, integers, state);
- for (Map<String, Object> stringObjectMap : feedbackList) {
- for (Map<String, Object> objectMap : userInfoByNameOrPhone) {
- if (stringObjectMap.get("userId").toString().equals(objectMap.get("id").toString())) {
- stringObjectMap.put("userName", objectMap.get("nickName").toString());
- stringObjectMap.put("userPhone", objectMap.get("phone").toString());
- }
- }
- }
- return feedbackList;
-
-
-
-
-
-
-
- }
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java
deleted file mode 100644
index af5615f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TIntegralGoods;
-//import com.dsh.guns.modular.system.dao.TIntegralGoodsMapper;
-//import com.dsh.guns.modular.system.service.ITIntegralGoodsService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 积分商品管理 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//@Service
-//public class TIntegralGoodsServiceImpl extends ServiceImpl<TIntegralGoodsMapper, TIntegralGoods> implements ITIntegralGoodsService {
-//
-// @Override
-// public List<Map<String, Object>> getIntegralGoodsList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, Integer state) {
-// return this.baseMapper.getIntegralGoodsList(page, beginTime, endTime, name, state);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java
deleted file mode 100644
index e3c80c1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TIntegralOrder;
-//import com.dsh.guns.modular.system.dao.TIntegralOrderMapper;
-//import com.dsh.guns.modular.system.service.ITIntegralOrderService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 积分订单管理 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//@Service
-//public class TIntegralOrderServiceImpl extends ServiceImpl<TIntegralOrderMapper, TIntegralOrder> implements ITIntegralOrderService {
-//
-// @Override
-// public List<Map<String, Object>> getIntegralOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String goodsName, String consigneeName, String consigneePhone, Integer state) {
-// return this.baseMapper.getIntegralOrderList(page, beginTime, endTime, userName, goodsName, consigneeName, consigneePhone, state);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineServiceImpl.java
deleted file mode 100644
index f93c8bc..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TLine;
-//import com.dsh.guns.modular.system.dao.TLineMapper;
-//import com.dsh.guns.modular.system.service.ITLineService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 跨城线路 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-15
-// */
-//@Service
-//public class TLineServiceImpl extends ServiceImpl<TLineMapper, TLine> implements ITLineService {
-//
-// @Override
-// public List<Map<String, Object>> getLineList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String modelStr, Integer state) {
-// return this.baseMapper.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state);
-// }
-//
-// @Override
-// public List<Map<String, Object>> getLinePriceList(Integer lineId) {
-// return this.baseMapper.getLinePriceList(lineId);
-// }
-//
-// @Override
-// public List<Map<String, Object>> getLineCompanyList(Integer lineId) {
-// return this.baseMapper.getLineCompanyList(lineId);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineShiftServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineShiftServiceImpl.java
deleted file mode 100644
index 165109a..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLineShiftServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.modular.system.model.TLineShift;
-//import com.dsh.guns.modular.system.dao.TLineShiftMapper;
-//import com.dsh.guns.modular.system.service.ITLineShiftService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 线路班次 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-16
-// */
-//@Service
-//public class TLineShiftServiceImpl extends ServiceImpl<TLineShiftMapper, TLineShift> implements ITLineShiftService {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLocationServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLocationServiceImpl.java
deleted file mode 100644
index 1060578..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TLocationServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.modular.system.model.TLocation;
-//import com.dsh.guns.modular.system.service.ITLocationService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.text.SimpleDateFormat;
-//import java.util.Calendar;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * <p>
-// * 地点 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-04
-// */
-//@Service
-//public class TLocationServiceImpl extends ServiceImpl<TLocationMapper, TLocation> implements ITLocationService {
-//
-// @Autowired
-// private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-//
-//
-// /**
-// * 定时任务更新线上围栏的有效时间
-// * @throws Exception
-// */
-// @Override
-// public void updateFence() throws Exception {
-// Date date = new Date();
-// Calendar calendar = Calendar.getInstance();
-// calendar.setTime(new Date());
-// calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + 35);
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-// List<TLocation> type = this.selectList(new EntityWrapper<TLocation>().eq("type", 2));
-// for(TLocation location : type){
-// if((date.getTime() - location.getUpdateTime().getTime()) > 30 * 24 * 60 * 60 * 1000){//更新一个月之前的数据
-// String[] s = location.getGid().split("_");
-// String[] s1 = location.getCoordinate().split("_");
-// for(int i = 0; i < s.length; i++){
-// String[] split = s1[i].split(";");
-// gdMapElectricFenceUtil.updateElectricFenc(s[i], "location_" + location.getId(),
-// (split.length > 2 ? "" : split[0]), (split.length > 2 ? "" : split[1]),
-// (split.length > 2 ? s1[i] : ""), sdf.format(calendar.getTime()));
-// }
-//
-// }
-// }
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TMotorModelServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TMotorModelServiceImpl.java
deleted file mode 100644
index 87900a0..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TMotorModelServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.MotorModel;
-import com.dsh.course.mapper.MotorModelMapper;
-import com.dsh.guns.modular.system.service.ITMotorModelService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 车辆车型 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@Service
-public class TMotorModelServiceImpl extends ServiceImpl<MotorModelMapper, MotorModel> implements ITMotorModelService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TNoticesServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TNoticesServiceImpl.java
deleted file mode 100644
index 011b240..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TNoticesServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.TNotices;
-import com.dsh.course.mapper.TNoticesMapper;
-import com.dsh.course.model.dto.TNoticeWarpper;
-import com.dsh.guns.modular.system.service.ITNoticesService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 发布公告和滚动消息 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@Service
-public class TNoticesServiceImpl extends ServiceImpl<TNoticesMapper, TNotices> implements ITNoticesService {
-
- @Override
- public List<TNoticeWarpper> queryNotices(Integer type) throws Exception {
- List<com.dsh.course.entity.TNotices> tNotices = this.baseMapper.queryNotices(type);
-
- return null;
- }
-
- @Override
- public List<Map<String, Object>> getRollingNoticeList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer typeValue, String content,Integer yy) {
- return this.baseMapper.getRollingNoticeList(page, beginTime, endTime,typeValue, content,yy);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java
deleted file mode 100644
index 720da1f..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TOpenCityBusinessMapper;
-import com.dsh.guns.modular.system.model.TOpenCityBusiness;
-import com.dsh.guns.modular.system.service.ITOpenCityBusinessService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 开通城市经营业务 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@Service
-public class TOpenCityBusinessServiceImpl extends ServiceImpl<TOpenCityBusinessMapper, TOpenCityBusiness> implements ITOpenCityBusinessService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityServiceImpl.java
deleted file mode 100644
index 09ae609..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOpenCityServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TOpenCityMapper;
-import com.dsh.guns.modular.system.model.TOpenCity;
-import com.dsh.guns.modular.system.service.ITOpenCityService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 开通城市表 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@Service
-public class TOpenCityServiceImpl extends ServiceImpl<TOpenCityMapper, TOpenCity> implements ITOpenCityService {
-
- @Override
- public List<Map<String, Object>> getOpenCityList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,Integer language) {
-
- return this.baseMapper.getOpenCityList(page, beginTime, endTime, name,language);
- }
-
- @Override
- public List<Map<String,Object>> getBusinessByCityId(Integer openCityId) {
-
- return this.baseMapper.getBusinessByCityId(openCityId);
- }
-
- @Override
- public List<Map<String, Object>> getBusinessListByCityId(Integer openCityId) {
- return this.baseMapper.getBusinessListByCityId(openCityId);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderCharterServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderCharterServiceImpl.java
deleted file mode 100644
index f128afb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderCharterServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TOrderCharter;
-//import com.dsh.guns.modular.system.dao.TOrderCharterMapper;
-//import com.dsh.guns.modular.system.service.ITOrderCharterService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 包车订单 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//@Service
-//public class TOrderCharterServiceImpl extends ServiceImpl<TOrderCharterMapper, TOrderCharter> implements ITOrderCharterService {
-//
-// @Override
-// public List<Map<String, Object>> getCharterOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String contactName, String contactPhone, String useDemand, Integer state) {
-// return this.baseMapper.getCharterOrderList(page, beginTime, endTime, userName, contactName, contactPhone, useDemand, state);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java
deleted file mode 100644
index 2fb07f7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.feignClient.evaluation.EvaluationClient;
-import com.dsh.course.feignClient.evaluation.model.GetOrderEvaluateListReq;
-import com.dsh.course.mapper.TOrderEvaluateMapper;
-import com.dsh.guns.modular.system.model.TOrderEvaluate;
-import com.dsh.guns.modular.system.service.ITOrderEvaluateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 订单评价 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TOrderEvaluateServiceImpl extends ServiceImpl<TOrderEvaluateMapper, TOrderEvaluate> implements ITOrderEvaluateService {
-
-
- @Autowired
- private EvaluationClient evaluationClient;
-
- @Override
- public List<Map<String, Object>> getOrderEvaluateList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String userName, String userPhone, String driverName, String driverPhone, String fraction, Integer orderType,String orderNum) {
-
- //
- List<Map<String, Object>> orderEvaluateList = evaluationClient.getOrderEvaluateList(new GetOrderEvaluateListReq(page, roleType, nowUserId, beginTime, endTime, userName, driverName, fraction, orderType,orderNum));
-
-
- return orderEvaluateList;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java
deleted file mode 100644
index fd2d676..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TOrderLogistics;
-//import com.dsh.guns.modular.system.dao.TOrderLogisticsMapper;
-//import com.dsh.guns.modular.system.service.ITOrderLogisticsService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 订单-小件物流 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-24
-// */
-//@Service
-//public class TOrderLogisticsServiceImpl extends ServiceImpl<TOrderLogisticsMapper, TOrderLogistics> implements ITOrderLogisticsService {
-//
-// @Override
-// public List<Map<String, Object>> getLogisticsOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, Integer type, String userName, String userPhone, String recipient, String recipientPhone, String driver, Integer state) {
-// return this.baseMapper.getLogisticsOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state);
-// }
-//
-// @Override
-// public Map<String, Object> getLogisticsOrderDetailById(Integer orderId) {
-// return this.baseMapper.getLogisticsOrderDetailById(orderId);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPositionServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPositionServiceImpl.java
deleted file mode 100644
index ce6bec4..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPositionServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.modular.system.model.TOrderPosition;
-//import com.dsh.guns.modular.system.dao.TOrderPositionMapper;
-//import com.dsh.guns.modular.system.service.ITOrderPositionService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 订单坐标信息表 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-08
-// */
-//@Service
-//public class TOrderPositionServiceImpl extends ServiceImpl<TOrderPositionMapper, TOrderPosition> implements ITOrderPositionService {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
deleted file mode 100644
index 74ce7f3..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TOrderPrivateCar;
-//import com.dsh.guns.modular.system.dao.TOrderPrivateCarMapper;
-//import com.dsh.guns.modular.system.service.ITOrderPrivateCarService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 订单-专车 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-02
-// */
-//@Service
-//public class TOrderPrivateCarServiceImpl extends ServiceImpl<TOrderPrivateCarMapper, TOrderPrivateCar> implements ITOrderPrivateCarService {
-//
-// @Override
-// public List<Map<String, Object>> getPrivateCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state) {
-// return this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state);
-// }
-//
-// @Override
-// public Map<String, Object> getPrivateCarOrderDetailById(Integer orderId) {
-// return this.baseMapper.getPrivateCarOrderDetailById(orderId);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPhoneServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPhoneServiceImpl.java
deleted file mode 100644
index 254f906..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPhoneServiceImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TPhoneMapper;
-import com.dsh.guns.modular.system.model.TPhone;
-import com.dsh.guns.modular.system.model.TSysSet;
-import com.dsh.guns.modular.system.service.ITPhoneService;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 系统电话设置 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TPhoneServiceImpl extends ServiceImpl<TPhoneMapper, TPhone> implements ITPhoneService {
-
- @Override
- public TSysSet getWaitOver(Integer companyId) {
- return this.baseMapper.getWaitOver(companyId);
- }
-
- @Override
- public TSysSet getRegister(Integer companyId) {
- return this.baseMapper.getRegister(companyId);
- }
-
- @Override
- public TSysSet getUserLevel(Integer companyId) {
- return this.baseMapper.getUserLevel(companyId);
- }
-
- @Override
- public void updateWait(String json1,Integer companyId) {
- this.baseMapper.updateWait(json1,companyId);
- }
-
- @Override
- public void updateRegister(String json2,Integer companyId) {
- this.baseMapper.updateRegister(json2,companyId);
- }
-
- @Override
- public void updateUserLevel(String json3,Integer companyId) {
- this.baseMapper.updateUserLevel(json3,companyId);
- }
-
- @Override
- public void updateMotorPushOrder(String json4,Integer companyId) {
- this.baseMapper.updateMotorPushOrder(json4,companyId);
- }
-
- @Override
- public void updateSendOrder(String json5,Integer companyId) {
- this.baseMapper.updateSendOrder(json5,companyId);
- }
-
- @Override
- public void updateCancel(Integer ptCancel1, BigDecimal ptCancel2,Integer companyId) {
- this.baseMapper.updateCancel(ptCancel1,ptCancel2,companyId);
- }
-
- @Override
- public void updateYyCancel(Integer yyCancel1, BigDecimal yyCancel2,Integer companyId) {
- this.baseMapper.updateYyCancel(yyCancel1,yyCancel2,companyId);
- }
-
- @Override
- public void updatePolice(String phone1,Integer companyId) {
- this.baseMapper.updatePolice(phone1,companyId);
- }
-
- @Override
- public void updateTalk(String phone2,Integer companyId) {
- this.baseMapper.updateTalk(phone2,companyId);
- }
-
- @Override
- public TSysSet getMin(Integer companyId) {
- return this.baseMapper.getMin(companyId);
- }
-
- @Override
- public void updateMin(BigDecimal min,Integer companyId) {
- this.baseMapper.updateMin(min,companyId);
- }
-
- @Override
- public TSysSet getIntegral(Integer companyId) {
- return this.baseMapper.getIntegral(companyId);
- }
-
- @Override
- public void updateIntegral(String json0,Integer companyId) {
- this.baseMapper.updateIntegral(json0,companyId);
- }
-
- @Override
- public void addIntegral(String json0, Integer companyId) {
- this.baseMapper.addIntegral(json0,companyId);
- }
-
- @Override
- public void addWait(String json1, Integer companyId) {
- this.baseMapper.addWait(json1,companyId);
- }
-
- @Override
- public void addRegister(String json2, Integer companyId) {
- this.baseMapper.addRegister(json2,companyId);
- }
-
- @Override
- public void addUserLevel(String json3, Integer companyId) {
- this.baseMapper.addUserLevel(json3,companyId);
- }
-
- @Override
- public void addMotorPushOrder(String json4, Integer companyId) {
- this.baseMapper.addMotorPushOrder(json4,companyId);
- }
-
- @Override
- public void addSendOrder(String json5, Integer companyId) {
- this.baseMapper.addSendOrder(json5,companyId);
- }
-
- @Override
- public void addCancel(Integer companyId) {
- this.baseMapper.addCancel(companyId);
- }
-
- @Override
- public void addYyCancel(Integer companyId) {
- this.baseMapper.addYyCancel(companyId);
- }
-
- @Override
- public void addPolice(Integer companyId) {
- this.baseMapper.addPolice(companyId);
- }
-
- @Override
- public void addTalk(Integer companyId) {
- this.baseMapper.addTalk(companyId);
- }
-
- @Override
- public void addMin(Integer companyId) {
- this.baseMapper.addMin(companyId);
- }
-
- @Override
- public BigDecimal getMinMoney() {
- return this.baseMapper.getMinMoney();
- }
-
- @Override
- public void updateMinMoney(Double minMoney) {
-
- this.baseMapper.updateMinMoney(minMoney);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPopularizeCodeServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPopularizeCodeServiceImpl.java
deleted file mode 100644
index b2a02d2..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPopularizeCodeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TPopularizeCodeMapper;
-import com.dsh.guns.modular.system.model.TPopularizeCode;
-import com.dsh.guns.modular.system.service.TPopularizeCodeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author administrator
- * @since 2023-04-17
- */
-@Service
-public class TPopularizeCodeServiceImpl extends ServiceImpl<TPopularizeCodeMapper, TPopularizeCode> implements TPopularizeCodeService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TProblemServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TProblemServiceImpl.java
deleted file mode 100644
index 5c74407..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TProblemServiceImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.feignClient.account.UserClient;
-import com.dsh.course.mapper.TProblemMapper;
-import com.dsh.guns.modular.system.model.TProblem;
-import com.dsh.guns.modular.system.service.ITProblemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 在线客服 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-24
- */
-@Service
-public class TProblemServiceImpl extends ServiceImpl<TProblemMapper, TProblem> implements ITProblemService {
-
- @Autowired
- private UserClient userClient;
-
- @Override
- public List<Map<String, Object>> getProblemList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, Integer state) {
- // 根据名称找出条件用户信息
- //Find conditional user information based on the name.
- if(userName==null){
- userName="";
- }
- List<Map<String, Object>> userIdByName = userClient.getUserIdByName(userName);
- ArrayList<Integer> integers = new ArrayList<>();
- if(userIdByName.size()>0){
- for (Map<String, Object> stringObjectMap : userIdByName) {
- integers.add((Integer) stringObjectMap.get("id"));
- }
- }else {
- integers.add(-1);
- }
-
- List<Map<String, Object>> problemList = this.baseMapper.getProblemList(page, beginTime, endTime, integers, state);
- for (Map<String, Object> stringObjectMap : problemList) {
- for (Map<String, Object> objectMap : userIdByName) {
- if(stringObjectMap.get("userId").equals(objectMap.get("id"))){
- stringObjectMap.put("userName",objectMap.get("nickName").toString());
- stringObjectMap.put("userPhone",objectMap.get("phone").toString());
- }
- }
- }
- return problemList;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java
deleted file mode 100644
index c26c1a9..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.modular.system.model.TPubTransactionDetails;
-//import com.dsh.guns.modular.system.dao.TPubTransactionDetailsMapper;
-//import com.dsh.guns.modular.system.service.ITPubTransactionDetailsService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 交易明细(司机/用户) 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-09-16
-// */
-//@Service
-//public class TPubTransactionDetailsServiceImpl extends ServiceImpl<TPubTransactionDetailsMapper, TPubTransactionDetails> implements ITPubTransactionDetailsService {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java
deleted file mode 100644
index 6fb0b0b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.plugins.Page;
-//import com.dsh.guns.modular.system.model.TPubWithdrawal;
-//import com.dsh.guns.modular.system.dao.TPubWithdrawalMapper;
-//import com.dsh.guns.modular.system.service.ITPubWithdrawalService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 提现记录表(司机/用户) 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-09
-// */
-//@Service
-//public class TPubWithdrawalServiceImpl extends ServiceImpl<TPubWithdrawalMapper, TPubWithdrawal> implements ITPubWithdrawalService {
-//
-// @Override
-// public List<Map<String, Object>> getWithdrawalList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, Integer withdrawalType) {
-// return this.baseMapper.getWithdrawalList(page, beginTime, endTime, name, withdrawalType);
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TRegionServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TRegionServiceImpl.java
deleted file mode 100644
index 99e3233..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TRegionServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TRegionMapper;
-import com.dsh.guns.modular.system.model.TRegion;
-import com.dsh.guns.modular.system.service.ITRegionService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 省市区三级联动 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-02
- */
-@Service
-public class TRegionServiceImpl extends ServiceImpl<TRegionMapper, TRegion> implements ITRegionService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java
deleted file mode 100644
index 8687423..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TServerCarmodelMapper;
-import com.dsh.guns.modular.system.model.TServerCarmodel;
-import com.dsh.guns.modular.system.service.ITServerCarmodelService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务车型设置 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-@Service
-public class TServerCarmodelServiceImpl extends ServiceImpl<TServerCarmodelMapper, TServerCarmodel> implements ITServerCarmodelService {
-
- @Override
- public List<Map<String, Object>> getServerCarModelList(Page<Map<String, Object>> page, Integer type, String name, Integer state) {
- return this.baseMapper.getServerCarModelList(page, type, name, state);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java
deleted file mode 100644
index 592193d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSysCancleOrderMapper;
-import com.dsh.guns.modular.system.model.TSysCancleOrder;
-import com.dsh.guns.modular.system.service.ITSysCancleOrderService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-取消订单 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TSysCancleOrderServiceImpl extends ServiceImpl<TSysCancleOrderMapper, TSysCancleOrder> implements ITSysCancleOrderService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java
deleted file mode 100644
index 40cfe5d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSysFaceDistinguishMapper;
-import com.dsh.guns.modular.system.model.TSysFaceDistinguish;
-import com.dsh.guns.modular.system.service.ITSysFaceDistinguishService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-人脸识别 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TSysFaceDistinguishServiceImpl extends ServiceImpl<TSysFaceDistinguishMapper, TSysFaceDistinguish> implements ITSysFaceDistinguishService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysIntegralServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysIntegralServiceImpl.java
deleted file mode 100644
index 11e0035..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysIntegralServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.modular.system.model.TSysIntegral;
-//import com.dsh.guns.modular.system.dao.TSysIntegralMapper;
-//import com.dsh.guns.modular.system.service.ITSysIntegralService;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 系统设置-积分 服务实现类
-// * </p>
-// *
-// * @author 吕雪
-// * @since 2020-06-09
-// */
-//@Service
-//public class TSysIntegralServiceImpl extends ServiceImpl<TSysIntegralMapper, TSysIntegral> implements ITSysIntegralService {
-//
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java
deleted file mode 100644
index 47b6331..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSysPushOrderMapper;
-import com.dsh.guns.modular.system.model.TSysPushOrder;
-import com.dsh.guns.modular.system.service.ITSysPushOrderService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-推单 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TSysPushOrderServiceImpl extends ServiceImpl<TSysPushOrderMapper, TSysPushOrder> implements ITSysPushOrderService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysReformistServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysReformistServiceImpl.java
deleted file mode 100644
index 48ae749..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysReformistServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSysReformistMapper;
-import com.dsh.guns.modular.system.model.TSysReformist;
-import com.dsh.guns.modular.system.service.ITSysReformistService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统设置-改派 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TSysReformistServiceImpl extends ServiceImpl<TSysReformistMapper, TSysReformist> implements ITSysReformistService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java
deleted file mode 100644
index 4123bdd..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSysSensitiveWordsMapper;
-import com.dsh.guns.modular.system.model.TSysSensitiveWords;
-import com.dsh.guns.modular.system.service.ITSysSensitiveWordsService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 系统设置-敏感词 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-09
- */
-@Service
-public class TSysSensitiveWordsServiceImpl extends ServiceImpl<TSysSensitiveWordsMapper, TSysSensitiveWords> implements ITSysSensitiveWordsService {
-
- @Override
- public List<Map<String, Object>> getSensitiveWordList(Page<Map<String, Object>> page, String beginTime, String endTime, String content,Integer yy) {
- return this.baseMapper.getSensitiveWordList(page, beginTime, endTime, content,yy);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
deleted file mode 100644
index fe26b2b..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSystemNoticeMapper;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统通知 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@Service
-public class TSystemNoticeServiceImpl extends ServiceImpl<TSystemNoticeMapper, TSystemNotice> implements ITSystemNoticeService {
-
- @Override
- public void save1(TSystemNotice notice) {
- this.baseMapper.save1(notice);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
deleted file mode 100644
index cb43f94..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.course.mapper.TSystemPriceMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.modular.system.model.TOpenCity;
-import com.dsh.guns.modular.system.model.TSystemPrice;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-import com.dsh.guns.modular.system.service.ITOpenCityService;
-import com.dsh.guns.modular.system.service.ITSystemPriceService;
-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.Map;
-
-/**
- * <p>
- * 服务价格规则 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-08-29
- */
-@Service
-public class TSystemPriceServiceImpl extends ServiceImpl<TSystemPriceMapper, TSystemPrice> implements ITSystemPriceService {
-
- @Resource
- private CompanyClient companyClient;
- @Resource
- private CityMapper cityMapper;
-
- @Autowired
- private ITOpenCityService openCityService;
-
-
-
- @Override
- public List<Map<String, Object>> getSpecialPriceList(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
- Integer language = UserExt.getLanguage();
- List<Map<String, Object>> specialPriceList = this.baseMapper.getSpecialPriceList(page, companyId, name, state,language);
- for (Map<String, Object> stringObjectMap : specialPriceList) {
- Integer openCityId = (Integer)stringObjectMap.get("openCityId");
- TOpenCity openCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null != openCity){
- if(language==1){
- stringObjectMap.put("city", openCity.getChineseName());
- }else if(language==2){
- stringObjectMap.put("city", openCity.getEnglishName());
- }else {
- stringObjectMap.put("city", openCity.getIndonesianName());
- }
- }
- }
- return specialPriceList;
- }
-
- @Override
- public void saveService(Integer type, Integer openCityId, Integer type1,String json2,String code,Integer userId,String remark) {
- this.baseMapper.saveService(type, openCityId,type1, json2,code,userId,remark,UserExt.getUser().getObjectId());
- }
-
- @Override
- public List<Map<String, Object>> getServicePriceList(Page<Map<String, Object>> page ,String time, String company, String phone, String account, Integer state) {
- String sTime=null;
- String eTime=null;
- if(time !=null && !"".equals(time)){
- sTime=time.split(" - ")[0]+" 00:01";
- eTime=time.split(" - ")[1]+" 23:59";
- }
- List<Integer> cid =new ArrayList<>();
- List<Map<String, Object>> servicePriceList =null;
- if(company!=null && company!="") {
- cid = companyClient.queryIdByName(company);
- if(cid.size()==0){
- cid.add(-1);
- }
- servicePriceList = this.baseMapper.getServicePriceList1(page,sTime, eTime, company, phone, account, state,cid);
- }else {
-
- servicePriceList = this.baseMapper.getServicePriceList(page,sTime, eTime, company, phone, account, state);
- }
- for (Map<String, Object> stringObjectMap : servicePriceList) {
- Integer objectId = (Integer) stringObjectMap.get("objectId");
- if(objectId!=null){
- CompanyInfoRes companyInfoRes = companyClient.queryById(objectId);
- stringObjectMap.put("company",companyInfoRes.getName());
- }else {
- stringObjectMap.put("company","");
- }
- Integer openCityId = (Integer) stringObjectMap.get("openCityId");
- TOpenCity openCity = openCityService.getBaseMapper().selectById(openCityId);
- if(null != openCity){
- if(UserExt.getLanguage()==1){
- stringObjectMap.put("chineseName",openCity.getChineseName());
- }else if(UserExt.getLanguage()==2){
- stringObjectMap.put("chineseName",openCity.getEnglishName());
- }else {
- stringObjectMap.put("chineseName",openCity.getIndonesianName());
- }
- }
- }
-
- return servicePriceList ;
- }
-
- @Override
- public List<TSystemPriceService> getService(String tSystemPriceId) {
-
- return this.baseMapper.getService(tSystemPriceId);
- }
-
- @Override
- public void updateCheck(String id, Integer check) {
- this.baseMapper.updateCheck(id,check);
- if(check==2){
- List<TSystemPriceService> service = this.baseMapper.getService(id);
- if(service.get(0).getOrderType()==4){
-
- this.baseMapper.delete(new LambdaQueryWrapper<TSystemPrice>().eq(TSystemPrice::getOpenCityId, service.get(0).getOpenCityId()).eq(TSystemPrice::getUserType, service.get(0).getUserType()).eq(TSystemPrice::getCompanyId, service.get(0).getCompanyId()).eq(TSystemPrice::getOrderType, 4));
- }else {
- this.baseMapper.delete(new LambdaQueryWrapper<TSystemPrice>().eq(TSystemPrice::getOpenCityId, service.get(0).getOpenCityId()).eq(TSystemPrice::getUserType, service.get(0).getUserType()).eq(TSystemPrice::getCompanyId, service.get(0).getCompanyId()).eq(TSystemPrice::getOrderType, 4).eq(TSystemPrice::getServerCarModelId,service.get(0).getServerCarModelId()));
-
- }
- for (TSystemPriceService tSystemPriceService : service) {
- TSystemPrice tSystemPrice = new TSystemPrice();
- tSystemPrice.setCompanyId(tSystemPriceService.getCompanyId());
- tSystemPrice.setState(1);
- tSystemPrice.setType(tSystemPriceService.getType());
- tSystemPrice.setOrderType(tSystemPriceService.getOrderType());
- tSystemPrice.setUserType(tSystemPriceService.getUserType());
- tSystemPrice.setContent(tSystemPriceService.getContent());
- tSystemPrice.setCityId(tSystemPriceService.getCityId());
- tSystemPrice.setOpenCityId(tSystemPriceService.getOpenCityId());
- tSystemPrice.setServerCarModelId(tSystemPriceService.getServerCarModelId());
- this.baseMapper.insert(tSystemPrice);
- }
-
- }
- }
-
- @Override
- public void updateState(String tSystemPriceId) {
- this.baseMapper.updateCheck(tSystemPriceId,4);
-
- }
-
- @Override
- public void saveMotoService(Integer openCityId, Integer serverCarModelId, Integer type, String json1, Integer i, String randomNumber,Integer userId) {
- this.baseMapper.saveMotoService(openCityId,serverCarModelId,type,json1,i,randomNumber,userId,UserExt.getUser().getObjectId());
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceServiceImpl.java
deleted file mode 100644
index c6db6b6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TSystemPriceServiceServiceImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TSystemPriceServiceMapper;
-import com.dsh.guns.modular.system.model.TSystemPriceService;
-import com.dsh.guns.modular.system.service.ITSystemPriceServiceService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author zhibing.pu
- * @date 2023/3/25 18:11
- */
-@Service
-public class TSystemPriceServiceServiceImpl extends ServiceImpl<TSystemPriceServiceMapper, TSystemPriceService> implements ITSystemPriceServiceService {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TUserLargeCouponServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TUserLargeCouponServiceImpl.java
deleted file mode 100644
index 61b5c37..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TUserLargeCouponServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TUserLargeCouponMapper;
-import com.dsh.guns.modular.system.model.TUserLargeCoupon;
-import com.dsh.guns.modular.system.service.ITUserLargeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 车辆车型 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-05
- */
-@Service
-public class TUserLargeCouponServiceImpl extends ServiceImpl<TUserLargeCouponMapper, TUserLargeCoupon> implements ITUserLargeService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TVersionManagementServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TVersionManagementServiceImpl.java
deleted file mode 100644
index 462298d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TVersionManagementServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TVersionManagementMapper;
-import com.dsh.guns.modular.system.model.TVersionManagement;
-import com.dsh.guns.modular.system.service.ITVersionManagementService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 版本管理 服务实现类
- * </p>
- *
- * @author 吕雪
- * @since 2020-06-10
- */
-@Service
-public class TVersionManagementServiceImpl extends ServiceImpl<TVersionManagementMapper, TVersionManagement> implements ITVersionManagementService {
-
- @Override
- public List<Map<String, Object>> getVersionList(Page<Map<String, Object>> page, String beginTime, String endTime, String version) {
- return this.baseMapper.getVersionList(page, beginTime, endTime, version);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbBannerServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbBannerServiceImpl.java
deleted file mode 100644
index 27b9a3d..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbBannerServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TbBannerMapper;
-import com.dsh.guns.modular.system.model.TbBanner;
-import com.dsh.guns.modular.system.service.ITbBannerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbBannerServiceImpl extends ServiceImpl<TbBannerMapper, TbBanner> implements ITbBannerService {
-
- @Autowired
- private TbBannerMapper tbBannerMapper;
- @Override
- public List<TbBanner> selectAll(String time) {
- String s =null;
- String s1 =null;
- if(time != null &&!"".equals(time)) {
- String[] split = time.split(" - ");
- s=split[0];
- s1=split[1];
- if(s.equals(s1)){
- s=s+" 00:00:01";
- s1=s1+" 23:59:59";
- }
- }
- return tbBannerMapper.selectAll(s,s1);
-
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbChatSetServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbChatSetServiceImpl.java
deleted file mode 100644
index 3e4c2d8..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbChatSetServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TbChatSetMapper;
-import com.dsh.guns.modular.system.model.TbChatSet;
-import com.dsh.guns.modular.system.service.ITbChatSetService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbChatSetServiceImpl extends ServiceImpl<TbChatSetMapper, TbChatSet> implements ITbChatSetService {
-
- @Override
- public List<TbChatSet> getList(String time, Integer type,Integer yy) {
- String startTime=null;
- String endTime=null;
- if(time!=null &&!"".equals(time)){
- startTime=time.split(" - ")[0]+" 00:01";
- endTime=time.split(" - ")[1]+" 23:59";
- }
- return this.baseMapper.getList(startTime,endTime,type,yy);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbGuidePageServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbGuidePageServiceImpl.java
deleted file mode 100644
index 78787b1..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbGuidePageServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TbGuidePageMapper;
-import com.dsh.guns.modular.system.model.TbGuidePage;
-import com.dsh.guns.modular.system.service.ITbGuidePageService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbGuidePageServiceImpl extends ServiceImpl<TbGuidePageMapper, TbGuidePage> implements ITbGuidePageService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbHotAddressServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbHotAddressServiceImpl.java
deleted file mode 100644
index 6a91411..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbHotAddressServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TbHotAddressMapper;
-import com.dsh.guns.config.UserExt;
-import com.dsh.guns.modular.system.model.TbHotAddress;
-import com.dsh.guns.modular.system.service.ITbHotAddressService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbHotAddressServiceImpl extends ServiceImpl<TbHotAddressMapper, TbHotAddress> implements ITbHotAddressService {
-
- @Override
- public List<TbHotAddress> getList(String time, String name) {
- String sTime=null;
- String eTime=null;
- if(time!=null && !"".equals(time)){
- sTime=time.split(" - ")[0]+" 00:01";
- eTime=time.split(" - ")[1]+" 23:59";
- }
- List<TbHotAddress> list = this.baseMapper.getList(sTime, eTime, name,UserExt.getLanguage());
-
- return list;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbStartPageServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbStartPageServiceImpl.java
deleted file mode 100644
index 1338ec5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbStartPageServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TbStartPageMapper;
-import com.dsh.guns.modular.system.model.TbStartPage;
-import com.dsh.guns.modular.system.service.ITbStartPageService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbStartPageServiceImpl extends ServiceImpl<TbStartPageMapper, TbStartPage> implements ITbStartPageService {
-
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbUserExitServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbUserExitServiceImpl.java
deleted file mode 100644
index 3f02b15..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbUserExitServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.feignClient.activity.TUserClinet;
-import com.dsh.course.mapper.TbUserExitMapper;
-import com.dsh.guns.modular.system.model.TbUserExit;
-import com.dsh.guns.modular.system.service.ITbUserExitService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbUserExitServiceImpl extends ServiceImpl<TbUserExitMapper, TbUserExit> implements ITbUserExitService {
-
- @Autowired
- private TUserClinet userClinet;
-
- @Override
- public List<TbUserExit> getList(String time, String name, Integer state) {
- String sTime=null;
- String eTime=null;
- if(time!=null && !"".equals(time)){
- sTime = time.split(" - ")[0]+" 00:01";
- eTime = time.split(" - ")[1]+" 23:59";
- }
- return this.baseMapper.getList(sTime,eTime,name,state);
- }
-
- @Autowired
- private TUserClinet tUserClinet;
- @Override
- public void getSevenDay() {
- List<TbUserExit> list = this.baseMapper.getSevenDay();
- if(list.size()>0){
- for (TbUserExit tbUserExit : list) {
- this.baseMapper.updatestate(tbUserExit.getId());
- tUserClinet.userExit(tbUserExit.getUserId());
- }
- }
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbVoiceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbVoiceServiceImpl.java
deleted file mode 100644
index 2a3fcf2..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TbVoiceServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.TbVoiceMapper;
-import com.dsh.guns.modular.system.model.TbVoice;
-import com.dsh.guns.modular.system.service.ITbVoiceService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * banner信息表 服务实现类
- * </p>
- *
- * @author stylefeng
- * @since 2022-06-17
- */
-@Service
-public class TbVoiceServiceImpl extends ServiceImpl<TbVoiceMapper, TbVoice> implements ITbVoiceService {
-
- @Override
- public List<TbVoice> getList(String name, Integer state) {
- return this.baseMapper.getList(name,state);
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
deleted file mode 100644
index 82e0ac7..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
+++ /dev/null
@@ -1,268 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.dsh.guns.core.util.ToolUtil;
-//import com.dsh.guns.modular.system.model.UserActivityDiscount1;
-//import com.dsh.guns.modular.system.dao.UserActivityDiscount1Mapper;
-//import com.dsh.guns.modular.system.service.ITCompanyService;
-//import com.dsh.guns.modular.system.service.IUserActivityDiscount1Service;
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import org.apache.poi.hssf.usermodel.*;
-//import org.apache.poi.ss.usermodel.CellType;
-//import org.apache.poi.ss.usermodel.HorizontalAlignment;
-//import org.apache.poi.ss.util.CellRangeAddress;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 用户活动-折扣1 服务实现类
-// * </p>
-// *
-// * @author stylefeng
-// * @since 2020-06-19
-// */
-//@Service
-//public class UserActivityDiscount1ServiceImpl extends ServiceImpl<UserActivityDiscount1Mapper, UserActivityDiscount1> implements IUserActivityDiscount1Service {
-//
-// @Resource
-// private UserActivityDiscount1Mapper userActivityDiscount1Mapper;
-//
-// @Autowired
-// private ITCompanyService companyService;
-//
-//
-// /**
-// * 获取折扣统计
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public Map<String, Object> queryDiscount1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> list = userActivityDiscount1Mapper.queryDiscount1(name, start, end, companyId, offset, limit);
-// int i = userActivityDiscount1Mapper.queryDiscount1Count(name, start, end, companyId);
-// Map<String, Object> map = new HashMap<>();
-// map.put("rows", list);
-// map.put("total", i);
-// return map;
-// }
-//
-//
-// /**
-// * 下载折扣优惠
-// * @param name
-// * @param time
-// * @param companyId
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public HSSFWorkbook downloadDiscount1(String name, String time, Integer companyId) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> maps = userActivityDiscount1Mapper.queryDiscount1(name, start, end, companyId, null, null);
-//
-// List<List<String>> lists = new ArrayList<>();
-// List<String> list = new ArrayList<>();
-// list.add("活动名称：" + name);
-// list.add("起止时间：" + time);
-// list.add("运营商：" + (null != companyId ? companyService.selectById(companyId).getName() : ""));
-// lists.add(list);
-// list = new ArrayList<>();
-// list.add("时间");
-// list.add("使用情况");
-// list.add("");
-// lists.add(list);
-// list = new ArrayList<>();
-// list.add("");
-// list.add("折扣参与人数");
-// list.add("折扣金额");
-// lists.add(list);
-//
-// List<List<List<String>>> lists1 = new ArrayList<>();
-// List<List<String>> lists2 = new ArrayList<>();
-// for(Map<String, Object> map : maps){
-// List<String> list2 = new ArrayList<>();
-// list2.add(null != map.get("time") ? map.get("time").toString() : "");
-// list2.add(null != map.get("userNum") ? map.get("userNum").toString() : "");
-// list2.add(null != map.get("discountMoney") ? map.get("discountMoney").toString() : "");
-// lists2.add(list2);
-// }
-// lists1.add(lists2);
-//
-// HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
-// HSSFSheet hssfSheet = hssfWorkbook.createSheet();
-// hssfSheet.setColumnWidth(0, 6 * 256);
-// hssfSheet.setDefaultRowHeightInPoints(20f);
-// for(int i = 0; i < lists.size(); i++){
-// HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
-// HSSFCellStyle style = hssfWorkbook.createCellStyle();
-// HSSFFont font = hssfWorkbook.createFont();
-// font.setBold(true);
-// style.setFont(font);
-// style.setAlignment(HorizontalAlignment.CENTER);
-// for (int l = 0; l < lists.get(i).size(); l++) {
-// HSSFCell hssfCell = hssfRow.createCell(l);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(lists.get(i).get(l));
-// hssfCell.setCellStyle(style);
-// if(l > 0) {
-// hssfSheet.setColumnWidth(l , 20 * 256);
-// }
-//
-// }
-// }
-// //这个就是合并单元格
-// //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
-// //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
-// hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
-// hssfSheet.addMergedRegion(new CellRangeAddress(1,1,1,2));
-//
-//
-// for(int i = 0; i < lists1.size(); i++){
-// //将数据添加到表格中
-// List<String> data = null;
-// for (int l = 0; l < lists1.get(i).size(); l++) {
-// HSSFRow row = hssfSheet.createRow(l + 3);
-// data = lists1.get(i).get(l);
-// for (int j = 0; j < data.size(); j++) {
-// HSSFCell hssfCell = row.createCell(j);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(data.get(j));
-// }
-// }
-// }
-// return hssfWorkbook;
-// }
-//
-//
-// /**
-// * 获取折扣优惠详情
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public Map<String, Object> queryDiscountInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> list = userActivityDiscount1Mapper.queryDiscountInfo(name, start, end, companyId, offset, limit);
-// int i = userActivityDiscount1Mapper.queryDiscountInfoCount(name, start, end, companyId);
-// Map<String, Object> map = new HashMap<>();
-// map.put("rows", list);
-// map.put("total", i);
-// return map;
-// }
-//
-//
-// /**
-// * 下载折扣优惠详情
-// * @param name
-// * @param time
-// * @param companyId
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public HSSFWorkbook downloadDiscountInfo(String name, String time, Integer companyId) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> maps = userActivityDiscount1Mapper.queryDiscountInfo(name, start, end, companyId, null, null);
-//
-// List<List<String>> lists = new ArrayList<>();
-// List<String> list = new ArrayList<>();
-// list.add("活动名称：" + name);
-// list.add("起止时间：" + time);
-// list.add("运营商：");
-// list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
-// lists.add(list);
-// list = new ArrayList<>();
-// list.add("打折时间");
-// list.add("打折使用人");
-// list.add("打折使用人电话");
-// list.add("打折金额");
-// lists.add(list);
-//
-// List<List<List<String>>> lists1 = new ArrayList<>();
-// List<List<String>> lists2 = new ArrayList<>();
-// for(Map<String, Object> map : maps){
-// List<String> list2 = new ArrayList<>();
-// list2.add(null != map.get("time") ? map.get("time").toString() : "");
-// list2.add(null != map.get("name") ? map.get("name").toString() : "");
-// list2.add(null != map.get("phone") ? map.get("phone").toString() : "");
-// list2.add(null != map.get("discountMoney") ? map.get("discountMoney").toString() : "");
-// lists2.add(list2);
-// }
-// lists1.add(lists2);
-//
-// HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
-// HSSFSheet hssfSheet = hssfWorkbook.createSheet();
-// hssfSheet.setColumnWidth(0, 6 * 256);
-// hssfSheet.setDefaultRowHeightInPoints(20f);
-// for(int i = 0; i < lists.size(); i++){
-// HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
-// HSSFCellStyle style = hssfWorkbook.createCellStyle();
-// HSSFFont font = hssfWorkbook.createFont();
-// font.setBold(true);
-// style.setFont(font);
-// style.setAlignment(HorizontalAlignment.CENTER);
-// for (int l = 0; l < lists.get(i).size(); l++) {
-// HSSFCell hssfCell = hssfRow.createCell(l);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(lists.get(i).get(l));
-// hssfCell.setCellStyle(style);
-// if(l > 0) {
-// hssfSheet.setColumnWidth(l , 20 * 256);
-// }
-//
-// }
-// }
-//
-// for(int i = 0; i < lists1.size(); i++){
-// //将数据添加到表格中
-// List<String> data = null;
-// for (int l = 0; l < lists1.get(i).size(); l++) {
-// HSSFRow row = hssfSheet.createRow(l + 2);
-// data = lists1.get(i).get(l);
-// for (int j = 0; j < data.size(); j++) {
-// HSSFCell hssfCell = row.createCell(j);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(data.get(j));
-// }
-// }
-// }
-// return hssfWorkbook;
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java
deleted file mode 100644
index 9094edb..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java
+++ /dev/null
@@ -1,294 +0,0 @@
-//package com.dsh.guns.modular.system.service.impl;
-//
-//import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-//import com.dsh.guns.core.util.ToolUtil;
-//import com.dsh.guns.modular.system.dao.UserRedPacketRecordMapper;
-//import com.dsh.guns.modular.system.model.UserRedPacketRecord;
-//import com.dsh.guns.modular.system.service.ITCompanyService;
-//import com.dsh.guns.modular.system.service.IUserRedPacketRecordService;
-//import org.apache.poi.hssf.usermodel.*;
-//import org.apache.poi.ss.usermodel.CellType;
-//import org.apache.poi.ss.usermodel.HorizontalAlignment;
-//import org.apache.poi.ss.util.CellRangeAddress;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//
-//@Service
-//public class UserRedPacketRecordServiceImpl extends ServiceImpl<UserRedPacketRecordMapper, UserRedPacketRecord> implements IUserRedPacketRecordService {
-//
-// @Resource
-// private UserRedPacketRecordMapper userRedPacketRecordMapper;
-//
-// @Autowired
-// private ITCompanyService companyService;
-//
-//
-// /**
-// * 获取红包统计数据
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public Map<String, Object> queryRedEnvelopes(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> list = userRedPacketRecordMapper.queryRedEnvelopes(name, start, end, companyId, offset, limit);
-// int i = userRedPacketRecordMapper.queryRedEnvelopesCount(name, start, end, companyId);
-// Map<String, Object> map = new HashMap<>();
-// map.put("rows", list);
-// map.put("total", i);
-// return map;
-// }
-//
-// /**
-// * 下载红包统计数据
-// * @param name
-// * @param time
-// * @param companyId
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public HSSFWorkbook downloadRedEnvelopes(String name, String time, Integer companyId) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> maps = userRedPacketRecordMapper.queryRedEnvelopes(name, start, end, companyId, null, null);
-// List<List<String>> lists = new ArrayList<>();
-// List<String> list = new ArrayList<>();
-// list.add("活动名称：");
-// list.add(name);
-// list.add("");
-// list.add("起止时间：");
-// list.add(time);
-// list.add("");
-// list.add("运营商：");
-// list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
-// lists.add(list);
-// list = new ArrayList<>();
-// list.add("时间");
-// list.add("领取情况");
-// list.add("");
-// list.add("");
-// list.add("");
-// list.add("使用情况");
-// list.add("");
-// list.add("");
-// lists.add(list);
-// list = new ArrayList<>();
-// list.add("");
-// list.add("注册领取人数");
-// list.add("系统派发人数");
-// list.add("合计");
-// list.add("领取金额");
-// list.add("使用人数");
-// list.add("使用张数");
-// list.add("使用金额");
-// lists.add(list);
-//
-// List<List<List<String>>> lists1 = new ArrayList<>();
-// List<List<String>> lists2 = new ArrayList<>();
-// for(Map<String, Object> map : maps){
-// List<String> list2 = new ArrayList<>();
-// list2.add(null != map.get("time") ? map.get("time").toString() : "");
-// list2.add(null != map.get("receivePeople") ? map.get("receivePeople").toString() : "");
-// list2.add(null != map.get("receivePeople") ? map.get("receivePeople").toString() : "");
-// list2.add(null != map.get("receive") ? map.get("receive").toString() : "");
-// list2.add(null != map.get("receiveMoney") ? map.get("receiveMoney").toString() : "");
-// list2.add(null != map.get("usePeople") ? map.get("usePeople").toString() : "");
-// list2.add(null != map.get("use") ? map.get("use").toString() : "");
-// list2.add(null != map.get("useMoney") ? map.get("useMoney").toString() : "");
-// lists2.add(list2);
-// }
-// lists1.add(lists2);
-//
-// HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
-// HSSFSheet hssfSheet = hssfWorkbook.createSheet();
-// hssfSheet.setColumnWidth(0, 6 * 256);
-// hssfSheet.setDefaultRowHeightInPoints(20f);
-// for(int i = 0; i < lists.size(); i++){
-// HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
-// HSSFCellStyle style = hssfWorkbook.createCellStyle();
-// HSSFFont font = hssfWorkbook.createFont();
-// font.setBold(true);
-// style.setFont(font);
-// style.setAlignment(HorizontalAlignment.CENTER);
-// for (int l = 0; l < lists.get(i).size(); l++) {
-// HSSFCell hssfCell = hssfRow.createCell(l);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(lists.get(i).get(l));
-// hssfCell.setCellStyle(style);
-// if(l > 0) {
-// hssfSheet.setColumnWidth(l , 20 * 256);
-// }
-//
-// }
-// }
-// //这个就是合并单元格
-// //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
-// //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
-// hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
-// hssfSheet.addMergedRegion(new CellRangeAddress(0,0,4,5));
-// hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
-// hssfSheet.addMergedRegion(new CellRangeAddress(1,1,1,4));
-// hssfSheet.addMergedRegion(new CellRangeAddress(1,1,5,7));
-//
-//
-// for(int i = 0; i < lists1.size(); i++){
-// //将数据添加到表格中
-// List<String> data = null;
-// for (int l = 0; l < lists1.get(i).size(); l++) {
-// HSSFRow row = hssfSheet.createRow(l + 3);
-// data = lists1.get(i).get(l);
-// for (int j = 0; j < data.size(); j++) {
-// HSSFCell hssfCell = row.createCell(j);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(data.get(j));
-// }
-// }
-// }
-// return hssfWorkbook;
-// }
-//
-//
-// /**
-// * 获取红包统计明细
-// * @param name
-// * @param time
-// * @param companyId
-// * @param offset
-// * @param limit
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public Map<String, Object> queryRedEnvelopesInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> list = userRedPacketRecordMapper.queryRedEnvelopesInfo(name, start, end, companyId, offset, limit);
-// int i = userRedPacketRecordMapper.queryRedEnvelopesInfoCount(name, start, end, companyId);
-// Map<String, Object> map = new HashMap<>();
-// map.put("rows", list);
-// map.put("total", i);
-// return map;
-// }
-//
-// /**
-// * 下载红包统计明细
-// * @param name
-// * @param time
-// * @param companyId
-// * @return
-// * @throws Exception
-// */
-// @Override
-// public HSSFWorkbook downloadRedEnvelopesInfo(String name, String time, Integer companyId) throws Exception {
-// String start = null;
-// String end = null;
-// if(!StringUtils.isEmpty(time)){
-// start = time.split(" - ")[0];
-// end = time.split(" - ")[1];
-// }
-// List<Map<String, Object>> maps = userRedPacketRecordMapper.queryRedEnvelopesInfo(name, start, end, companyId, null, null);
-// List<List<String>> lists = new ArrayList<>();
-// List<String> list = new ArrayList<>();
-// list.add("活动名称：");
-// list.add(name);
-// list.add("");
-// list.add("起止时间：");
-// list.add(time);
-// list.add("运营商：");
-// list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
-// lists.add(list);
-// list = new ArrayList<>();
-// list.add("领取时间");
-// list.add("领取人");
-// list.add("领取人电话");
-// list.add("领取金额");
-// list.add("到期时间");
-// list.add("状态");
-// list.add("使用时间");
-// lists.add(list);
-//
-// List<List<List<String>>> lists1 = new ArrayList<>();
-// List<List<String>> lists2 = new ArrayList<>();
-// for(Map<String, Object> map : maps){
-// List<String> list2 = new ArrayList<>();
-// list2.add(null != map.get("time") ? map.get("time").toString() : "");
-// list2.add(null != map.get("name") ? map.get("name").toString() : "");
-// list2.add(null != map.get("phone") ? map.get("phone").toString() : "");
-// list2.add(null != map.get("money") ? map.get("money").toString() : "");
-// list2.add(null != map.get("expirationTime") ? map.get("expirationTime").toString() : "");
-// list2.add(null != map.get("state") ? map.get("state").toString() : "");
-// list2.add(null != map.get("endTime") ? map.get("endTime").toString() : "");
-// lists2.add(list2);
-// }
-// lists1.add(lists2);
-//
-// HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
-// HSSFSheet hssfSheet = hssfWorkbook.createSheet();
-// hssfSheet.setColumnWidth(0, 6 * 256);
-// hssfSheet.setDefaultRowHeightInPoints(20f);
-// for(int i = 0; i < lists.size(); i++){
-// HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
-// HSSFCellStyle style = hssfWorkbook.createCellStyle();
-// HSSFFont font = hssfWorkbook.createFont();
-// font.setBold(true);
-// style.setFont(font);
-// style.setAlignment(HorizontalAlignment.CENTER);
-// for (int l = 0; l < lists.get(i).size(); l++) {
-// HSSFCell hssfCell = hssfRow.createCell(l);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(lists.get(i).get(l));
-// hssfCell.setCellStyle(style);
-// if(l > 0) {
-// hssfSheet.setColumnWidth(l , 20 * 256);
-// }
-//
-// }
-// }
-// //这个就是合并单元格
-// //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
-// //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
-// hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
-//
-//
-// for(int i = 0; i < lists1.size(); i++){
-// //将数据添加到表格中
-// List<String> data = null;
-// for (int l = 0; l < lists1.get(i).size(); l++) {
-// HSSFRow row = hssfSheet.createRow(l + 2);
-// data = lists1.get(i).get(l);
-// for (int j = 0; j < data.size(); j++) {
-// HSSFCell hssfCell = row.createCell(j);
-// hssfCell.setCellType(CellType.STRING);//设置表格类型
-// hssfCell.setCellValue(data.get(j));
-// }
-// }
-// }
-// return hssfWorkbook;
-// }
-//}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java
deleted file mode 100644
index a9c2206..0000000
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.dsh.guns.modular.system.service.impl;
-
-import java.util.List;
-
-import java.util.Map;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.mapper.UserMapper;
-import com.dsh.guns.core.dataScope.DataScope;
-import org.springframework.stereotype.Service;
-
-import com.dsh.guns.modular.system.model.User;
-import com.dsh.guns.modular.system.service.IUserService;
-
-/**
- * <p>
- * 管理员表 服务实现类
- * </p>
- *
- * @author stylefeng123
- * @since 2018-02-22
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-
- @Override
- public int setStatus(Integer userId, int status) {
- return this.baseMapper.setStatus(userId, status);
- }
-
- @Override
- public int changePwd(Integer userId, String pwd) {
- return this.baseMapper.changePwd(userId, pwd);
- }
-
-
- @Override
- public int setRoles(Integer userId, String roleIds) {
- return this.baseMapper.setRoles(userId, roleIds);
- }
-
- @Override
- public User getByAccount(String account) {
- return this.baseMapper.getByAccount(account);
- }
-
- @Override
- public Integer getMenuNumByRole(String roleStr) {
- return this.baseMapper.getMenuNumByRole(roleStr);
- }
-
- @Override
- public List<Map<String, Object>> getUserListPage(Page<Map<String, Object>> page, DataScope dataScope, String name, String beginTime, String endTime, Integer deptid) {
- List<Map<String, Object>> userListPage = this.baseMapper.getUserListPage(page, dataScope, name, beginTime, endTime, deptid);
- return userListPage;
- }
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/TaskUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/TaskUtil.java
index 15015d2..146c8b4 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/TaskUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/TaskUtil.java
@@ -1,8 +1,6 @@
package com.dsh.guns.modular.system.util;
-import com.dsh.guns.modular.system.service.ITbUserExitService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -14,22 +12,8 @@
public class TaskUtil {
- @Autowired
- private ITbUserExitService userExitService;
-
- /**
- * 每分钟
- */
- @Scheduled(cron = "0 */1 * * * ?")
- public void taskDay(){
- try {
- userExitService.getSevenDay();
- }catch (Exception e){
- e.printStackTrace();
- }
- }
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/base/AbstractJob.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/base/AbstractJob.java
index e7b0963..6e83da1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/base/AbstractJob.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/base/AbstractJob.java
@@ -1,10 +1,5 @@
package com.dsh.guns.modular.system.util.task.base;
-import cn.mb.cloud.common.core.util.SpringContextHolder;
-import com.dsh.guns.modular.system.service.ITDriverService;
-import com.dsh.guns.modular.system.service.ITNoticesService;
-import com.dsh.guns.modular.system.service.ITSystemNoticeService;
-import com.dsh.guns.modular.system.service.ITUserService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -17,20 +12,6 @@
@Override
public abstract void execute(JobExecutionContext context) throws JobExecutionException;
- protected ITUserService tUserService; //用户
- protected ITNoticesService tNoticesService; //公告
- protected ITSystemNoticeService tSystemNoticeService; //公告记录
- protected ITDriverService tDriverService; //司机
- public AbstractJob(){
- //this.exhibitionService = SpringContextsUtil.getBean("exhibitionService", IExhibitionService.class);
- this.tUserService = SpringContextHolder.getBean( ITUserService.class);
- this.tNoticesService = SpringContextHolder.getBean( ITNoticesService.class);
- this.tSystemNoticeService = SpringContextHolder.getBean( ITSystemNoticeService.class);
- this.tDriverService = SpringContextHolder.getBean( ITDriverService.class);
-
-
- }
-
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/jobs/AddNotice.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/jobs/AddNotice.java
index d40fccf..96b9bc7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/jobs/AddNotice.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/task/jobs/AddNotice.java
@@ -1,19 +1,9 @@
package com.dsh.guns.modular.system.util.task.jobs;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.entity.TNotices;
-import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.modular.system.model.TDriver;
-import com.dsh.guns.modular.system.model.TSystemNotice;
-import com.dsh.guns.modular.system.model.TUser;
import com.dsh.guns.modular.system.util.task.base.AbstractJob;
import lombok.NoArgsConstructor;
-import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-
-import java.util.Date;
-import java.util.List;
/**
* 添加公告记录
@@ -25,66 +15,5 @@
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
- JobDataMap maps = context.getMergedJobDataMap();
- Integer noticeId = maps.getIntValue("noticeId");
-
- try {
- System.out.println("----定时1秒后生成公告记录-----");
- TNotices tNotices = tNoticesService.getById(noticeId);
- if (SinataUtil.isNotEmpty(tNotices)){
- if (tNotices.getIsUser() == 2){
- List<TUser> tUsers = tUserService.getBaseMapper().selectList(new QueryWrapper<TUser>().eq("state",1));
- //发送公告给用户
- for (TUser user : tUsers){
- TSystemNotice notice = new TSystemNotice();
- notice.setType(1);
- notice.setUserType(1);
- notice.setNoticesId(noticeId);
- notice.setContent(tNotices.getContent());
- notice.setUserId(user.getId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- tSystemNoticeService.save(notice);
-
- /*Map<String,Object> map = new HashMap<String,Object>();
- map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是
- map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是
- map.put("type", 2); //消息类型 1=互动 2=公告
- map.put("id", record.getId()); //对象ID
- JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
- }
- }
- if (tNotices.getIsDriver() == 2){
- List<TDriver> tDrivers = tDriverService.getBaseMapper().selectList(new QueryWrapper<TDriver>().eq("authState",2));
- //发送公告给用户
- for (TDriver driver : tDrivers){
- TSystemNotice notice = new TSystemNotice();
- notice.setType(1);
- notice.setUserType(2);
- notice.setNoticesId(noticeId);
- notice.setContent(tNotices.getContent());
- notice.setUserId(driver.getId());
- notice.setInsertTime(new Date());
- notice.setRead(1);
- tSystemNoticeService.save(notice);
-
- /*Map<String,Object> map = new HashMap<String,Object>();
- map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是
- map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是
- map.put("type", 2); //消息类型 1=互动 2=公告
- map.put("id", record.getId()); //对象ID
- JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
-
- if (tNotices.getIsBroadcast() == 1){
- //增加极光推送
-// JpushUtil.SendPushWithCustomForSh("DRIVER"+driver.getId().toString(),tNotices.getTitle(),"通知消息",null);
- }
-
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
}
}
--
Gitblit v1.7.1