Merge branch 'dev' of depot-qinghai/depot-smart-storage-qinghai into master

src/main/java/com/chinaitop/depot/intelligent/basicData/mapper/UserInfoMapper.java

@@ -0,0 +1,18 @@
+package com.chinaitop.depot.intelligent.basicData.mapper;
+
+import com.chinaitop.depot.intelligent.basicData.model.UserInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-19
+ */
+@Mapper
+public interface UserInfoMapper extends BaseMapper<UserInfo> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/basicData/model/UserInfo.java

@@ -0,0 +1,171 @@
+package com.chinaitop.depot.intelligent.basicData.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户信息表
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("user_info")
+@ApiModel(value="UserInfo对象", description="用户信息表")
+public class UserInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户编号")
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    @ApiModelProperty(value = "用户名")
+    @TableField("username")
+    private String username;
+
+    @ApiModelProperty(value = "密码")
+    @TableField("password")
+    private String password;
+
+    @ApiModelProperty(value = "组织编号；org_info的ID；")
+    @TableField("org_id")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "真实姓名")
+    @TableField("real_name")
+    private String realName;
+
+    @ApiModelProperty(value = "性别")
+    @TableField("sex")
+    private Integer sex;
+
+    @ApiModelProperty(value = "固定电话")
+    @TableField("telphone")
+    private String telphone;
+
+    @ApiModelProperty(value = "手机号")
+    @TableField("mobile")
+    private String mobile;
+
+    @ApiModelProperty(value = "地址")
+    @TableField("address")
+    private String address;
+
+    @ApiModelProperty(value = "电子邮箱")
+    @TableField("email")
+    private String email;
+
+    @ApiModelProperty(value = "QQ号码")
+    @TableField("qq_number")
+    private String qqNumber;
+
+    @ApiModelProperty(value = "照片路径")
+    @TableField("img_url")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "电子签名")
+    @TableField("signature")
+    private String signature;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "录入员")
+    @TableField("create_user_id")
+    private Integer createUserId;
+
+    @ApiModelProperty(value = "最后修改时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "最后修改人")
+    @TableField("update_user_id")
+    private Integer updateUserId;
+
+    @ApiModelProperty(value = "状态")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "删除标记")
+    @TableField("del_flag")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "用户别名")
+    @TableField("user_alias")
+    private String userAlias;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("updatetime")
+    private Date updatetime;
+
+    @ApiModelProperty(value = "部门名称")
+    @TableField("bmmc")
+    private String bmmc;
+
+    @ApiModelProperty(value = "在岗状态")
+    @TableField("zgzt")
+    private String zgzt;
+
+    @ApiModelProperty(value = "离职日期")
+    @TableField("lzrq")
+    private Date lzrq;
+
+    @ApiModelProperty(value = "名族")
+    @TableField("mz")
+    private Integer mz;
+
+    @ApiModelProperty(value = "人员类别")
+    @TableField("rylb")
+    private Integer rylb;
+
+    @ApiModelProperty(value = "身份证号码")
+    @TableField("sfzhm")
+    private String sfzhm;
+
+    @ApiModelProperty(value = "政治面貌")
+    @TableField("zzmm")
+    private Integer zzmm;
+
+    @ApiModelProperty(value = "职称")
+    @TableField("zc")
+    private String zc;
+
+    @ApiModelProperty(value = "职务")
+    @TableField("zw")
+    private String zw;
+
+    @ApiModelProperty(value = "学历")
+    @TableField("xl")
+    private Integer xl;
+
+    @ApiModelProperty(value = "入职日期")
+    @TableField("rzrq")
+    private Date rzrq;
+
+    @ApiModelProperty(value = "岗位性质")
+    @TableField("gwxz")
+    private String gwxz;
+
+    @ApiModelProperty(value = "最高职称或职业资格时间")
+    @TableField("qdzgzchzyzgsj")
+    private Date qdzgzchzyzgsj;
+
+    @ApiModelProperty(value = "专业")
+    @TableField("zy")
+    private String zy;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/basicData/service/impl/TJctableServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaitop.depot.intelligent.basicData.mapper.OrgInfoMapper;
 import com.chinaitop.depot.intelligent.basicData.mapper.TJctableMapper;
+import com.chinaitop.depot.intelligent.basicData.mapper.UserInfoMapper;
 import com.chinaitop.depot.intelligent.basicData.model.OrgInfo;
 import com.chinaitop.depot.intelligent.basicData.model.TJctable;
+import com.chinaitop.depot.intelligent.basicData.model.UserInfo;
 import com.chinaitop.depot.intelligent.basicData.param.TJctablePageParam;
 import com.chinaitop.depot.intelligent.basicData.param.TJctableParam;
 import com.chinaitop.depot.intelligent.basicData.service.TJctableService;
@@ -18,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,7 +39,7 @@ public class TJctableServiceImpl extends ServiceImpl<TJctableMapper, TJctable> i
     private TJctableMapper tJctableMapper;
 
     @Autowired
-    private OrgInfoMapper orgInfoMapper;
+    private UserInfoMapper userInfoMapper;
 
     @Override
     public Page<TJctable> getList(TJctablePageParam pageParam) {
@@ -52,8 +55,10 @@ public class TJctableServiceImpl extends ServiceImpl<TJctableMapper, TJctable> i
         List<TJctable> tJctableList = tJctablePage.getRecords();
         if (CollectionUtils.isNotEmpty(tJctableList)) {
             for (TJctable tJctable : tJctableList) {
-                OrgInfo orgInfo = orgInfoMapper.selectById(tJctable.getOrgId());
-                tJctable.setOrgName(orgInfo.getOrgName());
+                UserInfo userInfo = userInfoMapper.selectById(tJctable.getUpdatePerson());
+                if (ObjectUtil.isNotEmpty(userInfo)) {
+                    tJctable.setUpdatePerson(userInfo.getRealName());
+                }
             }
         }
         return tJctablePage;
@@ -64,6 +69,7 @@ public class TJctableServiceImpl extends ServiceImpl<TJctableMapper, TJctable> i
         TJctable tJctable = new TJctable();
         BeanUtils.copyProperties(param, tJctable);
         tJctable.setId(UuidUtils.getCode());
+        tJctable.setUpdatetime(new Date());
         return tJctableMapper.insert(tJctable);
     }
 
@@ -72,6 +78,7 @@ public class TJctableServiceImpl extends ServiceImpl<TJctableMapper, TJctable> i
         TJctable tJctable = new TJctable();
         BeanUtils.copyProperties(param, tJctable);
 
+        tJctable.setUpdatetime(new Date());
         return tJctableMapper.updateById(tJctable);
     }
 

src/main/java/com/chinaitop/depot/intelligent/devData/mapper/TLqDataMapper.java

@@ -20,5 +20,5 @@ public interface TLqDataMapper extends BaseMapper<TLqData> {
 
     Map<String, Object> getKCSL(Map<String, Object> map);
 
-    BigDecimal selectUpTemp(Map<String, Object> tempSelect);
+    Float selectUpTemp(Map<String, Object> tempSelect);
 }

src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -96,7 +96,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 map.put("orgCode", lqData.getOrgCode());
             if (StringUtils.isNotEmpty(lqData.getStorehouseCode()))
                 map.put("storehouseCode", lqData.getStorehouseCode());
-            BigDecimal bigDecimal = tLqDataMapper.selectUpTemp(tempSelect);
+            Float bigDecimal = tLqDataMapper.selectUpTemp(tempSelect);
             if (ObjectUtils.isNotEmpty(bigDecimal)) {
                 float oldTemp = bigDecimal.floatValue();
                 float newTemp = lqData.getInTemp().floatValue();

src/main/resources/mapper/basicData/UserInfoMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.intelligent.basicData.mapper.UserInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.basicData.model.UserInfo">
+        <id column="user_id" property="userId" />
+        <result column="username" property="username" />
+        <result column="password" property="password" />
+        <result column="org_id" property="orgId" />
+        <result column="real_name" property="realName" />
+        <result column="sex" property="sex" />
+        <result column="telphone" property="telphone" />
+        <result column="mobile" property="mobile" />
+        <result column="address" property="address" />
+        <result column="email" property="email" />
+        <result column="qq_number" property="qqNumber" />
+        <result column="img_url" property="imgUrl" />
+        <result column="signature" property="signature" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_user_id" property="updateUserId" />
+        <result column="status" property="status" />
+        <result column="del_flag" property="delFlag" />
+        <result column="user_alias" property="userAlias" />
+        <result column="updatetime" property="updatetime" />
+        <result column="bmmc" property="bmmc" />
+        <result column="zgzt" property="zgzt" />
+        <result column="lzrq" property="lzrq" />
+        <result column="mz" property="mz" />
+        <result column="rylb" property="rylb" />
+        <result column="sfzhm" property="sfzhm" />
+        <result column="zzmm" property="zzmm" />
+        <result column="zc" property="zc" />
+        <result column="zw" property="zw" />
+        <result column="xl" property="xl" />
+        <result column="rzrq" property="rzrq" />
+        <result column="gwxz" property="gwxz" />
+        <result column="qdzgzchzyzgsj" property="qdzgzchzyzgsj" />
+        <result column="zy" property="zy" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        user_id, username, password, org_id, real_name, sex, telphone, mobile, address, email, qq_number, img_url, signature, create_time, create_user_id, update_time, update_user_id, status, del_flag, user_alias, updatetime, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, zw, xl, rzrq, gwxz, qdzgzchzyzgsj, zy
+    </sql>
+
+</mapper>