添加文件上传通用接口

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

@@ -1,11 +1,9 @@
 package com.hssx.pcbms.controller;
 
 
-import com.hssx.pcbms.entity.Goods;
-import com.hssx.pcbms.entity.GoodsNo;
-import com.hssx.pcbms.entity.OperateRecord;
-import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.entity.*;
 import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.entity.vo.MaintainRecordVO;
 import com.hssx.pcbms.entity.vo.OperateRecordVO;
 import com.hssx.pcbms.service.GoodsService;
 import com.hssx.pcbms.util.FileUtil;
@@ -255,8 +253,8 @@ public class GoodsController {
     @ApiOperation(value = "维护资产", notes = "维护资产方法")
     @RequestMapping("/maintain")
     @ResponseBody
-    public HttpRespMsg maintain(OperateRecordVO operateRecordVO) {
-        HttpRespMsg msg = goodsService.maintain(operateRecordVO);
+    public HttpRespMsg maintain(MaintainRecordVO maintainRecordVO) {
+        HttpRespMsg msg = goodsService.maintain(maintainRecordVO);
         return msg;
     }
     /**
@@ -269,8 +267,8 @@ public class GoodsController {
     @ApiOperation(value = "待维护资产列表", notes = "待维护资产列表方法")
     @RequestMapping("/isMaintainList")
     @ResponseBody
-    public HttpRespMsg isMaintainList(OperateRecordVO operateRecordVO) {
-        HttpRespMsg msg = goodsService.maintain(operateRecordVO);
+    public HttpRespMsg isMaintainList(Goods goods) {
+        HttpRespMsg msg = goodsService.isMaintainList(goods);
         return msg;
     }
 

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

@@ -16,4 +16,5 @@ import java.util.List;
 public class GoodsNoVO extends GoodsNo {
     private List<OperateRecord> operateRecords;
     private String username;
+    private String phone;
 }

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

@@ -0,0 +1,15 @@
+package com.hssx.pcbms.entity.vo;
+
+import com.hssx.pcbms.entity.MaintainRecord;
+import lombok.Data;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 11 - 01 15:05
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class MaintainRecordVO extends MaintainRecord {
+    private String ids;
+}

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

@@ -4,6 +4,7 @@ import com.hssx.pcbms.entity.Goods;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.pcbms.entity.GoodsNo;
 import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.entity.vo.MaintainRecordVO;
 import com.hssx.pcbms.entity.vo.OperateRecordVO;
 import com.hssx.pcbms.util.HttpRespMsg;
 import com.hssx.pcbms.util.PageUtil;
@@ -43,5 +44,7 @@ public interface GoodsService extends IService<Goods> {
 
     HttpRespMsg distribute(GoodsNo goodsNo);
 
-    HttpRespMsg maintain(OperateRecordVO operateRecordVO);
+    HttpRespMsg maintain(MaintainRecordVO maintainRecordVO);
+
+    HttpRespMsg isMaintainList(Goods goods);
 }

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

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.pcbms.constant.Constant;
-import com.hssx.pcbms.entity.Goods;
-import com.hssx.pcbms.entity.GoodsNo;
-import com.hssx.pcbms.entity.OperateRecord;
-import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.entity.*;
 import com.hssx.pcbms.entity.vo.GoodsNoVO;
 import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.entity.vo.MaintainRecordVO;
 import com.hssx.pcbms.entity.vo.OperateRecordVO;
 import com.hssx.pcbms.mapper.GoodsMapper;
 import com.hssx.pcbms.mapper.GoodsNoMapper;
@@ -18,6 +16,7 @@ import com.hssx.pcbms.mapper.UserMapper;
 import com.hssx.pcbms.service.GoodsNoService;
 import com.hssx.pcbms.service.GoodsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.pcbms.service.MaintainRecordService;
 import com.hssx.pcbms.service.OperateRecordService;
 import com.hssx.pcbms.util.HttpRespMsg;
 import com.hssx.pcbms.util.ListUtil;
@@ -57,6 +56,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     private UserMapper userMapper;
     @Resource
     private OperateRecordService operateRecordService;
+    @Resource
+    private MaintainRecordService maintainRecordService;
 
     @Override
     public HttpRespMsg add(GoodsVO goodsVO) {
@@ -245,26 +246,36 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public HttpRespMsg maintain(OperateRecordVO operateRecordVO) {
+    public HttpRespMsg maintain(MaintainRecordVO operateRecordVO) {
         HttpRespMsg msg = new HttpRespMsg();
-        OperateRecord operateRecord = new OperateRecord();
-        List<OperateRecord> operateRecords = new ArrayList<>();
+        MaintainRecord operateRecord = new MaintainRecord();
+        List<MaintainRecord> operateRecords = new ArrayList<>();
         if(null != operateRecordVO.getIds()){
             List<Integer> idList = ListUtil.convertIntegerIdsArrayToList(operateRecordVO.getIds());
             BeanUtils.copyProperties(operateRecordVO,operateRecord);
             for (Integer id : idList) {
-                operateRecord.setGoodNoId(id);
+                operateRecord.setGoodsNoId(id);
                 operateRecords.add(operateRecord);
             }
-            operateRecordService.saveBatch(operateRecords);
+            maintainRecordService.saveBatch(operateRecords);
             //将原来待维护的状态更新为正常
-            goodsNoMapper.update(null,new QueryWrapper<GoodsNo>().in("id",idList));
+            GoodsNo goodsNo = new GoodsNo();
+            goodsNo.setIsMaintain(0);
+            goodsNoMapper.update(goodsNo,new QueryWrapper<GoodsNo>().in("id",idList));
         }else{
             msg.setError("资产对应的编号id不存在");
         }
         return msg;
     }
 
+    @Override
+    public HttpRespMsg isMaintainList(Goods goods) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<GoodsNo> goodsNoList = goodsNoMapper.selectList(new QueryWrapper<GoodsNo>().eq("goods_id", goods.getId()).eq("is_maintain", 1));//1-需要保养
+        msg.data = goodsNoList;
+        return msg;
+    }
+
     public static void main(String[] args) {
 //        String format = String.format("%04d", 0);
 //        System.out.println(format);

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

@@ -26,10 +26,16 @@ public class GoodsTagsServiceImpl extends ServiceImpl<GoodsTagsMapper, GoodsTags
     @Override
     public HttpRespMsg add(GoodsTags goodsTags) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(null == goodsTags.getId()){
-            goodsTagsMapper.insert(goodsTags);
+        Integer count = goodsTagsMapper.selectCount(new QueryWrapper<GoodsTags>().eq("name", goodsTags.getName()));
+        if(count>0){
+            msg.setError("该分类标签已存在");
+            return msg;
         }else{
-            goodsTagsMapper.updateById(goodsTags);
+            if(null == goodsTags.getId()){
+                goodsTagsMapper.insert(goodsTags);
+            }else{
+                goodsTagsMapper.updateById(goodsTags);
+            }
         }
         return msg;
     }

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

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

@@ -63,6 +63,7 @@
             <result column="user_id" property="userId"/>
             <result column="username" property="username"/>
             <result column="is_maintain" property="isMaintain" />
+            <result column="phone" property="phone" />
         </collection>
     </resultMap>
     <select id="getListBycondition" resultMap="BaseResultMapVO">
@@ -92,7 +93,7 @@
         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.is_delete,gn.id nid,
-        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
+        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
         left join

pcbms/src/test/java/com/hssx/pcbms/PcbmsApplicationTests.java

@@ -1,13 +1,27 @@
 package com.hssx.pcbms;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.pcbms.entity.GoodsNo;
+import com.hssx.pcbms.mapper.GoodsNoMapper;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(SpringRunner.class)
 @SpringBootTest
 class PcbmsApplicationTests {
-
+@Resource
+private GoodsNoMapper goodsNoMapper;
     @Test
     void contextLoads() {
+        List<Integer> idList = Arrays.asList(31,32,33);
+        goodsNoMapper.update(null,new QueryWrapper<GoodsNo>().in("id",idList));
+        System.out.println("111");
     }
 
 }