任务

pcbms/src/main/java/com/hssx/pcbms/controller/GoodsNoController.java

@@ -30,7 +30,7 @@ public class GoodsNoController {
     /**
      * 上架/下架
      * 参数：
-     * 上架 id:设备id,goodsId:机架对应的id
+     * 上架 goodsId:设备id,frameId:机架对应的id
      * 下架 id:设备id
      *
      * @return
@@ -38,8 +38,8 @@ public class GoodsNoController {
     @ApiOperation(value = "资产基本信息修改", notes = "资产基本信息修改方法")
     @RequestMapping("/update")
     @ResponseBody
-    public HttpRespMsg updateInfo(GoodsNo goodsNo) {
-        HttpRespMsg msg = goodsNoService.updateInfo(goodsNo);
+    public HttpRespMsg updateInfo(Goods goods,@RequestParam(required = false) Integer frameId) {
+        HttpRespMsg msg = goodsNoService.updateInfo(goods,frameId);
         return msg;
     }
 

pcbms/src/main/java/com/hssx/pcbms/entity/GoodsNo.java

@@ -1,6 +1,5 @@
 package com.hssx.pcbms.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Value;
 import lombok.experimental.Accessors;
 
 /**
@@ -18,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-11-14
+ * @since 2019-11-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,7 +32,7 @@ public class GoodsNo extends Model<GoodsNo> {
     private Integer id;
 
     /**
-     * 模具编号/设备编号
+     * 模具编号(对于机柜和机柜设备无用)
      */
     @TableField("model_no")
     private String modelNo;
@@ -66,7 +64,7 @@ public class GoodsNo extends Model<GoodsNo> {
     /**
      * 基本信息表关联外键
      */
-    @TableField(value = "goods_id",updateStrategy = FieldStrategy.IGNORED)
+    @TableField("goods_id")
     private Integer goodsId;
 
     /**
@@ -87,24 +85,6 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("is_maintain")
     private Integer isMaintain;
 
-    /**
-     * 类型0-普通编号资产 1-机柜设备资产
-     */
-    @TableField("type")
-    private Integer type;
-
-    /**
-     * 设备名称
-     */
-    @TableField("device_name")
-    private String deviceName;
-
-    /**
-     * 设备型号
-     */
-    @TableField("device_model")
-    private String deviceModel;
-
     /**
      * 资产sn号
      */
@@ -117,12 +97,6 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("label_id")
     private String labelId;
 
-    /**
-     * 机架ID
-     */
-    @TableField(value = "rack_id",updateStrategy = FieldStrategy.IGNORED)
-    private String rackId;
-
     /**
      * 模块ID
      */
@@ -285,6 +259,48 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("alarm_level")
     private Integer alarmLevel;
 
+    /**
+     * 所属人id
+     */
+    @TableField("subordinate_user_id")
+    private Integer subordinateUserId;
+
+    /**
+     * 所属人姓名
+     */
+    @TableField("subordinate_user")
+    private String subordinateUser;
+
+    /**
+     * 所在楼层
+     */
+    @TableField("floor")
+    private String floor;
+
+    /**
+     * 所在房间
+     */
+    @TableField("room")
+    private String room;
+
+    /**
+     * 所在列
+     */
+    @TableField("column_place")
+    private String columnPlace;
+
+    /**
+     * 所在区域
+     */
+    @TableField("region")
+    private String region;
+
+    /**
+     * 是否已上架 0-未上架 1-已上架
+     */
+    @TableField("is_rack")
+    private Integer isRack;
+
 
     @Override
     protected Serializable pkVal() {

pcbms/src/main/java/com/hssx/pcbms/entity/RacksEquipment.java

@@ -0,0 +1,51 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RacksEquipment extends Model<RacksEquipment> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 机架设备关联表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 机架资产的goods_id
+     */
+    @TableField("rack_goods_id")
+    private Integer rackGoodsId;
+
+    /**
+     * 机架设备的goods_id
+     */
+    @TableField("equipment_goods_id")
+    private Integer equipmentGoodsId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/RacksEquipmentMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.RacksEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-18
+ */
+public interface RacksEquipmentMapper extends BaseMapper<RacksEquipment> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/GoodsNoService.java

@@ -1,5 +1,6 @@
 package com.hssx.pcbms.service;
 
+import com.hssx.pcbms.entity.Goods;
 import com.hssx.pcbms.entity.GoodsNo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.pcbms.util.HttpRespMsg;
@@ -14,5 +15,5 @@ import com.hssx.pcbms.util.HttpRespMsg;
  */
 public interface GoodsNoService extends IService<GoodsNo> {
 
-    HttpRespMsg updateInfo(GoodsNo goodsNo);
+    HttpRespMsg updateInfo(Goods goodsNo,Integer frameId);
 }

pcbms/src/main/java/com/hssx/pcbms/service/RacksEquipmentService.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.RacksEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-18
+ */
+public interface RacksEquipmentService extends IService<RacksEquipment> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsNoServiceImpl.java

@@ -1,14 +1,19 @@
 package com.hssx.pcbms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.pcbms.entity.Goods;
 import com.hssx.pcbms.entity.GoodsNo;
+import com.hssx.pcbms.entity.RacksEquipment;
 import com.hssx.pcbms.mapper.GoodsMapper;
 import com.hssx.pcbms.mapper.GoodsNoMapper;
+import com.hssx.pcbms.mapper.RacksEquipmentMapper;
 import com.hssx.pcbms.service.GoodsNoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -25,23 +30,31 @@ public class GoodsNoServiceImpl extends ServiceImpl<GoodsNoMapper, GoodsNo> impl
     private GoodsMapper goodsMapper;
     @Resource
     private GoodsNoMapper goodsNoMapper;
+    @Resource
+    private RacksEquipmentMapper racksEquipmentMapper;
 
     @Override
-    public HttpRespMsg updateInfo(GoodsNo goodsNo) {
+    public HttpRespMsg updateInfo(Goods goods,Integer frameId) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(null != goodsNo.getGoodsId()){
+        if(null != frameId){
             //上架
-            String rackId = goodsMapper.selectById(goodsNo.getGoodsId()).getRackId();
-            if(rackId != null){
-                goodsNo.setRackId(rackId);
-            }
+            RacksEquipment rackId = new RacksEquipment();
+            rackId.setRackGoodsId(frameId);
+            rackId.setEquipmentGoodsId(goods.getId());
+            racksEquipmentMapper.insert(rackId);
+            GoodsNo goodsNo = goodsNoMapper.selectOne(new QueryWrapper<GoodsNo>().eq("goods_id", goods.getId()));
+            goodsNo.setGroundingTime(LocalDateTime.now());
+            goodsNo.setIsRack(1);
             goodsNoMapper.updateById(goodsNo);
         }else{
             //下架
-            goodsNo.setRackId(null);
-            goodsNo.setGoodsId(null);
+            racksEquipmentMapper.delete(new QueryWrapper<RacksEquipment>().eq("equipment_goods_id",goods.getId()));
+            GoodsNo goodsNo = goodsNoMapper.selectOne(new QueryWrapper<GoodsNo>().eq("goods_id", goods.getId()));
+            goodsNo.setGroundingTime(LocalDateTime.now());
+            goodsNo.setIsRack(1);
             goodsNoMapper.updateById(goodsNo);
         }
         return msg;
     }
+
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -111,36 +111,36 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<GoodsVO> list = new ArrayList<>();
-        if(tagId != null){
-            if(tagId==-1){
-                //机柜列表
-                list = goodsMapper.getRackListBycondition(keyName, tagId, uid);
-                PageInfo<GoodsVO> info = new PageInfo<>(list);
-                msg.data = info;
-                return msg;
-            }else if(tagId==-2){
+//        if(tagId != null){
+//            if(tagId==-1){
+//                //机柜列表
+////                list = goodsMapper.getRackListBycondition(keyName, tagId, uid);
+////                PageInfo<GoodsVO> info = new PageInfo<>(list);
+////                msg.data = info;
+////                return msg;
+//            }else if(tagId==-2){
                 //设备列表
-                QueryWrapper<GoodsNo> qw = new QueryWrapper();
-                if(keyName!=null && !"".equals(keyName)){
-                    qw.eq("device_name",keyName);
-                }
-                List <GoodsNo> equipmentList = goodsNoMapper.selectList(qw.eq("type",1).select("id", "model_no", "state","indate", "goods_id"
-                        ,"user_id", "update_indate", "is_maintain", "type", " device_name", "device_model", "good_sn_no",
-                        "label_id", "rack_id", "model_id", "u_bit_num","current_state","alarm_level").orderByDesc("id"));
-                PageInfo<GoodsNo> info = new PageInfo<>(equipmentList);
-                msg.data = info;
-                return msg;
-            }else{
-                list = goodsMapper.getListBycondition(keyName, tagId, uid);
-                PageInfo<GoodsVO> info = new PageInfo<>(list);
-                msg.data = info;
-                return msg;
-            }
-        }else{
+//                QueryWrapper<GoodsNo> qw = new QueryWrapper();
+//                if(keyName!=null && !"".equals(keyName)){
+//                    qw.eq("device_name",keyName);
+//                }
+//                List <GoodsNo> equipmentList = goodsNoMapper.selectList(qw.eq("type",1).select("id", "model_no", "state","indate", "goods_id"
+//                        ,"user_id", "update_indate", "is_maintain", "type", " device_name", "device_model", "good_sn_no",
+//                        "label_id", "rack_id", "model_id", "u_bit_num","current_state","alarm_level").orderByDesc("id"));
+//                PageInfo<GoodsNo> info = new PageInfo<>(equipmentList);
+//                msg.data = info;
+//                return msg;
+//            }else{
+//                list = goodsMapper.getListBycondition(keyName, tagId, uid);
+//                PageInfo<GoodsVO> info = new PageInfo<>(list);
+//                msg.data = info;
+//                return msg;
+//            }
+//        }else{
             list = goodsMapper.getListBycondition(keyName, tagId, uid);
             PageInfo<GoodsVO> info = new PageInfo<>(list);
             msg.data = info;
-        }
+//        }
         return msg;
     }
 

pcbms/src/main/java/com/hssx/pcbms/service/impl/RacksEquipmentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.RacksEquipment;
+import com.hssx.pcbms.mapper.RacksEquipmentMapper;
+import com.hssx.pcbms.service.RacksEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-18
+ */
+@Service
+public class RacksEquipmentServiceImpl extends ServiceImpl<RacksEquipmentMapper, RacksEquipment> implements RacksEquipmentService {
+
+}

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("rack_data");
+        strategy.setInclude("goods_no");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

pcbms/src/main/resources/mapper/RacksEquipmentMapper.xml

@@ -0,0 +1,17 @@
+<?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.hssx.pcbms.mapper.RacksEquipmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.RacksEquipment">
+        <id column="id" property="id" />
+        <result column="rack_goods_id" property="rackGoodsId" />
+        <result column="equipment_goods_id" property="equipmentGoodsId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, rack_goods_id, equipment_goods_id
+    </sql>
+
+</mapper>