haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
jjLv 2024-08-30 12:21:34 +08:00
parent fae81c60d8
commit 8f36393f86
11 changed files with 244 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java
View File

@ -4,11 +4,14 @@ import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.annotation.Excel.ColumnType;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.common.entity.file.ResourceFileVo;
import com.bonus.common.security.utils.SecurityUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.List;
/**
@ -41,13 +44,28 @@ public class BaseProject extends BaseEntity
@Excel(name = "备注")
private String remarks;
/** 创建人 */
@Excel(name = "创建人")
private String createBy;
/** 更新人 */
@Excel(name = "更新人")
private String updateBy;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date createTime = new Date();
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date updateTime = new Date();
/**
* 创建人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long createUser = SecurityUtils.getUserId();
/**
* 修改人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long updateUser = SecurityUtils.getUserId();
/** 是否删除 */

27
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BraceletVo.java
View File

@ -2,9 +2,14 @@ package com.bonus.common.entity.bracelet.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.annotation.Excel.ColumnType;
import com.bonus.common.security.utils.SecurityUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
/**
* 手环管理
*/
@ -53,4 +58,26 @@ public class BraceletVo
@Excel(name = "手环数组id")
private int[] shIds;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date createTime = new Date();
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date updateTime = new Date();
/**
* 创建人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long createUser = SecurityUtils.getUserId();
/**
* 修改人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long updateUser = SecurityUtils.getUserId();
}

28
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java
View File

@ -2,9 +2,14 @@ package com.bonus.common.entity.bracelet.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.annotation.Excel.ColumnType;
import com.bonus.common.security.utils.SecurityUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
@Api("DeviceVo")
@Data
@ -51,5 +56,26 @@ public class DeviceVo
@Excel(name = "领用人名称")
private String lyName;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date createTime = new Date();
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date updateTime = new Date();
/**
* 创建人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long createUser = SecurityUtils.getUserId();
/**
* 修改人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long updateUser = SecurityUtils.getUserId();
}

28
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EngineeringVo.java
View File

@ -1,9 +1,14 @@
package com.bonus.common.entity.bracelet.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.security.utils.SecurityUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
@Api("EngineeringVo")
@Data
@ -57,4 +62,27 @@ public class EngineeringVo
/** 杆塔数量 */
@Excel(name = "杆塔数量")
private int gtNum;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date createTime = new Date();
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date updateTime = new Date();
/**
* 创建人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long createUser = SecurityUtils.getUserId();
/**
* 修改人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long updateUser = SecurityUtils.getUserId();
}

27
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java
View File

@ -2,12 +2,16 @@ package com.bonus.common.entity.bracelet.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.annotation.Excel.ColumnType;
import com.bonus.common.security.utils.SecurityUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import java.util.Date;
/**
* 工程杆塔表 tb_project_power
@ -54,6 +58,29 @@ public class GtVo
@Pattern(regexp = "^-?([0-8]?\\d(\\.\\d{1,6})?|90(\\.0{1,6})?)$", message = "纬度范围不正确，或者小数点后尾数超过6位", groups = {GtVo.Query.class})
private String lat;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date createTime = new Date();
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date updateTime = new Date();
/**
* 创建人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long createUser = SecurityUtils.getUserId();
/**
* 修改人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long updateUser = SecurityUtils.getUserId();
/**
* 查询条件限制
*/

34
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java
View File

@ -2,9 +2,14 @@ package com.bonus.common.entity.bracelet.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.annotation.Excel.ColumnType;
import com.bonus.common.security.utils.SecurityUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.Date;
/**
* 手环箱
*/
@ -56,4 +61,33 @@ public class ShboxVo
/** 领用人名称 */
@Excel(name = "领用人名称")
private String lyName;
/**
* 手环绑定时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date bidTime;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date createTime = new Date();
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Date updateTime = new Date();
/**
* 创建人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long createUser = SecurityUtils.getUserId();
/**
* 修改人
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Long updateUser = SecurityUtils.getUserId();
}

16
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java
View File

@ -26,10 +26,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -398,13 +395,20 @@ public class BraceletServiceImpl implements IBraceletService {
@Transactional(rollbackFor = Exception.class)
public AjaxResult editSh(ShboxVo vo) {
try {
if(vo.getShboxBindNum()>=vo.getShboxCapacity()){
return AjaxResult.error("手环箱绑定数量已满，请重新选择");
if(vo.getShboxBindNum()!=null && vo.getShboxCapacity()!=null){
if(vo.getShboxBindNum()>=vo.getShboxCapacity()){
return AjaxResult.error("手环箱绑定数量已满，请重新选择");
}
}
BraceletVo result = braceletMapper.isCodeEditExist(vo);
if (result != null) {
return AjaxResult.error("手环编号已存在，请重新输入");
}
if(vo.getShboxId()!=0){
vo.setBidTime(new Date());
}else{
vo.setBidTime(null);
}
int num = braceletMapper.updateSh(vo);
if(num==1){
return AjaxResult.success();

17
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
View File

@ -64,15 +64,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectHeadName != null and projectHeadName != ''">head_name,</if>
<if test="contactInformation != null and contactInformation != ''">contact_information,</if>
<if test="remarks != null and remarks != ''">remarks,</if>
<if test="createBy != null and createBy != ''">create_user,</if>
create_time,del_flag
create_time,
create_user,
update_time,
update_user,
del_flag
)values(
<if test="projectDepartName != null and projectDepartName != ''">#{projectDepartName},</if>
<if test="projectHeadName != null and projectHeadName != ''">#{projectHeadName},</if>
<if test="contactInformation != null and contactInformation != ''">#{contactInformation},</if>
<if test="remarks != null and remarks != ''">#{remarks},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate(),0
#{createTime},
#{createUser},
#{updateTime},
#{updateUser},
0
)
</insert>
@ -83,8 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
head_name = #{projectHeadName},
contact_information = #{contactInformation},
remarks = #{remarks},
<if test="updateBy != null and updateBy != ''">update_user = #{updateBy},</if>
update_time = sysdate()
update_time = #{updateTime},update_user = #{updateUser}
</set>
where id = #{projectId}
</update>

30
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml
View File

@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UPDATE tb_bracelet tb
set
box_id = #{shboxId},
sh_status = #{shStatus},sh_code = #{shCode}
sh_status = #{shStatus},bid_time = #{bidTime},sh_code = #{shCode},update_time = #{updateTime},update_user = #{updateUser}
where id = #{shId}
</update>
@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UPDATE tb_sh_box
set
box_name = #{shboxName},
box_code = #{shboxCode},box_capacity = #{shboxCapacity}
box_code = #{shboxCode},box_capacity = #{shboxCapacity},update_time = #{updateTime},update_user = #{updateUser}
where id = #{shboxId}
</update>
@ -205,11 +205,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="shboxId != null">box_id,</if>
<if test="shCode != null and shCode != ''">sh_code,</if>
<if test="shStatus != null ">sh_status,</if>
create_time,
create_user,
update_time,
update_user,
del_flag
)values(
<if test=" shboxId != null">#{shboxId},</if>
<if test="shCode != null and shCode != ''">#{shCode},</if>
<if test="shStatus != null ">#{shStatus},</if>
#{createTime},
#{createUser},
#{updateTime},
#{updateUser},
0
)
</insert>
@ -273,26 +281,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="shboxName != null and shboxName != ''">box_name,</if>
<if test="shboxCode != null and shboxCode != ''">box_code,</if>
<if test="shboxCapacity != null ">box_capacity,</if>
del_flag,create_time
create_time,
create_user,
update_time,
update_user,
del_flag
)values(
<if test="shboxName != null and shboxName != ''">#{shboxName},</if>
<if test="shboxCode != null and shboxCode != ''">#{shboxCode},</if>
<if test="shboxCapacity != null ">#{shboxCapacity},</if>
0,now()
#{createTime},
#{createUser},
#{updateTime},
#{updateUser},
0
)
</insert>
<!--手环绑定选择页面绑定手环信息-->
<update id="addShBind">
UPDATE tb_bracelet
SET box_id = #{shboxId},bid_time = now(),sh_status = 0
SET box_id = #{shboxId},bid_time = now(),sh_status = 0,update_time = #{updateTime},update_user = #{updateUser}
where id = #{shId}
</update>
<!--解除绑定-->
<update id="delSh">
UPDATE tb_bracelet
SET box_id = null,sh_status = 1
SET box_id = null,sh_status = 1,bid_time = null,update_time = #{updateTime},update_user = #{updateUser}
where id = #{shId}
</update>
@ -329,7 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--绑定-->
<update id="bindSh">
UPDATE tb_bracelet
SET box_id = #{shboxId},sh_status = 0
SET box_id = #{shboxId},sh_status = 0,bid_time = now()
where id = #{shId}
</update>

12
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
View File

@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDevice">
UPDATE tb_device td
SET dev_type = #{deviceType},dev_name = #{deviceName},dev_code = #{deviceCode},dev_index = #{deviceIndex}
SET dev_type = #{deviceType},dev_name = #{deviceName},dev_code = #{deviceCode},dev_index = #{deviceIndex},update_time = #{updateTime},update_user = #{updateUser}
where id = #{deviceId}
</update>
@ -101,12 +101,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceName != null and deviceName != ''">dev_name,</if>
<if test="deviceCode != null and deviceCode != ''">dev_code,</if>
<if test="deviceIndex != null ">dev_index,</if>
dev_status,del_flag
create_time,
create_user,
update_time,
update_user,
dev_status,del_flag
)values(
<if test="deviceType != null and deviceType != ''">#{deviceType},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
<if test="deviceIndex != null ">#{deviceIndex},</if>
#{createTime},
#{createUser},
#{updateTime},
#{updateUser},
1,0
)
</insert>

28
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
View File

@ -73,13 +73,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="proId != null and proId != ''">pro_id,</if>
<if test="lon != null and lon != ''">lon,</if>
<if test="lat != null and lat != ''">lat,</if>
create_time,del_flag
create_time,
create_user,
update_time,
update_user,
del_flag
)values(
<if test="gtCode != null and gtCode != ''">#{gtCode},</if>
<if test="proId != null and proId != ''">#{proId},</if>
<if test="lon != null and lon != ''">#{lon},</if>
<if test="lat != null and lat != ''">#{lat},</if>
now(),0
#{createTime},
#{createUser},
#{updateTime},
#{updateUser},
0
)
</insert>
@ -100,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--修改杆塔信息-->
<update id="updateGt">
UPDATE tb_project_power tpp
SET power_name = #{gtCode},lon = #{lon},lat = #{lat},update_time = now()
SET power_name = #{gtCode},lon = #{lon},lat = #{lat},update_time = #{updateTime},update_user = #{updateUser}
where id = #{gtId}
</update>
@ -139,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
yz_manage = #{yzManage},
sg_manage = #{sgManage},
jl_manage = #{jlManage},
update_time = now()
update_time = #{updateTime},update_user = #{updateUser}
</set>
where id = #{proId}
</update>
@ -165,7 +173,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yzManage != null and yzManage != ''">yz_manage,</if>
<if test="sgManage != null and sgManage != ''">sg_manage,</if>
<if test="jlManage != null and jlManage != ''">jl_manage,</if>
create_time,del_flag
create_time,
create_user,
update_time,
update_user,
del_flag
)values(
<if test="proName != null and proName != ''"> #{proName},</if>
<if test="departName != null and departName != ''"> #{departName},</if>
@ -176,7 +188,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="yzManage != null and yzManage != ''"> #{yzManage},</if>
<if test="sgManage != null and sgManage != ''"> #{sgManage},</if>
<if test="jlManage != null and jlManage != ''"> #{jlManage},</if>
now(),0
#{createTime},
#{createUser},
#{updateTime},
#{updateUser},
0
)
</insert>