mapper处理

pom.xml

@@ -225,11 +225,11 @@
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.springframework.boot</groupId>-->
+			<!--<artifactId>spring-boot-starter-test</artifactId>-->
+			<!--<scope>test</scope>-->
+		<!--</dependency>-->
 	</dependencies>
 
 	<build>

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -0,0 +1,21 @@
+package com.szwl.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备表 前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-08-08
+ */
+@RestController
+@RequestMapping("/tEquipment")
+public class TEquipmentController {
+
+}
+

src/main/java/com/szwl/controller/TOrderController.java

@@ -81,7 +81,7 @@ public class TOrderController {
     @Autowired
     SzwlFeign szwlFeign;
     @GetMapping("/pageOrder")
-    public ResponseModel<IPage<?>> pageOrder(String adminId,String adminType,String type,String userName,String payType,String productNo,String clientId,String dateType, Date stratDate, Date endDate, long current, long size ) {
+    public ResponseModel<IPage<?>> pageOrder(String adminId,String adminType,String type,String userName,String payType,String productNo,String clientId,String dateType, Date startDate, Date endDate, long current, long size ) {
         //判断当前账号状态
         TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId));
         //类型
@@ -118,7 +118,7 @@ public class TOrderController {
                 //判断当前账号状态 公司还是商家
                 if(admin.getType()>1){
                     //商家 判断是否子账户
-                    if(admin.getIsAdmined().equals("0")){
+                    if(admin.getIsAdmined()){
                         //商家自己
                         query.eq(TOrder::getAdminId,adminId);
                     }else {
@@ -162,15 +162,15 @@ public class TOrderController {
             if(StringUtils.isNotEmpty(dateType)){
                 if(dateType.equals("0")){
                     //创建时间
-                    if(stratDate!=null&&endDate!=null){
-                        query.gt(TOrder::getCreateDate,stratDate);
+                    if(startDate!=null&&endDate!=null){
+                        query.gt(TOrder::getCreateDate,startDate);
                         query.lt(TOrder::getCreateDate,endDate);
                     }
                 }
                 if(dateType.equals("1")){
                     //退款时间
-                    if(stratDate!=null&&endDate!=null){
-                        query.gt(TOrder::getRefundDate,stratDate);
+                    if(startDate!=null&&endDate!=null){
+                        query.gt(TOrder::getRefundDate,startDate);
                         query.lt(TOrder::getRefundDate,endDate);
                     }
                 }
@@ -185,7 +185,7 @@ public class TOrderController {
             LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
             //adminType="all"时，代表查全部下级  子账户没有这个权限  公司人员默认查所有人
             if(StringUtils.isNotEmpty(adminType)){
-                if(admin.getIsAdmined().equals("0")&&admin.getType()>1){
+                if(admin.getIsAdmined()&&admin.getType()>1){
                     if(admin.getType()>1){
                         if(adminType.equals("all")){
                             //查找所有下级
@@ -213,7 +213,7 @@ public class TOrderController {
                 //判断当前账号状态 公司还是商家
                 if(admin.getType()>1){
                     //商家 判断是否子账户
-                    if(admin.getIsAdmined().equals("0")){
+                    if(admin.getIsAdmined()){
                         //商家自己
                         query.eq(TCoinOrder::getAdminId,adminId);
                     }else {
@@ -254,8 +254,8 @@ public class TOrderController {
                     query.eq(TCoinOrder::getClientId,equipment.getClientId());
                 }
             }
-            if(stratDate!=null&&endDate!=null){
-                query.gt(TCoinOrder::getPayDate,stratDate);
+            if(startDate!=null&&endDate!=null){
+                query.gt(TCoinOrder::getPayDate,startDate);
                 query.lt(TCoinOrder::getPayDate,endDate);
             }
             Page<TCoinOrder> page = new Page<>(current, size, true);
@@ -395,8 +395,8 @@ public class TOrderController {
             //查去年的数据找数据库
             String endDate = param.getEndDate();
             String toYear = "2022-01-01 00:00:00";
-            Date date = new Date();
-            Date year = new Date();
+            Date date =null;
+            Date year = null;
             SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             try {
                 //使用SimpleDateFormat的parse()方法生成Date
@@ -608,32 +608,28 @@ public class TOrderController {
      */
     @ApiOperation(value = "订单数据导出-查询")
     @RequestMapping(value = "/orderSelect", method = RequestMethod.GET)
-    public String orderSelect(String type, String clientId, String username, String beginEndDate, long current, long size) {
+    public String orderSelect(String type, String clientId, String username,  Date startDate, Date endDate, long current, long size) {
         if(size>50){
             return "error";
         }
         JSONObject jsonObject = new JSONObject();
 
-        if (!StringUtils.isEmpty(beginEndDate)) {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (startDate!=null&&endDate!=null) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             Date begin = null;
             Date end = null;
             Long adminId = null;
-            try {
-                begin = simpleDateFormat.parse(beginEndDate.split(" - ")[0].trim());
-                end = simpleDateFormat.parse(beginEndDate.split(" - ")[1].trim());
-                long time = end.getTime() - begin.getTime();
-                if(time>31*24*60*60*1000l){
-                    return "error";
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
+            begin = startDate;
+            end = endDate;
+            long time = end.getTime() - begin.getTime();
+            if(time>31*24*60*60*1000l){
+                return "时间跨度过长";
             }
             if(!StringUtils.isEmpty(username)){
                 TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminByUsername(username));
                 adminId = admin.getId();
             }
-            List<OrderDaoChuDTO> OrderDaoChuDTOList =orderService.orderDaoChu(begin,end,adminId,clientId,type,current,size);
+            List<OrderDaoChuDTO> OrderDaoChuDTOList =orderService.orderDaoChu(simpleDateFormat.format(begin),simpleDateFormat.format(end),adminId,clientId,type,current,size);
             for(OrderDaoChuDTO orderDaoChuDTO: OrderDaoChuDTOList){
                 String adminId1 = orderDaoChuDTO.getAdminId().toString();
                 TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId1));
@@ -683,30 +679,26 @@ public class TOrderController {
      */
     @ApiOperation(value = "订单数据导出-导出")
     @RequestMapping(value = "/orderExport", method = RequestMethod.GET)
-    public Object orderExport(HttpServletResponse response, String type, String clientId, String username, String beginEndDate, long current, long size) {
+    public Object orderExport(HttpServletResponse response, String type, String clientId, String username, Date startDate, Date endDate, long current, long size) {
         if(size>500){
             return JsonMessage.success("页数过大");
         }
-        if (!StringUtils.isEmpty(beginEndDate)) {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (startDate!=null&&endDate!=null) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             Date begin = null;
             Date end = null;
             Long adminId = null;
-            try {
-                begin = simpleDateFormat.parse(beginEndDate.split(" - ")[0].trim());
-                end = simpleDateFormat.parse(beginEndDate.split(" - ")[1].trim());
+                begin = startDate;
+                end = endDate;
                 long time = end.getTime() - begin.getTime();
                 if(time>31*24*60*60*1000l){
                     return JsonMessage.success("时间跨度过长");
                 }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
             if(!StringUtils.isEmpty(username)){
                 TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminByUsername(username));
                 adminId = admin.getId();
             }
-            List<OrderDaoChuDTO> OrderDaoChuDTOList =orderService.orderDaoChu(begin,end,adminId,clientId,type,current,size);
+            List<OrderDaoChuDTO> OrderDaoChuDTOList =orderService.orderDaoChu(simpleDateFormat.format(begin),simpleDateFormat.format(end),adminId,clientId,type,current,size);
             for(OrderDaoChuDTO orderDaoChuDTO: OrderDaoChuDTOList){
                 Long adminId1 = Long.valueOf(orderDaoChuDTO.getAdminId().toString());
                 TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId1.toString()));
@@ -805,7 +797,7 @@ public class TOrderController {
             LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
             //adminType="all"时，代表查全部下级  子账户没有这个权限  公司人员默认查所有人
             if(StringUtils.isNotEmpty(adminType)){
-                if(admin.getIsAdmined().equals("0")&&admin.getType()>1){
+                if(admin.getIsAdmined()&&admin.getType()>1){
                     if(admin.getType()>1){
                         if(adminType.equals("all")){
                             //查找所有下级
@@ -833,7 +825,7 @@ public class TOrderController {
                 //判断当前账号状态 公司还是商家
                 if(admin.getType()>1){
                     //商家 判断是否子账户
-                    if(admin.getIsAdmined().equals("0")){
+                    if(admin.getIsAdmined()){
                         //商家自己
                         query.eq(TOrder::getAdminId,adminId);
                     }else {
@@ -925,7 +917,7 @@ public class TOrderController {
             LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
             //adminType="all"时，代表查全部下级  子账户没有这个权限  公司人员默认查所有人
             if(StringUtils.isNotEmpty(adminType)){
-                if(admin.getIsAdmined().equals("0")&&admin.getType()>1){
+                if(admin.getIsAdmined()&&admin.getType()>1){
                     if(admin.getType()>1){
                         if(adminType.equals("all")){
                             //查找所有下级
@@ -953,7 +945,7 @@ public class TOrderController {
                 //判断当前账号状态 公司还是商家
                 if(admin.getType()>1){
                     //商家 判断是否子账户
-                    if(admin.getIsAdmined().equals("0")){
+                    if(admin.getIsAdmined()){
                         //商家自己
                         query.eq(TCoinOrder::getAdminId,adminId);
                     }else {

src/main/java/com/szwl/feign/SzwlFeign.java

@@ -22,27 +22,27 @@ public interface SzwlFeign {
     @GetMapping("/test/testList")
     public ResponseModel<List<?>> testList(TAdminParam param);
     @GetMapping("/tAdmin/getAdminIdList")
-    ResponseModel<List<Long>>  getAdminIdList(String adminId);
+    ResponseModel<List<Long>>  getAdminIdList(@RequestParam String adminId);
     @GetMapping("/tAdmin/getAdminByUsername")
-    ResponseModel<TAdmin>  getAdminByUsername(String username);
+    ResponseModel<TAdmin>  getAdminByUsername(@RequestParam String username);
     @GetMapping("/tAdmin/getAdmin")
-    ResponseModel<TAdmin>  getAdmin(String id);
+    ResponseModel<TAdmin>  getAdmin(@RequestParam String id);
     @GetMapping("/tEquipment/getClientIdList")
-    ResponseModel<TAdminEquipment>  getClientIdList(String adminId);
+    ResponseModel<TAdminEquipment>  getClientIdList(@RequestParam String adminId);
     @GetMapping("/tEquipment/getClientIds")
-    ResponseModel<List<String>>  getClientIds(String adminId);
+    ResponseModel<List<String>>  getClientIds(@RequestParam String adminId);
     @GetMapping("/tEquipment/findEquipmentByClientId")
-    ResponseModel<TEquipment> findEquipmentByClientId(String clientId);
+    ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String clientId);
     @PostMapping("/tEquipment/getEquipmentByNameAndId")
     ResponseModel<TEquipment> getEquipmentByNameAndId(@RequestBody TEquipment equipment);
     @PostMapping("/tEquipment/findById")
-    ResponseModel<TEquipment> findById(String id);
+    ResponseModel<TEquipment> findById(@RequestParam String id);
     @GetMapping("/tAdmin/pageAdmin2")
     ResponseModel<IPage<TAdmin>>  pageAdmin2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
     @GetMapping("/tEquipment/pageEquipment2")
     ResponseModel<IPage<TEquipment>>  pageEquipment2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
     @GetMapping("/tShandeMch/getShandeMch")
-    ResponseModel<TShandeMch> getShandeMch(String adminId);
+    ResponseModel<TShandeMch> getShandeMch(@RequestParam String adminId);
     @PostMapping("/tShandeMch/updateShandeMch")
     ResponseModel<TShandeMch> updateShandeMch(@RequestBody TShandeMch shandeMch);
 }

src/main/java/com/szwl/mapper/TEquipmentMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备表 Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-08-08
+ */
+public interface TEquipmentMapper extends BaseMapper<TEquipment> {
+
+}

src/main/java/com/szwl/mapper/TOrderMapper.java

@@ -4,6 +4,7 @@ import com.szwl.model.bean.ChartBean;
 import com.szwl.model.bean.OrderDaoChuDTO;
 import com.szwl.model.entity.TOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.szwl.model.query.OrderDaoChuParam;
 import com.szwl.model.query.Pageable;
 import com.szwl.model.query.StatisticsParam;
 
@@ -29,5 +30,5 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
 
     List<ChartBean> getEquipmentStatistics(StatisticsParam param);
 
-    List<OrderDaoChuDTO> orderDaoChu(Date begin, Date end, Long adminId, String clientId, String type, long current, long size);
+    public List<OrderDaoChuDTO> getOrderDaoCu(OrderDaoChuParam daoChuParam);
 }

src/main/java/com/szwl/mapper/xml/TOrderMapper.xml

@@ -43,6 +43,19 @@
         <!--<result column="salePrice" jdbcType="DECIMAL" property="salePrice" />-->
         <result column="salePrice" jdbcType="FLOAT" property="salePrice" />
     </resultMap>
+    <resultMap id="orderDaoChuDTO" type="com.szwl.model.bean.OrderDaoChuDTO">
+        <result column="username" jdbcType="VARCHAR"  property="username" />
+        <result column="name" jdbcType="VARCHAR"  property="name" />
+        <result column="phone" jdbcType="VARCHAR"  property="phone" />
+        <result column="clientId" jdbcType="VARCHAR"  property="clientId" />
+        <result column="adminId" jdbcType="BIGINT"  property="adminId" />
+        <result column="priceTotal" jdbcType="DECIMAL"  property="priceTotal" />
+        <result column="address"  jdbcType="VARCHAR" property="address" />
+        <result column="equipmentType" jdbcType="VARCHAR" property="equipmentType" />
+        <result column="createDate" jdbcType="VARCHAR"  property="createDate" />
+        <result column="equipmentTotal" jdbcType="VARCHAR" property="equipmentTotal" />
+        <result column="lastUsername" jdbcType="VARCHAR" property="lastUsername" />
+    </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, create_date, modify_date, admin_id, admin_proportion, agency_id, agency_proportion, alt_info, client_id, equipment_id, frp_code, merchant_id, merchant_proportion, pay_date, personage_id, personage_proportion, price, product_id, product_name, refund_date, sn, status, type, trx_no, refund_trx_no, es, refund_amount, note, pay_platform, is_settlement, proportion_desc
@@ -317,9 +330,9 @@
         order by salePrice desc
         limit 30
     </select>
-    <select id="orderDaoChu" resultType="com.szwl.model.bean.OrderDaoChuDTO">
+    <select id="getOrderDaoCu" resultMap="orderDaoChuDTO" parameterType="com.szwl.model.query.OrderDaoChuParam">
         select sum(price) AS priceTotal,admin_id AS adminId,client_id AS clientId
-         FROM  t_order  where 1=1
+         from  t_order  where 1=1
         <if test="adminId != null and adminId !=''">
             and admin_id= #{adminId} -- 订单所属商家id
         </if>
@@ -328,7 +341,7 @@
         </if>
         and status = 1
         and create_date >= STR_TO_DATE(CONCAT(#{begin},' 00:00:00'),'%Y/%m/%d %H:%i:%s')
-        <![CDATA[ and create_date <= STR_TO_DATE(CONCAT(#{end},' 23:59:59'),'%Y/%m/%d %H:%i:%s') ]]>
+         <![CDATA[ and create_date <= STR_TO_DATE(CONCAT(#{end},' 23:59:59'),'%Y/%m/%d %H:%i:%s') ]]>
         <if test="type != null and type !='' and type==2">
             group by adminId
         </if>

src/main/java/com/szwl/model/bean/OrderDaoChuDTO.java

@@ -1,5 +1,11 @@
 package com.szwl.model.bean;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
@@ -7,6 +13,11 @@ import java.util.Date;
 /**
  * 订单daochu
  */
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
 public class OrderDaoChuDTO {
 
     /**
@@ -35,7 +46,7 @@ public class OrderDaoChuDTO {
      */
     private String clientId;
 
-    private BigInteger adminId;
+    private Long adminId;
     /**
      *
      */
@@ -62,91 +73,5 @@ public class OrderDaoChuDTO {
      */
     private BigDecimal priceTotal;
 
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getEquipmentType() {
-        return equipmentType;
-    }
-
-    public void setEquipmentType(String equipmentType) {
-        this.equipmentType = equipmentType;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getEquipmentTotal() {
-        return equipmentTotal;
-    }
-
-    public void setEquipmentTotal(String equipmentTotal) {
-        this.equipmentTotal = equipmentTotal;
-    }
-
-    public String getLastUsername() {
-        return lastUsername;
-    }
-
-    public void setLastUsername(String lastUsername) {
-        this.lastUsername = lastUsername;
-    }
-
-    public BigDecimal getPriceTotal() {
-        return priceTotal;
-    }
-
-    public void setPriceTotal(BigDecimal priceTotal) {
-        this.priceTotal = priceTotal;
-    }
-
-    public BigInteger getAdminId() {
-        return adminId;
-    }
 
-    public void setAdminId(BigInteger adminId) {
-        this.adminId = adminId;
-    }
 }

src/main/java/com/szwl/model/entity/TAdmin.java

@@ -39,7 +39,7 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "邮箱;")
     private String email;
 
-    @ApiModelProperty(value = "设置是否普通管理员（0：管理员，1：子账户）;")
+    @ApiModelProperty(value = "设置是否普通管理员（1：管理员，0：子账户）;")
     private Boolean isAdmined;
 
     @ApiModelProperty(value = "是否启用;")

src/main/java/com/szwl/model/entity/TEquipment.java

@@ -1,22 +1,21 @@
 package com.szwl.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * <p>
  * 设备表
  * </p>
  *
  * @author wuhs
- * @since 2022-04-19
+ * @since 2022-08-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/szwl/model/query/OrderDaoChuParam.java

@@ -0,0 +1,35 @@
+package com.szwl.model.query;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class OrderDaoChuParam {
+    @ApiModelProperty(value="商家id")
+    private Long adminId;
+
+    @ApiModelProperty(value="开始日期")
+    private String begin;
+    @ApiModelProperty(value="结束日期")
+    private String end;
+    @ApiModelProperty(value="")
+    private String clientId;
+    @ApiModelProperty(value="")
+    private String type;
+    @ApiModelProperty(value="")
+    private Long current;
+    @ApiModelProperty(value="")
+    private Long size;
+
+}

src/main/java/com/szwl/service/TEquipmentService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备表 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-08-08
+ */
+public interface TEquipmentService extends IService<TEquipment> {
+
+}

src/main/java/com/szwl/service/TOrderService.java

@@ -26,7 +26,7 @@ public interface TOrderService extends IService<TOrder> {
 
     ChartColumn getEquipmentStatistics(StatisticsParam param);
 
-    List<OrderDaoChuDTO> orderDaoChu(Date begin, Date end, Long adminId, String clientId, String type, long current, long size);
+    List<OrderDaoChuDTO> orderDaoChu(String begin, String end, Long adminId, String clientId, String type, long current, long size);
 
     List<OrderTarget> findById(TAdmin admin, List<TOrder> list);
 }

src/main/java/com/szwl/service/es/EsTEquipmentService.java

@@ -2,6 +2,10 @@ package com.szwl.service.es;
 
 import cn.com.crbank.ommo.esclient.EsBaseService;
 import cn.com.crbank.ommo.exception.MyException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.model.bean.ChartBean;
 import com.szwl.model.bean.ChartColumn;
 import com.szwl.model.entity.TEquipment;
@@ -9,8 +13,10 @@ import com.szwl.model.query.StatisticsParam;
 import com.szwl.model.query.TCoinOrderParam;
 import com.szwl.model.query.TEquipmentParam;
 import com.szwl.model.utils.DateUtils;
+import com.szwl.service.TEquipmentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -38,8 +44,8 @@ import java.util.Optional;
 public class EsTEquipmentService extends EsBaseService<TEquipment, TEquipmentParam> {
     private static boolean InitEsTableStatus = false; // 是否正常完成 es 初始化
     public static final int MAX_ROW = 10000;
-//    @Autowired
-//    TEquipmentService tEquipmentService;
+    @Autowired
+    TEquipmentService tEquipmentService;
     @Autowired
     EsTCoinOrderService esTCoinOrderService;
     @Autowired
@@ -67,44 +73,44 @@ public class EsTEquipmentService extends EsBaseService<TEquipment, TEquipmentPar
 
     @Override
     public void initTableFun() {
-//        try{
-//            String tableName = getTableName();
-//            GetIndexRequest request = new GetIndexRequest(tableName);
-////            DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(this.getTableName());
-////            restHighLevelClient.indices().delete(deleteIndexRequest,RequestOptions.DEFAULT);
-//            boolean isExists = restHighLevelClient.indices().exists(request, RequestOptions.DEFAULT);
-//            if (!isExists) {
-//                log.info("es 索引 开始创建"+tableName);
-//                createTable();
-//                // 初始化旧流水
-//                int num = 0;
-//                while (true) {
-//                    int limit = MAX_ROW;
-////                    int offset= num * MAX_ROW;
-//                    int offset= num;
-//
-//                    LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-//                    Page<TEquipment> page = new Page<>(offset, limit, true);
-//                    IPage<TEquipment> iPage = tEquipmentService.page(page, query);
-//                    List<TEquipment> list = iPage.getRecords();
-////                    TEquipmentExample example = new TEquipmentExample();
-////                    example.setLimit(limit);
-////                    example.setOffset(offset);
-////                    List<TEquipment> list = tEquipmentService.selectByOption(example);
-//                    insertBatch(list);
-//                    num++;
-//                    if(list.size()< MAX_ROW){ // 数据小于 最大值 ,证明后面已无数据，则跳出
-//                        break;
-//                    }
-//                }
-//            } else {
-//                log.info("es 索引 "+tableName+" 已存在不再创建");
-//            }
-//            InitEsTableStatus = true;
-//        }catch (Exception e){
-//            log.error("ElasticsearchRunner InitEsTEquipmentThread 发生错误：{}" , e);
-//            throw new MyException("ElasticsearchRunner InitEsTEquipmentThread 发生错误：" + e.getMessage());
-//        }
+        try{
+            String tableName = getTableName();
+            GetIndexRequest request = new GetIndexRequest(tableName);
+//            DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(this.getTableName());
+//            restHighLevelClient.indices().delete(deleteIndexRequest,RequestOptions.DEFAULT);
+            boolean isExists = restHighLevelClient.indices().exists(request, RequestOptions.DEFAULT);
+            if (!isExists) {
+                log.info("es 索引 开始创建"+tableName);
+                createTable();
+                // 初始化旧流水
+                int num = 0;
+                while (true) {
+                    int limit = MAX_ROW;
+//                    int offset= num * MAX_ROW;
+                    int offset= num;
+
+                    LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+                    Page<TEquipment> page = new Page<>(offset, limit, true);
+                    IPage<TEquipment> iPage = tEquipmentService.page(page, query);
+                    List<TEquipment> list = iPage.getRecords();
+//                    TEquipmentExample example = new TEquipmentExample();
+//                    example.setLimit(limit);
+//                    example.setOffset(offset);
+//                    List<TEquipment> list = tEquipmentService.selectByOption(example);
+                    insertBatch(list);
+                    num++;
+                    if(list.size()< MAX_ROW){ // 数据小于 最大值 ,证明后面已无数据，则跳出
+                        break;
+                    }
+                }
+            } else {
+                log.info("es 索引 "+tableName+" 已存在不再创建");
+            }
+            InitEsTableStatus = true;
+        }catch (Exception e){
+            log.error("ElasticsearchRunner InitEsTEquipmentThread 发生错误：{}" , e);
+            throw new MyException("ElasticsearchRunner InitEsTEquipmentThread 发生错误：" + e.getMessage());
+        }
     }
 
     @Override

src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -203,7 +203,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
                 tOrderParam.setMerchantId(param.getMerchantId());
                 tOrderParam.setType_gt(2);
             }
-            if(param.getAdminIds().size()>0){
+            if(param.getAdminIds()!=null&&param.getAdminIds().size()>0){
                 tOrderParam.setAdminId_inList(param.getAdminIds());
             }
 

src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TEquipment;
+import com.szwl.mapper.TEquipmentMapper;
+import com.szwl.service.TEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备表 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-08-08
+ */
+@Service
+public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipment> implements TEquipmentService {
+
+}

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TOrder;
 import com.szwl.mapper.TOrderMapper;
 import com.szwl.model.excel.OrderTarget;
+import com.szwl.model.query.OrderDaoChuParam;
 import com.szwl.model.query.Pageable;
 import com.szwl.model.query.StatisticsParam;
 import com.szwl.service.TOrderService;
@@ -111,8 +112,16 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     }
 
     @Override
-    public List<OrderDaoChuDTO> orderDaoChu(Date begin, Date end, Long adminId, String clientId, String type, long current, long size) {
-        return tOrderMapper.orderDaoChu(begin,end,adminId,clientId,type,current,size);
+    public List<OrderDaoChuDTO> orderDaoChu(String begin, String end, Long adminId, String clientId, String type, long current, long size) {
+        OrderDaoChuParam daoChuParam = new OrderDaoChuParam();
+        daoChuParam.setAdminId(adminId);
+        daoChuParam.setBegin(begin);
+        daoChuParam.setEnd(end);
+        daoChuParam.setClientId(clientId);
+        daoChuParam.setType(type);
+        daoChuParam.setCurrent(current-1);
+        daoChuParam.setSize(size);
+        return tOrderMapper.getOrderDaoCu(daoChuParam);
     }
 
     @Override