任务

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

@@ -1,6 +1,7 @@
 package com.hssx.pcbms.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.pcbms.entity.*;
 import com.hssx.pcbms.entity.vo.GoodsVO;
 import com.hssx.pcbms.entity.vo.MaintainRecordVO;
@@ -348,6 +349,22 @@ public class GoodsController {
     }
 
 
+    /**
+     * 给设备上下架的机架列表
+     * tagId:-1
+     * 参数：
+     * @return
+     */
+    @ApiOperation(value = "给设备上下架的机架列表", notes = "给设备上下架的机架列表")
+    @RequestMapping("/rackList")
+    @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"));
+        return msg;
+    }
+
+
 
 
 }

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

@@ -0,0 +1,49 @@
+package com.hssx.pcbms.controller;
+
+
+import com.hssx.pcbms.entity.Goods;
+import com.hssx.pcbms.service.GoodsNoService;
+import com.hssx.pcbms.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author 吴涛涛
+ * @since 2019-11-14
+ */
+@Controller
+@RequestMapping("/goodsno")
+public class GoodsNoController {
+
+    @Autowired
+    private GoodsNoService goodsNoService;
+
+
+    /**
+     * 资产基本信息修改
+     * 参数：id:资产信息id
+     * name ：名称，tagId：标签id,modelNumber：模具型号，company:公司
+     * ，address：地址，factory：生产厂家，pic：产品图片文件路径，serviceLife：服务期限（天）,
+     * nextIndate:下次维护日期（以上信息除了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;
+//    }
+
+
+
+}
+

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

@@ -3,8 +3,11 @@ 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 java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -15,7 +18,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-11-13
+ * @since 2019-11-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -120,6 +123,25 @@ public class Goods extends Model<Goods> {
     @TableField("rack_id")
     private String rackId;
 
+    /**
+     * 机柜对应ip，如：192.168.0.190
+     */
+    @TableField("rack_ip")
+    private String rackIp;
+
+    /**
+     * 机柜对应端口
+     */
+    @TableField("rack_port")
+    private String rackPort;
+
+    /**
+     * 录入时间
+     */
+    @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime indate;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * <p>
@@ -15,8 +16,11 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-11-01
+ * @since 2019-11-14
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
 public class GoodsNo extends Model<GoodsNo> {
 
     private static final long serialVersionUID=1L;
@@ -28,7 +32,7 @@ public class GoodsNo extends Model<GoodsNo> {
     private Integer id;
 
     /**
-     * 模具编号
+     * 模具编号/设备编号
      */
     @TableField("model_no")
     private String modelNo;
@@ -55,7 +59,6 @@ public class GoodsNo extends Model<GoodsNo> {
      * 创建日期
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -74,114 +77,204 @@ public class GoodsNo extends Model<GoodsNo> {
      * 最后更新日期
      */
     @TableField("update_indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateIndate;
 
     /**
-     * 待维护0-不需要，1-需要维护
+     * 维护:0-不需要，1-需要维护
      */
     @TableField("is_maintain")
     private Integer isMaintain;
 
+    /**
+     * 类型0-普通编号资产 1-机柜设备资产
+     */
+    @TableField("type")
+    private Integer type;
 
-    public Integer getId() {
-        return id;
-    }
+    /**
+     * 设备名称
+     */
+    @TableField("device_name")
+    private String deviceName;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    /**
+     * 设备型号
+     */
+    @TableField("device_model")
+    private String deviceModel;
 
-    public String getModelNo() {
-        return modelNo;
-    }
+    /**
+     * 资产sn号
+     */
+    @TableField("good_sn_no")
+    private String goodSnNo;
 
-    public void setModelNo(String modelNo) {
-        this.modelNo = modelNo;
-    }
+    /**
+     * 标签ID
+     */
+    @TableField("label_id")
+    private String labelId;
 
-    public String getDivisionCode() {
-        return divisionCode;
-    }
+    /**
+     * 机架ID
+     */
+    @TableField("rack_id")
+    private String rackId;
 
-    public void setDivisionCode(String divisionCode) {
-        this.divisionCode = divisionCode;
-    }
+    /**
+     * 模块ID
+     */
+    @TableField("model_id")
+    private String modelId;
 
-    public String getSuffixCode() {
-        return suffixCode;
-    }
+    /**
+     * u位号
+     */
+    @TableField("u_bit_num")
+    private String uBitNum;
 
-    public void setSuffixCode(String suffixCode) {
-        this.suffixCode = suffixCode;
-    }
+    /**
+     * 功率(W)
+     */
+    @TableField("power")
+    private Double power;
 
-    public Integer getState() {
-        return state;
-    }
+    /**
+     * 额定电流(A)
+     */
+    @TableField("rated_current")
+    private Double ratedCurrent;
 
-    public void setState(Integer state) {
-        this.state = state;
-    }
+    /**
+     * 额定电压(V)
+     */
+    @TableField("rated_voltage")
+    private Double ratedVoltage;
 
-    public LocalDateTime getIndate() {
-        return indate;
-    }
+    /**
+     * 序列号
+     */
+    @TableField("serial_number")
+    private String serialNumber;
 
-    public void setIndate(LocalDateTime indate) {
-        this.indate = indate;
-    }
+    /**
+     * 所属机构
+     */
+    @TableField("affiliate")
+    private String affiliate;
 
-    public Integer getGoodsId() {
-        return goodsId;
-    }
+    /**
+     * 类别
+     */
+    @TableField("device_category")
+    private String deviceCategory;
 
-    public void setGoodsId(Integer goodsId) {
-        this.goodsId = goodsId;
-    }
+    /**
+     * 库存编码
+     */
+    @TableField("stock")
+    private String stock;
 
-    public Integer getUserId() {
-        return userId;
-    }
+    /**
+     * 服务器重量(kg)
+     */
+    @TableField("server_weight")
+    private Double serverWeight;
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
+    /**
+     * 制造商
+     */
+    @TableField("manufacturer")
+    private String manufacturer;
 
-    public LocalDateTime getUpdateIndate() {
-        return updateIndate;
-    }
+    /**
+     * 供应商
+     */
+    @TableField("supplier")
+    private String supplier;
 
-    public void setUpdateIndate(LocalDateTime updateIndate) {
-        this.updateIndate = updateIndate;
-    }
+    /**
+     * 负责人id
+     */
+    @TableField("charger_id")
+    private Integer chargerId;
 
-    public Integer getIsMaintain() {
-        return isMaintain;
-    }
+    /**
+     * 负责人名字
+     */
+    @TableField("charger_name")
+    private String chargerName;
+
+    /**
+     * 维护周期
+     */
+    @TableField("maintain_clc")
+    private Integer maintainClc;
+
+    /**
+     * 维保联系方式
+     */
+    @TableField("maintenance_phone")
+    private String maintenancePhone;
+
+    /**
+     * 上次维护人id
+     */
+    @TableField("last_maintainer_id")
+    private Integer lastMaintainerId;
+
+    /**
+     * 上次维护人名字
+     */
+    @TableField("last_maintainer_name")
+    private String lastMaintainerName;
+
+    /**
+     * 下次维护人id
+     */
+    @TableField("next_maintainer_id")
+    private Integer nextMaintainerId;
+
+    /**
+     * 下次维护人名称
+     */
+    @TableField("next_maintainer_name")
+    private String nextMaintainerName;
+
+    /**
+     * 上次更新时间
+     */
+    @TableField("last_update_time")
+    private LocalDateTime lastUpdateTime;
+
+    /**
+     * 下次更新时间
+     */
+    @TableField("next_update_time")
+    private LocalDateTime nextUpdateTime;
+
+    /**
+     * 上架时间
+     */
+    @TableField("grounding_time")
+    private LocalDateTime groundingTime;
+
+    /**
+     * 下架时间
+     */
+    @TableField("undercarriage_time")
+    private LocalDateTime undercarriageTime;
+
+    /**
+     * 首次使用时间
+     */
+    @TableField("first_use_time")
+    private LocalDateTime firstUseTime;
 
-    public void setIsMaintain(Integer isMaintain) {
-        this.isMaintain = isMaintain;
-    }
 
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
 
-    @Override
-    public String toString() {
-        return "GoodsNo{" +
-        "id=" + id +
-        ", modelNo=" + modelNo +
-        ", divisionCode=" + divisionCode +
-        ", suffixCode=" + suffixCode +
-        ", state=" + state +
-        ", indate=" + indate +
-        ", goodsId=" + goodsId +
-        ", userId=" + userId +
-        ", updateIndate=" + updateIndate +
-        ", isMaintain=" + isMaintain +
-        "}";
-    }
 }

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

@@ -199,16 +199,19 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             if (task.getState() == 6) {
                 if (format.compareTo(task.getDelayTime()) >= 0) {
                     task.setState(7);
+                    taskMapper.updateById(task);
                     TaskDynamic taskDynamic = new TaskDynamic();
                     taskDynamic.setTaskState(7);//已失效
                     taskDynamic.setStateContent(Constant.ALREADY_INVALID);
                     taskDynamic.setTaskId(task.getId());
                     taskDynamic.setContent("[" + task.getName() + "] " + Constant.ALREADY_INVALID);
                     taskDynamicMapper.insert(taskDynamic);
+
                 }
             } else {
                 if (format.compareTo(task.getPlanTime()) >= 0) {
                     task.setState(7);
+                    taskMapper.updateById(task);
                     TaskDynamic taskDynamic = new TaskDynamic();
                     taskDynamic.setTaskState(7);//已失效
                     taskDynamic.setStateContent(Constant.ALREADY_INVALID);

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("goods");
+        strategy.setInclude("goods_no");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -20,13 +20,15 @@
         <result column="suffix_code" property="suffixCode" />
         <result column="good_type" property="goodType" />
         <result column="rack_id" property="rackId" />
+        <result column="rack_ip" property="rackIp" />
+        <result column="rack_port" property="rackPort" />
+        <result column="indate" property="indate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete, creator_id, division_code, suffix_code, good_type, rack_id
+        id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete, creator_id, division_code, suffix_code, good_type, rack_id, rack_ip, rack_port, indate
     </sql>
-
     <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.GoodsVO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -143,7 +145,7 @@
     <select id="selectMyList" resultMap="BaseResultMapMyList">
         select
         g.id, g.name, g.tag_id, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
-        g.is_delete,gn.id nid,
+        g.is_delete,gn.id nid,g.indate,
         gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone
         from
         goods g
@@ -155,6 +157,7 @@
         <where>
             AND gn.user_id = #{uid,jdbcType=INTEGER}
         </where>
+        order by g.indate desc
         <if test="start != null and pageSize != null">
             limit #{start,jdbcType=INTEGER} ,#{pageSize,jdbcType=INTEGER}
         </if>