公共字段添加

zd-common/zd-common-core/src/main/java/com/zd/common/core/web/domain/BaseBean.java

@@ -28,6 +28,18 @@ public class BaseBean implements Serializable {
     private Long id;
 
     /**
+     * 操作人Id -只读
+     */
+    @ApiModelProperty("操作人Id")
+    private Long userId;
+
+    /**
+     * 部门id -只读
+     */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
      * 创建者 -只读
      */
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
@@ -75,16 +87,18 @@ public class BaseBean implements Serializable {
     /**
      * 设置基本属性
      *
-     * @param userCode        用户编码
+     * @param userCode 用户编码
      */
-    public void setCommonValue(String userCode) {
+    public void setCommonValue(String userCode, Long userId, Long deptId) {
         Date currentDate = CalendarUtil.calendar().getTime();
         if (this.isNewRecord()) {
             this.setId(IdGen.snowflakeId());
             this.setNewRecord(true);
             this.createBy = userCode;
+            this.userId = userId;
+            this.deptId = deptId;
             this.createTime = currentDate;
-        }else {
+        } else {
             this.updateBy = userCode;
             this.updateTime = currentDate;
         }

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageOut.java

@@ -9,7 +9,6 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**
@@ -30,12 +29,6 @@ public class BottleStorageOut extends BaseBean{
     @ApiModelProperty("操作人")
     private String userName;
 
-    @ApiModelProperty("操作人Id")
-    private Long userId;
-
-    @ApiModelProperty("部门id")
-    private Long deptId;
-
     @ApiModelProperty("部门名称")
     private String deptName;
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -142,7 +142,8 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
                     .setAlarmTime(Calendar.getInstance().getTime())
                     .setMasterId(id)
                     .setType(1)
-                    .setProductType(1);
+                    .setProductType(1)
+                    .setDeptId(bottleStorage.getDeptId());
             return save(alarmRecord);
         }else {
             if (hardware!=null){

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/RfidTagServiceImpl.java

@@ -7,6 +7,7 @@ import com.zd.bottle.service.RfidTagService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.IdGen;
 import com.zd.common.security.service.TokenService;
+import com.zd.system.api.domain.SysUser;
 import com.zd.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
@@ -49,12 +50,17 @@ public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> impl
     @Override
     public RfidTag add(RfidTag rfidTag) {
         String username=null;
+        Long userId=null;
+        Long deptId=null;
         LoginUser loginUser = tokenService.getLoginUser();
         if (loginUser!=null){
             username=loginUser.getUsername();
+            SysUser sysUser = loginUser.getSysUser();
+            userId=sysUser.getUserId();
+            deptId=sysUser.getDeptId();
         }
         rfidTag.setAuthCode(generateShortUuid());
-        rfidTag.setCommonValue(username);
+        rfidTag.setCommonValue(username,userId,deptId);
         boolean save = save(rfidTag);
         if (save){
             return rfidTag;

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -26,6 +26,7 @@ import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.RemoteUserService;
+import com.zd.system.api.domain.SysUser;
 import com.zd.system.api.model.LoginUser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -153,9 +154,10 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         }
         //查询用户使用资格
         LoginUser user = userInfo.getData();
+        SysUser sysUser = user.getSysUser();
         Long storageId = recordDto.getStorageId();
         LambdaQueryWrapper<UsegasApply> queryWrapper = Wrappers.lambdaQuery(UsegasApply.class);
-        queryWrapper.eq(UsegasApply::getUserId, user.getSysUser().getUserId())
+        queryWrapper.eq(UsegasApply::getUserId, sysUser.getUserId())
                 .ge(UsegasApply::getEndTime, new Date())
                 //todo 气体ID待确认
                 .eq(UsegasApply::getUseGasName, recordDto.getBottleName())
@@ -174,8 +176,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             return result;
         }
 
-        recordDto.setContacts(user.getSysUser().getNickName())
-                .setPhone(user.getSysUser().getPhonenumber())
+        recordDto.setContacts(sysUser.getNickName())
+                .setPhone(sysUser.getPhonenumber())
                 .setUseTime(Calendar.getInstance().getTime());
         UseRecord useRecord = new UseRecord();
         BeanUtils.copyProperties(recordDto, useRecord);
@@ -201,8 +203,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             throw new ServiceException("入库数据异常");
         }
         //设置其他公共字段
-        useRecord.setUserId(user.getSysUser().getUserId());
-        useRecord.setCommonValue(user.getSysUser().getUserName());
+        useRecord.setUserId(sysUser.getUserId());
+        useRecord.setCommonValue(sysUser.getUserName(),sysUser.getUserId(),sysUser.getDeptId());
         if (save(useRecord)) {
             return result;
         }
@@ -211,6 +213,10 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
 
     @Override
     public Integer updateUseRecord(UseRecord useRecord) {
+        R<LoginUser> userInfo = userService.getUserInfo(SecurityUtils.getUsername(), SecurityConstants.INNER);
+        if (userInfo.getCode()!=HttpStatus.SUCCESS || userInfo.getData()==null){
+            throw new ServiceException("未登录或登录失效");
+        }
         Long storageId = useRecord.getStorageId();
         LambdaQueryWrapper<UseRecord> queryWrapper = Wrappers.lambdaQuery(UseRecord.class);
         queryWrapper.eq(UseRecord::getStorageId, storageId).isNull(UseRecord::getBackTime);
@@ -235,7 +241,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         storageService.updateById(storage);
 
         useRecord.setId(temp.getId());
-        useRecord.setCommonValue(SecurityUtils.getUsername());
+        SysUser sysUser = userInfo.getData().getSysUser();
+        useRecord.setCommonValue(sysUser.getUserName(),sysUser.getUserId(),sysUser.getDeptId());
         return baseMapper.updateById(useRecord);
     }
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/AlarmRecordMapper.xml

@@ -10,6 +10,8 @@
         <result column="type" property="type" />
         <result column="product_type" property="productType" />
         <result column="alarm_time" property="alarmTime" />
+        <result column="user_id" property="userId"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageErrorMapper.xml

@@ -13,6 +13,8 @@
         <result column="after_edit" property="afterEdit" />
         <result column="op_time" property="opTime" />
         <result column="phone" property="phone" />
+        <result column="user_id" property="userId"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/RfidTagMapper.xml

@@ -9,6 +9,8 @@
         <result column="auth_code" property="authCode" />
         <result column="tag_code" property="tagCode" />
         <result column="is_bind" property="isBind" />
+        <result column="user_id" property="userId"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UseRecordMapper.xml

@@ -28,7 +28,8 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="contacts" property="contacts" />
-        <result column="user_id" property="userId" />
+        <result column="user_id" property="userId"/>
+        <result column="dept_id" property="deptId"/>
         <result column="phone" property="phone" />
         <result column="subject_name" property="subjectName" />
         <result column="subject_id" property="subjectId" />

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasAuditRecordMapper.xml

@@ -12,6 +12,8 @@
         <result column="remark" property="remark" />
         <result column="usegas_apply_id" property="usegasApplyId" />
         <result column="audit_type" property="auditType" />
+        <result column="user_id" property="userId"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->