增加使用次数及剩余次数

main
gaoshuguang 2 years ago
parent 155c1b6f52
commit 85cb15d764

@ -0,0 +1,56 @@
package com.nmgs.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
* @author: shuguang
* @date: 20240415 17:02
* @description:
*/
@Data
@TableName("wx_out_port")
public class WxOutPort {
@TableField("listno")
private String listno;
@TableField("areano")
private Integer areano;
@TableField("roadno")
private Integer roadno;
@TableField("stano")
private Integer stano;
@TableField("portno")
private Integer portno;
@TableField("manno")
private Integer manno;
@TableField("man")
private String man;
@TableField("classno")
private Integer classno;
@TableField("classdate")
private Date classdate;
@TableField("dt")
private Date dt;
@TableField("type")
private Integer type;
@TableField("atype")
private Integer atype;
@TableField("acarno")
private String acarno;
@TableField("carcount")
private String carcount;
@TableField("cash")
private String cash;
@TableField("freetype")
private String freetype;
@TableField("roadname")
private String roadname;
@TableField("staname")
private String staname;
}

@ -0,0 +1,14 @@
package com.nmgs.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nmgs.entity.WxOutPort;
import org.apache.ibatis.annotations.Mapper;
/**
* @author: shuguang
* @date: 20240415 17:07
* @description:
*/
@Mapper
public interface WxOutPortMapper extends BaseMapper<WxOutPort> {
}

@ -1,9 +1,12 @@
package com.nmgs.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper;
import com.nmgs.entity.WxVehicleBind;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
/**
* @author: shuguang
* @date: 20231027 14:43
@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface WxVehicleBindMapper extends MPJBaseMapper<WxVehicleBind> {
Page<Map<String, Object>> selectMyPage(Page<Map<String, Object>> page, String vehicleid, Integer vehiclecolor);
}

@ -3,4 +3,53 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nmgs.mapper.WxVehicleBindMapper">
<select id="selectMyPage" resultType="java.util.Map">
SELECT
t.vehicleid,
t.vehiclecolor,
t.vehicletype,
t.phoneNumber,
t.freetype,
t.freeStartTime,
t.freeEndTime,
t.freeTimes,
t.ImagesID,
t.adduserid,
t.adduser,
t.vehicleNotes,
t.freesta,
t.advancefee,
t.checkcode,
t.backup2,
t.backup3,
t.backup4,
t.backup5,
t.iscomplete,
t4.wxid,
t4.applyType,
t4.managerWXID,
t4.TEXT,
t1.TEXT AS platecolorname,
t2.TEXT AS typename,
t3.TEXT AS freetypename,
( SELECT count(*) AS applyTimes FROM wx_out_port t5 WHERE t5.acarno = t.vehicleid AND t5.atype = t.vehiclecolor ) applyTimes
FROM
wx_vehiclebind t
LEFT JOIN atype_text t1 ON ( t1.VALUE = t.vehiclecolor )
LEFT JOIN TYPE_TEXT t2 ON ( t2.VALUE = t.vehicletype )
LEFT JOIN wx_freetype_text t3 ON ( t3.VALUE = t.freetype )
LEFT JOIN wx_unbindapply t4 ON ( t4.vehicleid = t.vehicleid AND t4.vehiclecolor = t.vehiclecolor )
<where>
1=1
<if test="vehicleid != null and vehicleid != ''">
AND t.vehicleid='${vehicleid}'
</if>
<if test="vehiclecolor != null and vehiclecolor != ''">
AND t.vehiclecolor=${vehiclecolor}
</if>
</where>
ORDER BY
t.freeStartTime DESC
</select>
</mapper>

@ -11,6 +11,7 @@ import com.nmgs.entity.FreeTypeText;
import com.nmgs.entity.TypeText;
import com.nmgs.entity.VehicleImages;
import com.nmgs.entity.VehicleWxBind;
import com.nmgs.entity.WxOutPort;
import com.nmgs.entity.WxUnBindApply;
import com.nmgs.entity.WxVehicleBind;
import com.nmgs.entity.WxVehicleWxData;
@ -19,6 +20,7 @@ import com.nmgs.mapper.FreeTypeTextMapper;
import com.nmgs.mapper.TypeTextMapper;
import com.nmgs.mapper.VehicleImagesMapper;
import com.nmgs.mapper.VehicleWxBindMapper;
import com.nmgs.mapper.WxOutPortMapper;
import com.nmgs.mapper.WxUnBindApplyMapper;
import com.nmgs.mapper.WxVehicleBindMapper;
import com.nmgs.mapper.WxVehicleWxDataMapper;
@ -64,6 +66,8 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
private WxUnBindApplyMapper wxUnBindApplyMapper;
@Resource
private VehicleWxBindMapper vehicleWxBindMapper;
@Resource
private WxOutPortMapper wxOutPortMapper;
/**
*
@ -79,45 +83,72 @@ public class WxVehicleBindServiceImpl implements WxVehicleBindService {
log.info("[uuid:{}]-开始根据参数{}分页查询数据", uuid, map);
int pageNum = (int) map.get("pageNum");
int pageSize = (int) map.get("pageSize");
IPage<Map> mapIPage = new Page<>();
//IPage<Map> mapIPage = new Page<>();
Page<Map<String, Object>> page = new Page<>(pageNum, pageSize);
try {
Page<WxVehicleBind> page = new Page<>(pageNum, pageSize);
MPJLambdaWrapper<Map> mpjLambdaWrapper = new MPJLambdaWrapper();
mpjLambdaWrapper
.selectAll(WxVehicleBind.class)
.select(WxUnBindApply::getWxid, WxUnBindApply::getApplyType, WxUnBindApply::getManagerWXID,WxUnBindApply::getText)
.selectAs(ATtypeText::getText, "platecolorname")
.selectAs(TypeText::getText, "typename")
.selectAs(FreeTypeText::getText, "freetypename")
//.selectAll(WxVehicleWxData.class)
.leftJoin(ATtypeText.class, ATtypeText::getValue, WxVehicleBind::getVehiclecolor)
.leftJoin(TypeText.class, TypeText::getValue, WxVehicleBind::getVehicletype)
.leftJoin(FreeTypeText.class, FreeTypeText::getValue, WxVehicleBind::getFreetype)
.leftJoin(WxUnBindApply.class, on -> on
.eq(WxUnBindApply::getVehicleid, WxVehicleBind::getVehicleid)
.eq(WxUnBindApply::getVehiclecolor, WxVehicleBind::getVehiclecolor))
//.leftJoin(WxUnBindApply.class, WxUnBindApply::getVehicleid, WxVehicleBind::getVehicleid)
//.leftJoin(WxUnBindApply.class, WxUnBindApply::getVehiclecolor, WxVehicleBind::getVehiclecolor)
//.leftJoin(WxVehicleWxData.class, WxVehicleWxData::getWxid, WxUnBindApply::getWxid)
.orderByDesc(WxVehicleBind::getFreeStartTime);
String vehicleid=null;
Integer vehiclecolor=null;
if (ObjectUtils.isNotEmpty(map.get("vehicleid"))) {
mpjLambdaWrapper.like(WxVehicleBind::getVehicleid, map.get("vehicleid"));
vehicleid= (String) map.get("vehicleid");
}
if (ObjectUtils.isNotEmpty(map.get("vehiclecolor"))) {
mpjLambdaWrapper.eq(WxVehicleBind::getVehiclecolor, map.get("vehiclecolor"));
vehiclecolor= (Integer) map.get("vehiclecolor");
}
mapIPage = wxVehicleBindMapper.selectJoinPage(page, Map.class, mpjLambdaWrapper);
page = wxVehicleBindMapper.selectMyPage(page, vehicleid, vehiclecolor);
//Page<WxVehicleBind> page = new Page<>(pageNum, pageSize);
////wxVehicleBindMapper.selectMyPage();
//
//
//MPJLambdaWrapper<Map> mpjLambdaWrapper = new MPJLambdaWrapper();
//mpjLambdaWrapper
// .selectAll(WxVehicleBind.class)
// .select(WxUnBindApply::getWxid, WxUnBindApply::getApplyType, WxUnBindApply::getManagerWXID,WxUnBindApply::getText)
// .selectAs(ATtypeText::getText, "platecolorname")
// .selectAs(TypeText::getText, "typename")
// .selectAs(FreeTypeText::getText, "freetypename")
// .apply("SELECT count(*) AS applyTimes FROM wx_out_port t5 WHERE t5.acarno = t.vehicleid AND t5.atype = t.vehiclecolor","applyTimes")
// //.selectAll(WxVehicleWxData.class)
// .leftJoin(ATtypeText.class, ATtypeText::getValue, WxVehicleBind::getVehiclecolor)
// .leftJoin(TypeText.class, TypeText::getValue, WxVehicleBind::getVehicletype)
// .leftJoin(FreeTypeText.class, FreeTypeText::getValue, WxVehicleBind::getFreetype)
//
//
// .leftJoin(WxUnBindApply.class, on -> on
// .eq(WxUnBindApply::getVehicleid, WxVehicleBind::getVehicleid)
// .eq(WxUnBindApply::getVehiclecolor, WxVehicleBind::getVehiclecolor))
//
//
// //.innerJoin(WxOutPort.class, on -> on
// // .eq(WxOutPort::getAcarno, WxVehicleBind::getVehicleid)
// // .eq(WxOutPort::getAtype, WxVehicleBind::getVehiclecolor)).selectCount(WxOutPort::getAcarno,"applyTimes")
//
// //.apply("select count(*) as applyTimes from wx_out_port t5 where acarno='{0}'" ,WxVehicleBind::getVehicleid)
// //.apply("atype={1}" ,WxVehicleBind::getVehicleid,WxVehicleBind::getVehiclecolor)
//
// //.leftJoin(
// // WxOutPort.class, on -> on
// // .eq(WxOutPort::getAcarno, WxVehicleBind::getVehicleid)
// // .eq(WxOutPort::getAtype, WxVehicleBind::getVehiclecolor)).selectCount(WxOutPort::getAcarno,"applyTimes")
//
// //.leftJoin(WxUnBindApply.class, WxUnBindApply::getVehicleid, WxVehicleBind::getVehicleid)
// //.leftJoin(WxUnBindApply.class, WxUnBindApply::getVehiclecolor, WxVehicleBind::getVehiclecolor)
// //.leftJoin(WxVehicleWxData.class, WxVehicleWxData::getWxid, WxUnBindApply::getWxid)
// .orderByDesc(WxVehicleBind::getFreeStartTime);
//
//if (ObjectUtils.isNotEmpty(map.get("vehicleid"))) {
// mpjLambdaWrapper.like(WxVehicleBind::getVehicleid, map.get("vehicleid"));
//}
//if (ObjectUtils.isNotEmpty(map.get("vehiclecolor"))) {
// mpjLambdaWrapper.eq(WxVehicleBind::getVehiclecolor, map.get("vehiclecolor"));
//}
//
//
//mapIPage = wxVehicleBindMapper.selectJoinPage(page, Map.class, mpjLambdaWrapper);
} catch (Exception e) {
e.printStackTrace();
}
log.info("[uuid:{}]-根据参数{}分页查询数据条数为:{}", uuid, map, mapIPage.getTotal());
return mapIPage;
log.info("[uuid:{}]-根据参数{}分页查询数据条数为:{}", uuid, map, page.getTotal());
return page;
}
/**

@ -1,3 +1,4 @@
序号 日期 版本号 说明
1 2023年11月27日 1.0.0 初始版本号
2 2023年11月29日 1.0.1 增加微信解绑申请操作
3 2024年04月16日 1.0.2 增加使用次数及剩余次数

@ -1,9 +0,0 @@
Manifest-Version: 1.0
Created-By: IntelliJ IDEA
Built-By: shuguang
Build-Jdk: version 1.8.0_121
Implementation-Title: FreeCarRegistration
Implementation-Version: 0.0.1-SNAPSHOT
Implementation-Vendor-Id: com.nmgs
Main-Class: ${start-class}

@ -3,4 +3,53 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nmgs.mapper.WxVehicleBindMapper">
<select id="selectMyPage" resultType="java.util.Map">
SELECT
t.vehicleid,
t.vehiclecolor,
t.vehicletype,
t.phoneNumber,
t.freetype,
t.freeStartTime,
t.freeEndTime,
t.freeTimes,
t.ImagesID,
t.adduserid,
t.adduser,
t.vehicleNotes,
t.freesta,
t.advancefee,
t.checkcode,
t.backup2,
t.backup3,
t.backup4,
t.backup5,
t.iscomplete,
t4.wxid,
t4.applyType,
t4.managerWXID,
t4.TEXT,
t1.TEXT AS platecolorname,
t2.TEXT AS typename,
t3.TEXT AS freetypename,
( SELECT count(*) AS applyTimes FROM wx_out_port t5 WHERE t5.acarno = t.vehicleid AND t5.atype = t.vehiclecolor ) applyTimes
FROM
wx_vehiclebind t
LEFT JOIN atype_text t1 ON ( t1.VALUE = t.vehiclecolor )
LEFT JOIN TYPE_TEXT t2 ON ( t2.VALUE = t.vehicletype )
LEFT JOIN wx_freetype_text t3 ON ( t3.VALUE = t.freetype )
LEFT JOIN wx_unbindapply t4 ON ( t4.vehicleid = t.vehicleid AND t4.vehiclecolor = t.vehiclecolor )
<where>
1=1
<if test="vehicleid != null and vehicleid != ''">
AND t.vehicleid='${vehicleid}'
</if>
<if test="vehiclecolor != null and vehiclecolor != ''">
AND t.vehiclecolor=${vehiclecolor}
</if>
</where>
ORDER BY
t.freeStartTime DESC
</select>
</mapper>

@ -1,3 +1,4 @@
序号 日期 版本号 说明
1 2023年11月27日 1.0.0 初始版本号
2 2023年11月29日 1.0.1 增加微信解绑申请操作
3 2024年04月16日 1.0.2 增加使用次数及剩余次数

@ -3,4 +3,53 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nmgs.mapper.WxVehicleBindMapper">
<select id="selectMyPage" resultType="java.util.Map">
SELECT
t.vehicleid,
t.vehiclecolor,
t.vehicletype,
t.phoneNumber,
t.freetype,
t.freeStartTime,
t.freeEndTime,
t.freeTimes,
t.ImagesID,
t.adduserid,
t.adduser,
t.vehicleNotes,
t.freesta,
t.advancefee,
t.checkcode,
t.backup2,
t.backup3,
t.backup4,
t.backup5,
t.iscomplete,
t4.wxid,
t4.applyType,
t4.managerWXID,
t4.TEXT,
t1.TEXT AS platecolorname,
t2.TEXT AS typename,
t3.TEXT AS freetypename,
( SELECT count(*) AS applyTimes FROM wx_out_port t5 WHERE t5.acarno = t.vehicleid AND t5.atype = t.vehiclecolor ) applyTimes
FROM
wx_vehiclebind t
LEFT JOIN atype_text t1 ON ( t1.VALUE = t.vehiclecolor )
LEFT JOIN TYPE_TEXT t2 ON ( t2.VALUE = t.vehicletype )
LEFT JOIN wx_freetype_text t3 ON ( t3.VALUE = t.freetype )
LEFT JOIN wx_unbindapply t4 ON ( t4.vehicleid = t.vehicleid AND t4.vehiclecolor = t.vehiclecolor )
<where>
1=1
<if test="vehicleid != null and vehicleid != ''">
AND t.vehicleid='${vehicleid}'
</if>
<if test="vehiclecolor != null and vehiclecolor != ''">
AND t.vehiclecolor=${vehiclecolor}
</if>
</where>
ORDER BY
t.freeStartTime DESC
</select>
</mapper>

@ -1,3 +1,4 @@
序号 日期 版本号 说明
1 2023年11月27日 1.0.0 初始版本号
2 2023年11月29日 1.0.1 增加微信解绑申请操作
3 2024年04月16日 1.0.2 增加使用次数及剩余次数

@ -5,6 +5,7 @@ com\nmgs\entity\WxVehicleBind.class
com\nmgs\mapper\ATtypeTextMapper.class
com\nmgs\config\ThreadPoolConfig.class
com\nmgs\service\impl\WxVehicleBindServiceImpl.class
com\nmgs\mapper\WxOutPortMapper.class
com\nmgs\entity\VehicleImages.class
com\nmgs\MyEnvironmentPostProcessor.class
com\nmgs\controller\WxVehicleBindController.class
@ -31,6 +32,7 @@ com\nmgs\mapper\WxUnBindApplyMapper.class
com\nmgs\util\UuidUtil.class
com\nmgs\config\FilterConfig.class
com\nmgs\service\WxVehicleBindService.class
com\nmgs\entity\WxOutPort.class
com\nmgs\config\CorsConfig.class
com\nmgs\entity\TypeText.class
com\nmgs\util\PlateRegexutil.class

@ -26,10 +26,12 @@ D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\n
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\config\MybatisConfig.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\mapper\WxUnBindApplyMapper.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\VehicleImages.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\WxOutPort.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\util\CRCUtil.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\mapper\WxVehicleBindMapper.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\util\PathUtil.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\entity\ATtypeText.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\mapper\WxOutPortMapper.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\config\FilterConfig.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\config\Constant.java
D:\myproject\git\GLT-FreeCarRegistration\FreeCarRegistration\src\main\java\com\nmgs\util\PagesUtils.java

@ -65,6 +65,8 @@
<el-table-column prop="freeStartTime" label="免费开始时间" align="center" width="180"></el-table-column>
<el-table-column prop="freeEndTime" label="免费结束时间" align="center" width="180"></el-table-column>
<el-table-column prop="freeTimes" label="免费次数" align="center" width="100" :formatter="transforFreeTimes"></el-table-column>
<el-table-column prop="applyTimes" label="使用次数" align="center" width="100" ></el-table-column>
<el-table-column prop="surplusTimes" label="剩余次数" align="center" width="100" :formatter="transforSurplusTimes" ></el-table-column>
<el-table-column prop="adduserid" label="添加人ID" align="center"></el-table-column>
<el-table-column prop="adduser" label="添加人" align="center"></el-table-column>
<el-table-column prop="freesta" label="免费站" align="center" :formatter="transforSta"
@ -818,6 +820,15 @@ export default {
}
}
},
transforSurplusTimes(row) {
console.log(row)
console.log(row.applyTimes)
if (row.freeTimes < 0) {
return '';
} else {
return row.freeTimes-row.applyTimes;
}
},
transforFreeTimes(row) {
if (row.freeTimes < 0) {
return '';

Loading…
Cancel
Save