Merge branch 'master' of http://47.100.37.243:10080/wutt/lsappBms

pcbms/pom.xml

@@ -17,6 +17,19 @@
         <java.version>1.8</java.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>alimaven</id>
+            <name>aliyun maven</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </repository>
+        <repository>
+            <id>alimaven2</id>
+            <name>aliyun maven 2</name>
+            <url>http://maven.aliyun.com/nexus/content/repositories/central</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -3,8 +3,10 @@ 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.vo.GoodsVO;
+import com.hssx.pcbms.entity.vo.OperateRecordVO;
 import com.hssx.pcbms.service.GoodsService;
 import com.hssx.pcbms.util.FileUtil;
 import com.hssx.pcbms.util.HttpRespMsg;
@@ -101,7 +103,6 @@ public class GoodsController {
      * 资产列表
      * 参数：
      * name ：名称，tagId：标签id,keyName:关键字,pageNum:当前页，pageSize：每页多少条
-     *
      * @return
      */
     @ApiOperation(value = "资产列表", notes = "资产列表方法")
@@ -243,6 +244,35 @@ public class GoodsController {
         HttpRespMsg msg = goodsService.operateList(goods);
         return msg;
     }
+    /**
+     * 维护资产
+     * 参数：
+     * goodId:资产id
+     * ids:编号对应id的字符串 如:"1,2,3"
+     *
+     * @return
+     */
+    @ApiOperation(value = "维护资产", notes = "维护资产方法")
+    @RequestMapping("/maintain")
+    @ResponseBody
+    public HttpRespMsg maintain(OperateRecordVO operateRecordVO) {
+        HttpRespMsg msg = goodsService.maintain(operateRecordVO);
+        return msg;
+    }
+    /**
+     * 待维护资产列表
+     * 参数：
+     * id:资产id
+     *
+     * @return
+     */
+    @ApiOperation(value = "待维护资产列表", notes = "待维护资产列表方法")
+    @RequestMapping("/isMaintainList")
+    @ResponseBody
+    public HttpRespMsg isMaintainList(OperateRecordVO operateRecordVO) {
+        HttpRespMsg msg = goodsService.maintain(operateRecordVO);
+        return msg;
+    }
 
 }
 

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-30
+ * @since 2019-11-01
  */
 public class GoodsNo extends Model<GoodsNo> {
 
@@ -44,7 +44,7 @@ public class GoodsNo extends Model<GoodsNo> {
     private String suffixCode;
 
     /**
-     * 资产状态0-空闲 1-在用 2-维护 3-报废
+     * 资产状态0-空闲 1-在用 3-报废
      */
     @TableField("state")
     private Integer state;
@@ -73,6 +73,12 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("update_indate")
     private LocalDateTime updateIndate;
 
+    /**
+     * 待维护0-不需要，1-需要维护
+     */
+    @TableField("is_maintain")
+    private Integer isMaintain;
+
 
     public Integer getId() {
         return id;
@@ -146,6 +152,14 @@ public class GoodsNo extends Model<GoodsNo> {
         this.updateIndate = updateIndate;
     }
 
+    public Integer getIsMaintain() {
+        return isMaintain;
+    }
+
+    public void setIsMaintain(Integer isMaintain) {
+        this.isMaintain = isMaintain;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -163,6 +177,7 @@ public class GoodsNo extends Model<GoodsNo> {
         ", goodsId=" + goodsId +
         ", userId=" + userId +
         ", updateIndate=" + updateIndate +
+        ", isMaintain=" + isMaintain +
         "}";
     }
 }

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

@@ -0,0 +1,15 @@
+package com.hssx.pcbms.entity.vo;
+
+import com.hssx.pcbms.entity.OperateRecord;
+import lombok.Data;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 11 - 01 10:55
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class OperateRecordVO extends OperateRecord {
+    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.OperateRecordVO;
 import com.hssx.pcbms.util.HttpRespMsg;
 import com.hssx.pcbms.util.PageUtil;
 import org.springframework.web.multipart.MultipartFile;
@@ -41,4 +42,6 @@ public interface GoodsService extends IService<Goods> {
     HttpRespMsg goodsNoAdd(GoodsNo goodsNo,Integer count);
 
     HttpRespMsg distribute(GoodsNo goodsNo);
+
+    HttpRespMsg maintain(OperateRecordVO operateRecordVO);
 }

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

@@ -10,6 +10,7 @@ import com.hssx.pcbms.entity.OperateRecord;
 import com.hssx.pcbms.entity.User;
 import com.hssx.pcbms.entity.vo.GoodsNoVO;
 import com.hssx.pcbms.entity.vo.GoodsVO;
+import com.hssx.pcbms.entity.vo.OperateRecordVO;
 import com.hssx.pcbms.mapper.GoodsMapper;
 import com.hssx.pcbms.mapper.GoodsNoMapper;
 import com.hssx.pcbms.mapper.OperateRecordMapper;
@@ -17,7 +18,9 @@ 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.OperateRecordService;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.ListUtil;
 import com.hssx.pcbms.util.PageUtil;
 import com.hssx.pcbms.util.UploadFileToFileNameUtil;
 import org.springframework.beans.BeanUtils;
@@ -52,6 +55,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     private OperateRecordMapper operateRecordMapper;
     @Resource
     private UserMapper userMapper;
+    @Resource
+    private OperateRecordService operateRecordService;
 
     @Override
     public HttpRespMsg add(GoodsVO goodsVO) {
@@ -239,6 +244,27 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg maintain(OperateRecordVO operateRecordVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        OperateRecord operateRecord = new OperateRecord();
+        List<OperateRecord> 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);
+                operateRecords.add(operateRecord);
+            }
+            operateRecordService.saveBatch(operateRecords);
+            //将原来待维护的状态更新为正常
+            goodsNoMapper.update(null,new QueryWrapper<GoodsNo>().in("id",idList));
+        }else{
+            msg.setError("资产对应的编号id不存在");
+        }
+        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/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("operate_record");
+        strategy.setInclude("goods_no");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -38,16 +38,6 @@
         <collection property="goodsNos" select="selectGoodsNoByGoodsId" javaType="java.util.List" column="{goodId = id}"
                     ofType="com.hssx.pcbms.entity.GoodsNo">
         </collection>
-        <!--<collection property="goodsNos" ofType="com.hssx.pcbms.entity.GoodsNo">-->
-        <!--<id column="nid" property="id" />-->
-        <!--<result column="model_no" property="modelNo" />-->
-        <!--<result column="division_code" property="divisionCode" />-->
-        <!--<result column="suffix_code" property="suffixCode" />-->
-        <!--<result column="state" property="state" />-->
-        <!--<result column="indate" property="indate" />-->
-        <!--<result column="goods_id" property="goodsId" />-->
-        <!--<result column="user_id" property="userId" />-->
-        <!--</collection>-->
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -72,6 +62,7 @@
             <result column="goods_id" property="goodsId"/>
             <result column="user_id" property="userId"/>
             <result column="username" property="username"/>
+            <result column="is_maintain" property="isMaintain" />
         </collection>
     </resultMap>
     <select id="getListBycondition" resultMap="BaseResultMapVO">
@@ -91,7 +82,7 @@
     </select>
     <select id="selectGoodsNoByGoodsId" resultType="com.hssx.pcbms.entity.GoodsNo">
         select
-            id, model_no, state, indate, goods_id
+            id, model_no, state, indate, goods_id,is_maintain
         from
             goods_no
         where
@@ -101,7 +92,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.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain
         from
         goods g
         left join

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

@@ -13,11 +13,12 @@
         <result column="goods_id" property="goodsId" />
         <result column="user_id" property="userId" />
         <result column="update_indate" property="updateIndate" />
+        <result column="is_maintain" property="isMaintain" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, model_no, division_code, suffix_code, state, indate, goods_id, user_id, update_indate
+        id, model_no, division_code, suffix_code, state, indate, goods_id, user_id, update_indate, is_maintain
     </sql>
 
 </mapper>