From 8f36393f867149f1418652308a48ae5b01f20697 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 30 Aug 2024 12:21:34 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/bracelet/vo/BaseProject.java | 32 +++++++++++++---- .../common/entity/bracelet/vo/BraceletVo.java | 27 +++++++++++++++ .../common/entity/bracelet/vo/DeviceVo.java | 28 ++++++++++++++- .../entity/bracelet/vo/EngineeringVo.java | 28 +++++++++++++++ .../bonus/common/entity/bracelet/vo/GtVo.java | 27 +++++++++++++++ .../common/entity/bracelet/vo/ShboxVo.java | 34 +++++++++++++++++++ .../service/impl/BraceletServiceImpl.java | 16 +++++---- .../mapper/bracelet/BaseProjectMapper.xml | 17 ++++++---- .../mapper/bracelet/BraceletMapper.xml | 30 ++++++++++++---- .../mapper/bracelet/DeviceMapper.xml | 12 +++++-- .../mapper/bracelet/EngineeringMapper.xml | 28 +++++++++++---- 11 files changed, 244 insertions(+), 35 deletions(-) diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java index 37da646..2d1a225 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BaseProject.java @@ -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(); /** 是否删除 */ diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BraceletVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BraceletVo.java index 77c75aa..2d12c76 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BraceletVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BraceletVo.java @@ -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(); } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java index 7f7841c..931dfde 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java @@ -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(); } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EngineeringVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EngineeringVo.java index c17dea5..7bbf9e5 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EngineeringVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EngineeringVo.java @@ -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(); } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java index 1f31f25..f54a581 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java @@ -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(); + /** * 查询条件限制 */ diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java index 5498624..8f9dd22 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java @@ -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(); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java index e379992..3c76c22 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java @@ -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(); diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml index 35ddda1..0f4fe06 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml @@ -64,15 +64,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" head_name, contact_information, remarks, - create_user, - create_time,del_flag + create_time, + create_user, + update_time, + update_user, + del_flag )values( #{projectDepartName}, #{projectHeadName}, #{contactInformation}, #{remarks}, - #{createBy}, - sysdate(),0 + #{createTime}, + #{createUser}, + #{updateTime}, + #{updateUser}, + 0 ) @@ -83,8 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" head_name = #{projectHeadName}, contact_information = #{contactInformation}, remarks = #{remarks}, - update_user = #{updateBy}, - update_time = sysdate() + update_time = #{updateTime},update_user = #{updateUser} where id = #{projectId} diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml index 6de2504..163fe24 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml @@ -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} @@ -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} @@ -205,11 +205,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" box_id, sh_code, sh_status, + create_time, + create_user, + update_time, + update_user, del_flag )values( #{shboxId}, #{shCode}, #{shStatus}, + #{createTime}, + #{createUser}, + #{updateTime}, + #{updateUser}, 0 ) @@ -273,26 +281,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" box_name, box_code, box_capacity, - del_flag,create_time + create_time, + create_user, + update_time, + update_user, + del_flag )values( #{shboxName}, #{shboxCode}, #{shboxCapacity}, - 0,now() + #{createTime}, + #{createUser}, + #{updateTime}, + #{updateUser}, + 0 ) 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 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} @@ -329,7 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE tb_bracelet - SET box_id = #{shboxId},sh_status = 0 + SET box_id = #{shboxId},sh_status = 0,bid_time = now() where id = #{shId} diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml index 942e183..95b57dd 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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} @@ -101,12 +101,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dev_name, dev_code, dev_index, - dev_status,del_flag + create_time, + create_user, + update_time, + update_user, + dev_status,del_flag )values( #{deviceType}, #{deviceName}, #{deviceCode}, #{deviceIndex}, + #{createTime}, + #{createUser}, + #{updateTime}, + #{updateUser}, 1,0 ) diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml index 9cbbdc6..ff5987c 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml @@ -73,13 +73,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pro_id, lon, lat, - create_time,del_flag + create_time, + create_user, + update_time, + update_user, + del_flag )values( #{gtCode}, #{proId}, #{lon}, #{lat}, - now(),0 + #{createTime}, + #{createUser}, + #{updateTime}, + #{updateUser}, + 0 ) @@ -100,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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} @@ -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} where id = #{proId} @@ -165,7 +173,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yz_manage, sg_manage, jl_manage, - create_time,del_flag + create_time, + create_user, + update_time, + update_user, + del_flag )values( #{proName}, #{departName}, @@ -176,7 +188,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{yzManage}, #{sgManage}, #{jlManage}, - now(),0 + #{createTime}, + #{createUser}, + #{updateTime}, + #{updateUser}, + 0 )