任务

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

@@ -102,7 +102,7 @@ public class GoodsController {
      * 资产列表
      * 参数：
      * name ：名称，keyName:关键字,pageNum:当前页，pageSize：每页多少条
-     * tagId：标签id(单个标签)（查看全部不传）
+     * tagId：标签id(单个标签)（查看全部不传）-1（机柜） -2（设备）
      * @return
      */
     @ApiOperation(value = "资产列表", notes = "资产列表方法")
@@ -360,7 +360,7 @@ public class GoodsController {
     @ResponseBody
     public HttpRespMsg getRackList(Goods goods) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = goodsService.list(new QueryWrapper<Goods>().eq("good_type",1).eq("tags_id",-1).orderByDesc("indate"));
+        msg.data = goodsService.list(new QueryWrapper<Goods>().eq("good_type",1).eq("tags_id",-1).select("id","name","rack_id").orderByDesc("indate"));
         return msg;
     }
 

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

@@ -2,6 +2,7 @@ package com.hssx.pcbms.controller;
 
 
 import com.hssx.pcbms.entity.Goods;
+import com.hssx.pcbms.entity.GoodsNo;
 import com.hssx.pcbms.service.GoodsNoService;
 import com.hssx.pcbms.util.HttpRespMsg;
 import io.swagger.annotations.ApiOperation;
@@ -27,21 +28,20 @@ public class GoodsNoController {
 
 
     /**
-     * 资产基本信息修改
-     * 参数：id:资产信息id
-     * name ：名称，tagId：标签id,modelNumber：模具型号，company:公司
-     * ，address：地址，factory：生产厂家，pic：产品图片文件路径，serviceLife：服务期限（天）,
-     * nextIndate:下次维护日期（以上信息除了id外未修改的均不传）
+     * 上架/下架
+     * 参数：
+     * 上架 id:设备id,goodsId:机架对应的id
+     * 下架 id:设备id
      *
      * @return
      */
-//    @ApiOperation(value = "资产基本信息修改", notes = "资产基本信息修改方法")
-//    @RequestMapping("/update")
-//    @ResponseBody
-//    public HttpRespMsg updateInfo(Goods goods, @RequestParam(required = false) MultipartFile file) {
-//        HttpRespMsg msg = goodsService.updateInfo(goods, file);
-//        return msg;
-//    }
+    @ApiOperation(value = "资产基本信息修改", notes = "资产基本信息修改方法")
+    @RequestMapping("/update")
+    @ResponseBody
+    public HttpRespMsg updateInfo(GoodsNo goodsNo) {
+        HttpRespMsg msg = goodsNoService.updateInfo(goodsNo);
+        return msg;
+    }
 
 
 

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

@@ -48,7 +48,7 @@ public class InstitutionController {
     public HttpRespMsg list(PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
-        List<Institution> institutions = institutionService.list(new QueryWrapper<Institution>().select("id,title"));
+        List<Institution> institutions = institutionService.list(new QueryWrapper<Institution>().select("id","title"));
         PageInfo<Institution> info = new PageInfo<>(institutions);
         msg.data = info;
         return msg;

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

@@ -1,5 +1,6 @@
 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;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Value;
 import lombok.experimental.Accessors;
 
 /**
@@ -64,7 +66,7 @@ public class GoodsNo extends Model<GoodsNo> {
     /**
      * 基本信息表关联外键
      */
-    @TableField("goods_id")
+    @TableField(value = "goods_id",updateStrategy = FieldStrategy.IGNORED)
     private Integer goodsId;
 
     /**
@@ -118,7 +120,7 @@ public class GoodsNo extends Model<GoodsNo> {
     /**
      * 机架ID
      */
-    @TableField("rack_id")
+    @TableField(value = "rack_id",updateStrategy = FieldStrategy.IGNORED)
     private String rackId;
 
     /**
@@ -271,6 +273,18 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("first_use_time")
     private LocalDateTime firstUseTime;
 
+    /**
+     * 当前状态
+     */
+    @TableField("current_state")
+    private Integer currentState;
+
+    /**
+     * 告警级别
+     */
+    @TableField("alarm_level")
+    private Integer alarmLevel;
+
 
     @Override
     protected Serializable pkVal() {

pcbms/src/main/java/com/hssx/pcbms/entity/vo/GoodsVO.java

@@ -20,4 +20,7 @@ public class GoodsVO extends Goods {
     private List<GoodsNo> goodsNos;
     private List<GoodsNoVO> goodsNosVO;
     private Integer userId;
+    private String hum;
+    private String temp;
+    private Integer doorStatus;
 }

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

@@ -18,4 +18,6 @@ public interface GoodsMapper extends BaseMapper<Goods> {
     GoodsVO getDetail(@Param("id")Integer id);
 
     List<GoodsVO> selectMyList(@Param("start")Integer start, @Param("pageSize")Integer pageSize, @Param("uid")Integer uid);
+
+    List<GoodsVO> getRackListBycondition(@Param("keyName") String keyName, @Param("tagId") Integer tagId,@Param("uid")Integer uid);
 }

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

@@ -2,6 +2,9 @@ package com.hssx.pcbms.mapper;
 
 import com.hssx.pcbms.entity.GoodsNo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>

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

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service;
 
 import com.hssx.pcbms.entity.GoodsNo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface GoodsNoService extends IService<GoodsNo> {
 
+    HttpRespMsg updateInfo(GoodsNo goodsNo);
 }

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

@@ -1,11 +1,15 @@
 package com.hssx.pcbms.service.impl;
 
 import com.hssx.pcbms.entity.GoodsNo;
+import com.hssx.pcbms.mapper.GoodsMapper;
 import com.hssx.pcbms.mapper.GoodsNoMapper;
 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;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class GoodsNoServiceImpl extends ServiceImpl<GoodsNoMapper, GoodsNo> implements GoodsNoService {
 
+    @Resource
+    private GoodsMapper goodsMapper;
+    @Resource
+    private GoodsNoMapper goodsNoMapper;
+
+    @Override
+    public HttpRespMsg updateInfo(GoodsNo goodsNo) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(null != goodsNo.getGoodsId()){
+            //上架
+            String rackId = goodsMapper.selectById(goodsNo.getGoodsId()).getRackId();
+            if(rackId != null){
+                goodsNo.setRackId(rackId);
+            }
+            goodsNoMapper.updateById(goodsNo);
+        }else{
+            //下架
+            goodsNo.setRackId(null);
+            goodsNo.setGoodsId(null);
+            goodsNoMapper.updateById(goodsNo);
+        }
+        return msg;
+    }
 }

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

@@ -110,7 +110,24 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public HttpRespMsg getList(PageUtil page, String keyName, Integer tagId, Integer uid) {
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
-        List<GoodsVO> list = goodsMapper.getListBycondition(keyName, tagId, uid);
+        List<GoodsVO> list = new ArrayList<>();
+        if(tagId==-1){
+            //机柜列表
+            list = goodsMapper.getRackListBycondition(keyName, tagId, uid);
+        }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.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;
+        }else{
+            list = goodsMapper.getListBycondition(keyName, tagId, uid);
+        }
         PageInfo<GoodsVO> info = new PageInfo<>(list);
         msg.data = info;
         return msg;

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

@@ -32,6 +32,9 @@
     <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.GoodsVO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
+        <result column="temp" property="temp"/>
+        <result column="hum" property="hum"/>
+        <result column="door_status" property="doorStatus"/>
         <result column="tag_id" property="tagId"/>
         <result column="model_number" property="modelNumber"/>
         <result column="unit" property="unit"/>
@@ -119,7 +122,9 @@
     </select>
     <select id="selectGoodsNoByGoodsId" resultType="com.hssx.pcbms.entity.GoodsNo">
         select
-            id, model_no, state, indate, goods_id,is_maintain
+            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
         from
             goods_no
         where
@@ -163,4 +168,24 @@
         </if>
     </select>
 
+    <select id="getRackListBycondition" resultMap="BaseResultMapVO">
+        select
+        g.id, g.name, g.tag_id,rd.hum,rd.door_status,rd.temp,g.indate,
+        g.model_number, g.unit, g.address, g.factory, g.pic,
+        g.service_life, g.next_indate
+        from
+        goods g
+        left join rack_data rd
+        on g.id = rd.goods_id
+        <where>
+            is_delete = 0
+            <if test="keyName != null and keyName != ''">
+                and g.name like concat('%',#{keyName},'%')
+            </if>
+            <if test="tagId != null">
+                and g.tag_id = #{tagId}
+            </if>
+        </where>
+        order by g.indate desc
+    </select>
 </mapper>