优化代码

java110-bean/src/main/java/com/java110/dto/account/AccountDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.account;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,11 +16,11 @@ import java.util.Date;
 public class AccountDto extends PageDto implements Serializable {
 
     private String amount;
-private String acctType;
-private String objId;
-private String acctId;
-private String acctName;
-private String objType;
+    private String acctType;
+    private String objId;
+    private String acctId;
+    private String acctName;
+    private String objType;
 
 
     private Date createTime;
@@ -30,37 +31,48 @@ private String objType;
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getAcctType() {
+
+    public String getAcctType() {
         return acctType;
     }
-public void setAcctType(String acctType) {
+
+    public void setAcctType(String acctType) {
         this.acctType = acctType;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getAcctId() {
+
+    public String getAcctId() {
         return acctId;
     }
-public void setAcctId(String acctId) {
+
+    public void setAcctId(String acctId) {
         this.acctId = acctId;
     }
-public String getAcctName() {
+
+    public String getAcctName() {
         return acctName;
     }
-public void setAcctName(String acctName) {
+
+    public void setAcctName(String acctName) {
         this.acctName = acctName;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 

java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -28,6 +28,7 @@ public class OwnerCarDto extends PageDto implements Serializable {
     private String carType;
     private String carTypeName;
     private String carNum;
+    private String carNumLike;
     private String[] carNums;
     private String communityId;
     private String psId;
@@ -322,4 +323,12 @@ public class OwnerCarDto extends PageDto implements Serializable {
     public void setParkingType(String parkingType) {
         this.parkingType = parkingType;
     }
+
+    public String getCarNumLike() {
+        return carNumLike;
+    }
+
+    public void setCarNumLike(String carNumLike) {
+        this.carNumLike = carNumLike;
+    }
 }

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -157,6 +157,9 @@
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>
+        <if test="carNumLike !=null and carNumLike != ''">
+            and t.car_num like  concat('%',#{carNumLike},'%')
+        </if>
         <if test="carNums !=null">
             and t.car_num in
             <foreach collection="carNums" item="item" index="index" open="(" close=")" separator=",">
@@ -307,6 +310,9 @@
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>
+        <if test="carNumLike !=null and carNumLike != ''">
+            and t.car_num like  concat('%',#{carNumLike},'%')
+        </if>
         <if test="carNums !=null">
             and t.car_num in
             <foreach collection="carNums" item="item" index="index" open="(" close=")" separator=",">

service-acct/src/main/java/com/java110/acct/api/AccountApi.java

@@ -0,0 +1,47 @@
+package com.java110.acct.api;
+
+import com.java110.acct.bmo.account.IGetAccountBMO;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName AccountApi
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2021/5/4 12:44
+ * @Version 1.0
+ * add by wuxw 2021/5/4
+ **/
+
+@RestController
+@RequestMapping(value = "/account")
+public class AccountApi {
+
+    @Autowired
+    private IGetAccountBMO getAccountBMOImpl;
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /account/queryAccount
+     * @path /app/account/queryAccount
+     */
+    @RequestMapping(value = "/queryAccount", method = RequestMethod.GET)
+    public ResponseEntity<String> queryAccount(@RequestHeader(value = "store-id", required = false) String storeId,
+                                                            @RequestParam(value = "page") int page,
+                                                            @RequestParam(value = "row") int row) {
+        AccountDto accountDto = new AccountDto();
+        accountDto.setPage(page);
+        accountDto.setRow(row);
+        accountDto.setObjId(storeId);
+        return getAccountBMOImpl.get(accountDto);
+    }
+}

service-acct/src/main/java/com/java110/acct/bmo/account/IGetAccountBMO.java

@@ -0,0 +1,18 @@
+package com.java110.acct.bmo.account;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDto;
+import org.springframework.http.ResponseEntity;
+
+public interface IGetAccountBMO {
+
+
+    /**
+     * 查询账户信息
+     * add by wuxw
+     * @param  accountDto
+     * @return
+     */
+    ResponseEntity<String> get(AccountDto accountDto);
+
+
+}

service-acct/src/main/java/com/java110/acct/bmo/account/impl/GetAccountBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.acct.bmo.account.impl;
+
+import com.java110.acct.bmo.account.IGetAccountBMO;
+import com.java110.dto.account.AccountDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getAccountBMOImpl")
+public class GetAccountBMOImpl implements IGetAccountBMO {
+
+    @Autowired
+    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
+    /**
+     * @param accountDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(AccountDto accountDto) {
+
+
+        int count = accountInnerServiceSMOImpl.queryAccountsCount(accountDto);
+
+        List<AccountDto> accountDtos = null;
+        if (count > 0) {
+            accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+        } else {
+            accountDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) accountDto.getRow()), count, accountDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}