头像上传

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

@@ -0,0 +1,50 @@
+package com.hssx.pcbms.controller;
+
+
+import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.service.GoodsService;
+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 javax.annotation.Resource;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@Controller
+@RequestMapping("/goods")
+public class GoodsController {
+
+    @Autowired
+    private GoodsService goodsService;
+
+    /**
+     * 商品录入
+     * 参数：phone 账号 password 密码 name 姓名 isPass:1 (注：创建管理员的账号时传，普通账号不传该字段)
+     * code 验证码
+     *
+     * @return
+     */
+    @ApiOperation(value = "商品录入", notes = "商品录入方法")
+    @RequestMapping("/add")
+    @ResponseBody
+    public HttpRespMsg add(GoodsVO goodsVO) {
+        HttpRespMsg msg = goodsService.add(goodsVO);
+        return msg;
+    }
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.hssx.pcbms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@RestController
+@RequestMapping("/goodstags")
+public class GoodsTagsController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.hssx.pcbms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@RestController
+@RequestMapping("/operater-record")
+public class OperaterRecordController {
+
+}
+

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

@@ -33,7 +33,7 @@ public class UserController {
 
     /**
      * 注册
-     * 参数：phone 账号 password 密码 name 姓名
+     * 参数：phone 账号 password 密码 name 姓名 isPass:1 (注：创建管理员的账号时传，普通账号不传该字段)
      * code 验证码
      *
      * @return

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

@@ -0,0 +1,212 @@
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+public class Goods extends Model<Goods> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 商品表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 分类标签id
+     */
+    @TableField("tag_id")
+    private Integer tagId;
+
+    /**
+     * 型号
+     */
+    @TableField("model_number")
+    private String modelNumber;
+
+    /**
+     * 单位（公司）
+     */
+    @TableField("company")
+    private String company;
+
+    /**
+     * 地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 生产厂家
+     */
+    @TableField("factory")
+    private String factory;
+
+    /**
+     * 图片
+     */
+    @TableField("pic")
+    private String pic;
+
+    /**
+     * 产品编号
+     */
+    @TableField("goods_no")
+    private String goodsNo;
+
+    /**
+     * 服务期限（天）
+     */
+    @TableField("service_life")
+    private Integer serviceLife;
+
+    /**
+     * 下次维护日期
+     */
+    @TableField("next_indate")
+    private String nextIndate;
+
+    /**
+     * 资产状态0-空闲 1-在用 2-维护 3-报废
+     */
+    @TableField("stage")
+    private Integer stage;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(Integer tagId) {
+        this.tagId = tagId;
+    }
+
+    public String getModelNumber() {
+        return modelNumber;
+    }
+
+    public void setModelNumber(String modelNumber) {
+        this.modelNumber = modelNumber;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getFactory() {
+        return factory;
+    }
+
+    public void setFactory(String factory) {
+        this.factory = factory;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+
+    public String getGoodsNo() {
+        return goodsNo;
+    }
+
+    public void setGoodsNo(String goodsNo) {
+        this.goodsNo = goodsNo;
+    }
+
+    public Integer getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(Integer serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getNextIndate() {
+        return nextIndate;
+    }
+
+    public void setNextIndate(String nextIndate) {
+        this.nextIndate = nextIndate;
+    }
+
+    public Integer getStage() {
+        return stage;
+    }
+
+    public void setStage(Integer stage) {
+        this.stage = stage;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Goods{" +
+        "id=" + id +
+        ", name=" + name +
+        ", tagId=" + tagId +
+        ", modelNumber=" + modelNumber +
+        ", company=" + company +
+        ", address=" + address +
+        ", factory=" + factory +
+        ", pic=" + pic +
+        ", goodsNo=" + goodsNo +
+        ", serviceLife=" + serviceLife +
+        ", nextIndate=" + nextIndate +
+        ", stage=" + stage +
+        "}";
+    }
+}

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

@@ -0,0 +1,78 @@
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+public class GoodsTags extends Model<GoodsTags> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 商品分类标签表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 标签名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsTags{" +
+        "id=" + id +
+        ", name=" + name +
+        ", indate=" + indate +
+        "}";
+    }
+}

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

@@ -0,0 +1,138 @@
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+public class OperaterRecord extends Model<OperaterRecord> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 处置/维护记录表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 操作人id
+     */
+    @TableField("user_id")
+    private Integer userId;
+
+    /**
+     * 操作人名字
+     */
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 操作时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 处理内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 商品id
+     */
+    @TableField("good_id")
+    private Integer goodId;
+
+    /**
+     * 商品编号
+     */
+    @TableField("good_no")
+    private String goodNo;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getGoodId() {
+        return goodId;
+    }
+
+    public void setGoodId(Integer goodId) {
+        this.goodId = goodId;
+    }
+
+    public String getGoodNo() {
+        return goodNo;
+    }
+
+    public void setGoodNo(String goodNo) {
+        this.goodNo = goodNo;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "OperaterRecord{" +
+        "id=" + id +
+        ", userId=" + userId +
+        ", userName=" + userName +
+        ", indate=" + indate +
+        ", content=" + content +
+        ", goodId=" + goodId +
+        ", goodNo=" + goodNo +
+        "}";
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.hssx.pcbms.entity.vo;
+
+import com.hssx.pcbms.entity.Goods;
+import lombok.Data;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 25 10:58
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class GoodsVO extends Goods {
+private Integer number;
+private String deptStr;
+private String goodStr;
+}

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.Goods;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.util.HttpRespMsg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+public interface GoodsService extends IService<Goods> {
+
+    HttpRespMsg add(GoodsVO goodsVO);
+}

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

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

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

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

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

@@ -0,0 +1,26 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.Goods;
+import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.mapper.GoodsMapper;
+import com.hssx.pcbms.service.GoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.pcbms.util.HttpRespMsg;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@Service
+public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
+
+    @Override
+    public HttpRespMsg add(GoodsVO goodsVO) {
+        return null;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.GoodsTags;
+import com.hssx.pcbms.mapper.GoodsTagsMapper;
+import com.hssx.pcbms.service.GoodsTagsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@Service
+public class GoodsTagsServiceImpl extends ServiceImpl<GoodsTagsMapper, GoodsTags> implements GoodsTagsService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.OperaterRecord;
+import com.hssx.pcbms.mapper.OperaterRecordMapper;
+import com.hssx.pcbms.service.OperaterRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@Service
+public class OperaterRecordServiceImpl extends ServiceImpl<OperaterRecordMapper, OperaterRecord> implements OperaterRecordService {
+
+}

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

@@ -204,8 +204,8 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-//        strategy.setInclude("user");
-        strategy.setExclude();//数据库表全生成
+        strategy.setInclude("goods","goods_tags","operater_record");
+//        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);
         //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉

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

@@ -0,0 +1,26 @@
+<?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.GoodsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.Goods">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="tag_id" property="tagId" />
+        <result column="model_number" property="modelNumber" />
+        <result column="company" property="company" />
+        <result column="address" property="address" />
+        <result column="factory" property="factory" />
+        <result column="pic" property="pic" />
+        <result column="goods_no" property="goodsNo" />
+        <result column="service_life" property="serviceLife" />
+        <result column="next_indate" property="nextIndate" />
+        <result column="stage" property="stage" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, tag_id, model_number, company, address, factory, pic, goods_no, service_life, next_indate, stage
+    </sql>
+
+</mapper>

pcbms/src/main/resources/mapper/GoodsTagsMapper.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.GoodsTagsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.GoodsTags">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, indate
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.OperaterRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.OperaterRecord">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="user_name" property="userName" />
+        <result column="indate" property="indate" />
+        <result column="content" property="content" />
+        <result column="good_id" property="goodId" />
+        <result column="good_no" property="goodNo" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, user_name, indate, content, good_id, good_no
+    </sql>
+
+</mapper>