feats

src/main/java/com/yunzhi/inte/controller/NoticeMessageController.java

@@ -59,43 +59,48 @@ public class NoticeMessageController extends BaseController {
         return ResponseBean.success(result);
     }
     
-    /** 
-     * 新增数据
-     *
-     * @param noticeMessage 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/noticeMessage")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody NoticeMessage noticeMessage) throws Exception {
-        noticeMessageService.save(noticeMessage);
-        return ResponseBean.success(noticeMessage);
-    }
+//    /**
+//     * 新增数据
+//     *
+//     * @param noticeMessage 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("新增数据")
+//    @PostMapping("/noticeMessage")
+//    public ResponseBean add(@ApiParam("对象实体") @RequestBody NoticeMessage noticeMessage) throws Exception {
+//        noticeMessageService.save(noticeMessage);
+//        return ResponseBean.success(noticeMessage);
+//    }
     
     /** 
      * 更新数据
      *
-     * @param noticeMessage 实例对象
+     * @param id 对象ID
      * @return 实例对象
      */
     @ApiOperation("更新数据")
-    @PutMapping("/noticeMessage/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody NoticeMessage noticeMessage,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+    @PutMapping("/noticeMessage/{id}/readed")
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+        NoticeMessage noticeMessage = noticeMessageService.getById(id);
+        if (null == noticeMessage) {
+            return ResponseBean.error("未找到消息内容");
+        }
+
+        noticeMessage.setIsReaded(true);
         noticeMessageService.updateById(noticeMessage);
         return ResponseBean.success(noticeMessage);
     }
     
-    /** 
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/noticeMessage/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        noticeMessageService.removeLogicById(id);
-        return ResponseBean.success("success");
-    }
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param id 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/noticeMessage/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+//        noticeMessageService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

src/main/java/com/yunzhi/inte/controller/PostsController.java

@@ -9,6 +9,7 @@ import com.yunzhi.inte.common.ResponseBean;
 
 import java.time.LocalDateTime;
 import java.util.List;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -17,8 +18,9 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.inte.entity.Posts;
 import com.yunzhi.inte.service.PostsService;
 
- /**
+/**
  * 信息发布表;(posts)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-10-16
  */
@@ -26,12 +28,12 @@ import com.yunzhi.inte.service.PostsService;
 @RestController
 @RequestMapping("/")
 public class PostsController extends BaseController {
-    
+
     @Autowired
     private PostsService postsService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -41,28 +43,30 @@ public class PostsController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(postsService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/posts")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) throws Exception {
+
         IPage<Posts> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<Posts> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<Posts> result = postsService.page(pg);
-        
+        QueryWrapper<Posts> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+
+        queryWrapper.orderByDesc("create_date");
+        IPage<Posts> result = postsService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param posts 实例对象
@@ -81,8 +85,8 @@ public class PostsController extends BaseController {
         postsService.save(posts);
         return ResponseBean.success(posts);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param posts 实例对象
@@ -91,15 +95,15 @@ public class PostsController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/posts/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody Posts posts,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
 
         posts.setId(id);
 
         postsService.updateById(posts);
         return ResponseBean.success(posts);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -107,7 +111,7 @@ public class PostsController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/posts/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
         postsService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/yunzhi/inte/controller/StoreController.java

@@ -7,6 +7,8 @@ import com.yunzhi.inte.common.*;
 
 import java.util.List;
 
+import com.yunzhi.inte.entity.StoreType;
+import com.yunzhi.inte.service.StoreTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,6 +32,9 @@ public class StoreController extends BaseController {
     @Autowired
     private StoreService storeService;
 
+    @Autowired
+    private StoreTypeService storeTypeService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -98,6 +103,17 @@ public class StoreController extends BaseController {
             return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        if (null == store.getTypeId()) {
+            return ResponseBean.error("未选择分类", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        StoreType storeType = storeTypeService.getById(store.getTypeId());
+        if (null == storeType) {
+            return ResponseBean.error("分类选择不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        store.setIsDish(storeType.getIsFood());
+        store.setIsDevice(storeType.getIsDevice());
         store.setStatus(Constants.STATUS_NORMAL);
         storeService.save(store);
         return ResponseBean.success(store);
@@ -118,6 +134,18 @@ public class StoreController extends BaseController {
             return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        if (null == store.getTypeId()) {
+            return ResponseBean.error("未选择分类", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        StoreType storeType = storeTypeService.getById(store.getTypeId());
+        if (null == storeType) {
+            return ResponseBean.error("分类选择不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        store.setIsDish(storeType.getIsFood());
+        store.setIsDevice(storeType.getIsDevice());
+
         store.setId(id);
         storeService.updateById(store);
         return ResponseBean.success(store);

src/main/java/com/yunzhi/inte/controller/StoreLogController.java

@@ -13,6 +13,7 @@ import java.util.List;
 
 import com.yunzhi.inte.entity.Store;
 import com.yunzhi.inte.entity.Users;
+import com.yunzhi.inte.service.NoticeMessageService;
 import com.yunzhi.inte.service.StoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,9 @@ public class StoreLogController extends BaseController {
     @Autowired
     private StoreService storeService;
 
+    @Autowired
+    private NoticeMessageService noticeMessageService;
+
 //    /**
 //     * 通过ID查询单条数据
 //     *
@@ -137,6 +141,10 @@ public class StoreLogController extends BaseController {
         Double amount = storeLog.getAmount();
         Double leftAmount = preAmount;
 
+        // 库存预警
+        boolean warn = false;
+        Double warnAmount = store.getWarnAmount() == null ? 1 : store.getWarnAmount();
+
         // 如果是盘点
         if ("fix".equals(storeLog.getOptType())) {
             if (amount < 0) {
@@ -144,6 +152,7 @@ public class StoreLogController extends BaseController {
             }
 
             leftAmount = amount;
+            warn = leftAmount <= warnAmount;
         } else {
             if ("out".equals(storeLog.getOptType())) {
                 // 如果是出库
@@ -153,6 +162,7 @@ public class StoreLogController extends BaseController {
             }
 
             leftAmount = amount + preAmount;
+            warn = leftAmount <= warnAmount;
 
             if (leftAmount < 0) {
                 return ResponseBean.error("库存不足", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -169,6 +179,10 @@ public class StoreLogController extends BaseController {
         store.setAmount(leftAmount);
         storeService.updateById(store);
 
+        if (warn) {
+            noticeMessageService.warnStore(store);
+        }
+
         return ResponseBean.success(storeLog);
     }
 //

src/main/java/com/yunzhi/inte/entity/NoticeMessage.java

@@ -5,41 +5,61 @@ import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
- /**
+/**
  * 消息表;
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-10-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "消息表",description = "")
+@ApiModel(value = "消息表", description = "")
 @TableName("notice_message")
-public class NoticeMessage implements Serializable,Cloneable{
-    /** 消息ID */
-    @ApiModelProperty(name = "消息ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
-    private Integer id ;
-    /** 消息内容 */
-    @ApiModelProperty(name = "消息内容",notes = "")
-    private String message ;
-    /** 对象类型 */
-    @ApiModelProperty(name = "对象类型",notes = "")
-    private String targetType ;
-    /** 对象ID */
-    @ApiModelProperty(name = "对象ID",notes = "")
-    private String targetId ;
-    /** 状态 */
-    @ApiModelProperty(name = "状态",notes = "")
-    private Integer status ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date createDate ;
+public class NoticeMessage implements Serializable, Cloneable {
+    /**
+     * 消息ID
+     */
+    @ApiModelProperty(name = "消息ID", notes = "")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 消息内容
+     */
+    @ApiModelProperty(name = "消息内容", notes = "")
+    private String message;
+    /**
+     * 对象类型
+     */
+    @ApiModelProperty(name = "对象类型", notes = "")
+    private String targetType;
+    /**
+     * 对象ID
+     */
+    @ApiModelProperty(name = "对象ID", notes = "")
+    private String targetId;
+
+    @ApiModelProperty(name = "是否已读", notes = "")
+    private Boolean isReaded;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(name = "状态", notes = "")
+    private Integer status;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private LocalDateTime createDate;
 
 }

src/main/java/com/yunzhi/inte/entity/Store.java

@@ -47,21 +47,30 @@ public class Store implements Serializable,Cloneable{
     @ExcelProperty(value = "库存量", index = 3)
     @ApiModelProperty(name = "库存量",notes = "")
     private Double amount ;
+
+    @ExcelIgnore
+    @ApiModelProperty(name = "预警库存",notes = "")
+    private Double warnAmount ;
+
     /** 单位 */
     @ExcelProperty(value = "单位", index = 1)
     @ApiModelProperty(name = "单位",notes = "")
     private String unit ;
 
-
     /** 是否食材 */
     @ExcelIgnore
     @ApiModelProperty(name = "是否食材",notes = "")
     private Integer isDish;
 
+    @ExcelIgnore
+    @ApiModelProperty(name = "是否设备",notes = "1是0否")
+    private Integer isDevice ;
+
     /** 状态 */
     @ExcelIgnore
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;
+
     /** 创建时间 */
     @ExcelIgnore
     @ApiModelProperty(name = "创建时间",notes = "")

src/main/java/com/yunzhi/inte/entity/StoreType.java

@@ -32,6 +32,9 @@ public class StoreType implements Serializable,Cloneable{
     /** 是否食材;1是0否 */
     @ApiModelProperty(name = "是否食材",notes = "1是0否")
     private Integer isFood ;
+    /** 是否食材;1是0否 */
+    @ApiModelProperty(name = "是否设备",notes = "1是0否")
+    private Integer isDevice ;
     /** 状态 */
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;

src/main/java/com/yunzhi/inte/service/NoticeMessageService.java

@@ -2,12 +2,14 @@ package com.yunzhi.inte.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.inte.entity.NoticeMessage;
+import com.yunzhi.inte.entity.Store;
 
- /**
+/**
  * 消息表;(notice_message)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-10-13
  */
 public interface NoticeMessageService extends IBaseService<NoticeMessage> {
-    
-}
+
+     void warnStore(Store store);
+ }

src/main/java/com/yunzhi/inte/service/impl/NoticeMessageServiceImpl.java

@@ -1,16 +1,39 @@
 package com.yunzhi.inte.service.impl;
 
+import com.yunzhi.inte.common.Constants;
+import com.yunzhi.inte.entity.Store;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.NoticeMessage;
 import com.yunzhi.inte.mapper.NoticeMessageMapper;
 import com.yunzhi.inte.service.NoticeMessageService;
- /**
+
+import java.time.LocalDateTime;
+
+/**
  * 消息表;(notice_message)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-10-13
  */
 @Service
 public class NoticeMessageServiceImpl extends BaseServiceImpl<NoticeMessageMapper, NoticeMessage> implements NoticeMessageService {
-    
+
+    @Override
+    @Async
+    public void warnStore(Store store) {
+        try {
+            NoticeMessage noticeMessage = new NoticeMessage();
+            noticeMessage.setMessage(String.format("物资【%s】库存不足, 请及时补仓", store.getName()));
+            noticeMessage.setTargetId(store.getId().toString());
+            noticeMessage.setTargetType("store");
+            noticeMessage.setIsReaded(false);
+            noticeMessage.setStatus(Constants.STATUS_NORMAL);
+            noticeMessage.setCreateDate(LocalDateTime.now());
+            save(noticeMessage);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/com/yunzhi/inte/service/impl/UsersServiceImpl.java

@@ -20,6 +20,7 @@ import java.util.List;
 
 /**
  * 用户表;(users)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2022-10-12
  */
@@ -30,108 +31,108 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
     UserRolesMapper userRolesMapper;
 
 
-      @Override
-      public Users login(LoginParm loginParm) throws Exception {
-          Users sysUser = baseMapper.getByLoginID(loginParm.getUserName());
-          if (null == sysUser) {
-              throw new Exception("用户名或者密码不正确");
-          }
-
-          boolean isRight = checkPassword(loginParm.getPassword(), sysUser.getPassword(), sysUser.getId().toString());
-          if (!isRight) {
-              throw new Exception("用户名或者密码不正确");
-          }
-
-          sysUser.setPassword(null);
-          return sysUser;
-      }
-
-     @Override
-     @Transactional(rollbackFor = Exception.class)
-     public boolean mergeData(Users users) throws Exception {
-         if (StringUtils.isEmpty(users.getName())) {
-             throw new Exception("采购计划名称不能为空");
-         }
-
-         LocalDateTime now = LocalDateTime.now();
-
-         // 用户表
-         Integer userId = users.getId();
-         if (null == userId) {
-             Users origin = getExistBy("name", users.getName(), false, true);
-             if (null != origin) {
-                 throw new Exception("名称重复");
-             }
-
-             if (!StringUtils.isEmpty(users.getPhone())) {
-                 Users origin2 = getExistBy("phone", users.getPhone(), false, true);
-                 if (null != origin2) {
-                     throw new Exception("手机号重复");
-                 }
-             }
-
-             if (null == users.getStatus()) {
-                 users.setStatus(Constants.STATUS_NORMAL);
-             }
-
-             users.setCreateDate(now);
-             save(users);
-             userId = users.getId();
-         } else {
-             Users origin = getByButNot("name", users.getName(), "id", userId, true);
-             if (null != origin) {
-                 throw new Exception("名称重复");
-             }
-
-             if (!StringUtils.isEmpty(users.getPhone())) {
-                 Users origin2 = getByButNot("phone", users.getPhone(), "id", userId, true);
-                 if (null != origin2) {
-                     throw new Exception("手机号重复");
-                 }
-             }
-
-             //
-             updateById(users);
-         }
-
-         // 如果密码不为空, 说明修改了密码
-         if (!StringUtils.isEmpty(users.getPassword())) {
-             users.setPassword(EncryptUtils.md5(users.getPassword(), users.getId().toString()));
-             updateById(users);
-         }
-
-         // 授权角色
-         List<Roles> rolesList = users.getRolesList();
-         if (null == rolesList || rolesList.size() == 0) {
-             userRolesMapper.deleteByMap(new HashMap<String, Object>(){{
-                 put("user_id", users.getId());
-             }});
-         } else {
-             List<Integer> idList = new ArrayList<>();
-             for (Roles role : rolesList) {
-                 UserRoles item = new UserRoles();
-                 item.setUserId(users.getId());
-                 item.setRoleId(role.getId());
-
-                 UserRoles exists = userRolesMapper.getByUserAndRole(users.getId(), role.getId());
-                 if (null != exists) {
-                     item.setId(exists.getId());
-                 } else {
-                     userRolesMapper.insert(item);
-                 }
-
-                 idList.add(item.getId());
-             }
-
-             // 去除垃圾数据
-             userRolesMapper.deleteNotIn(users.getId(), idList);
-         }
-
-         return true;
-     }
-
-     boolean checkPassword(String src, String targ, String salt) {
-         String newPass = EncryptUtils.md5(src, salt);
-         return targ.equals(newPass);
-     }
- }
+    @Override
+    public Users login(LoginParm loginParm) throws Exception {
+        Users sysUser = baseMapper.getByLoginID(loginParm.getUserName());
+        if (null == sysUser) {
+            throw new Exception("用户名或者密码不正确");
+        }
+
+        boolean isRight = checkPassword(loginParm.getPassword(), sysUser.getPassword(), sysUser.getId().toString());
+        if (!isRight) {
+            throw new Exception("用户名或者密码不正确");
+        }
+
+        sysUser.setPassword(null);
+        return sysUser;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean mergeData(Users users) throws Exception {
+        if (StringUtils.isEmpty(users.getName())) {
+            throw new Exception("采购计划名称不能为空");
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 用户表
+        Integer userId = users.getId();
+        if (null == userId) {
+            Users origin = getExistBy("name", users.getName(), false, true);
+            if (null != origin) {
+                throw new Exception("名称重复");
+            }
+
+            if (!StringUtils.isEmpty(users.getPhone())) {
+                Users origin2 = getExistBy("phone", users.getPhone(), false, true);
+                if (null != origin2) {
+                    throw new Exception("手机号重复");
+                }
+            }
+
+            if (null == users.getStatus()) {
+                users.setStatus(Constants.STATUS_NORMAL);
+            }
+
+            users.setCreateDate(now);
+            save(users);
+            userId = users.getId();
+        } else {
+            Users origin = getByButNot("name", users.getName(), "id", userId, true);
+            if (null != origin) {
+                throw new Exception("名称重复");
+            }
+
+            if (!StringUtils.isEmpty(users.getPhone())) {
+                Users origin2 = getByButNot("phone", users.getPhone(), "id", userId, true);
+                if (null != origin2) {
+                    throw new Exception("手机号重复");
+                }
+            }
+
+            //
+            updateById(users);
+        }
+
+        // 如果密码不为空, 说明修改了密码
+        if (!StringUtils.isEmpty(users.getPassword())) {
+            users.setPassword(EncryptUtils.md5(users.getPassword(), users.getId().toString()));
+            updateById(users);
+        }
+
+        // 授权角色
+        List<Roles> rolesList = users.getRolesList();
+        if (null == rolesList || rolesList.size() == 0) {
+            userRolesMapper.deleteByMap(new HashMap<String, Object>() {{
+                put("user_id", users.getId());
+            }});
+        } else {
+            List<Integer> idList = new ArrayList<>();
+            for (Roles role : rolesList) {
+                UserRoles item = new UserRoles();
+                item.setUserId(users.getId());
+                item.setRoleId(role.getId());
+
+                UserRoles exists = userRolesMapper.getByUserAndRole(users.getId(), role.getId());
+                if (null != exists) {
+                    item.setId(exists.getId());
+                } else {
+                    userRolesMapper.insert(item);
+                }
+
+                idList.add(item.getId());
+            }
+
+            // 去除垃圾数据
+            userRolesMapper.deleteNotIn(users.getId(), idList);
+        }
+
+        return true;
+    }
+
+    boolean checkPassword(String src, String targ, String salt) {
+        String newPass = EncryptUtils.md5(src, salt);
+        return targ.equals(newPass);
+    }
+}