资产的录入修改和列表

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

@@ -75,7 +75,7 @@ public class GoodsController {
     @ApiOperation(value = "商品列表", notes = "商品列表方法")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(PageUtil page,String keyName,Integer tagId) {
+    public HttpRespMsg list(PageUtil page,@RequestParam(required = false)String keyName,Integer tagId) {
         HttpRespMsg msg = goodsService.getList(page,keyName,tagId);
         return msg;
     }

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

@@ -1,9 +1,18 @@
 package com.hssx.pcbms.controller;
 
 
+import com.hssx.pcbms.entity.GoodsTags;
+import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.service.GoodsTagsService;
+import com.hssx.pcbms.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 /**
  * <p>
@@ -16,6 +25,35 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/goodstags")
 public class GoodsTagsController {
+    @Autowired
+    private GoodsTagsService goodsTagsService;
 
+    /**
+     * 标签的添加或修改
+     * 参数：
+     * name ：名称
+     * 修改需要传 id:标签id
+     * @return
+     */
+    @ApiOperation(value = "标签的添加或修改", notes = "标签的添加或修改方法")
+    @RequestMapping("/addOrUpdate")
+    @ResponseBody
+    public HttpRespMsg adaddOrUpdated(GoodsTags goodsTags) {
+        HttpRespMsg msg = goodsTagsService.add(goodsTags);
+        return msg;
+    }
+
+    /**
+     * 标签的列表
+     * 参数:  keyName:关键字（非必传）
+     * @return
+     */
+    @ApiOperation(value = "标签的列表", notes = "标签的列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(@RequestParam(required = false)String keyName) {
+        HttpRespMsg msg = goodsTagsService.getListByKeyName(keyName);
+        return msg;
+    }
 }
 

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

@@ -5,6 +5,8 @@ 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;
 
 /**
@@ -41,6 +43,7 @@ public class GoodsNo extends Model<GoodsNo> {
      * 创建日期
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

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

@@ -5,6 +5,8 @@ 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;
 
 /**
@@ -35,6 +37,7 @@ public class GoodsTags extends Model<GoodsTags> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

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

@@ -5,6 +5,8 @@ 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;
 
 /**
@@ -41,6 +43,7 @@ public class OperaterRecord extends Model<OperaterRecord> {
      * 操作时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

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

@@ -5,6 +5,8 @@ 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;
 
 /**
@@ -59,6 +61,7 @@ public class User extends Model<User> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

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

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service;
 
 import com.hssx.pcbms.entity.GoodsTags;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface GoodsTagsService extends IService<GoodsTags> {
 
+    HttpRespMsg add(GoodsTags goodsTags);
+
+    HttpRespMsg getListByKeyName(String keyName);
 }

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

@@ -1,11 +1,16 @@
 package com.hssx.pcbms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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 com.hssx.pcbms.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +21,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class GoodsTagsServiceImpl extends ServiceImpl<GoodsTagsMapper, GoodsTags> implements GoodsTagsService {
+    @Resource
+    private GoodsTagsMapper goodsTagsMapper;
+    @Override
+    public HttpRespMsg add(GoodsTags goodsTags) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if(null == goodsTags.getId()){
+            goodsTagsMapper.insert(goodsTags);
+        }else{
+            goodsTagsMapper.updateById(goodsTags);
+        }
+        return msg;
+    }
 
+    @Override
+    public HttpRespMsg getListByKeyName(String keyName) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data =  goodsTagsMapper.selectList(new QueryWrapper<GoodsTags>().like("name", keyName));
+        return msg;
+    }
 }