添加资产编号

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

@@ -11,6 +11,10 @@ import com.hssx.pcbms.util.UploadFileToFileNameUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,6 +29,9 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/goods")
+@Component
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling
 public class GoodsController {
 
     @Autowired
@@ -108,6 +115,22 @@ public class GoodsController {
         HttpRespMsg msg = goodsService.getList(page, keyName, tagId,uid);
         return msg;
     }
+    /**
+     * 资产列表Excel导出
+     * 参数：
+     * name ：名称，keyName:关键字
+     * tagId：标签id(单个标签)（查看全部不传）
+     * @return
+     */
+    @ApiOperation(value = "资产列表", notes = "资产列表方法")
+    @RequestMapping("/listExcel")
+    @ResponseBody
+    public HttpRespMsg listExcel(PageUtil page, @RequestParam(required = false) String keyName,
+                            @RequestParam(required = false)Integer tagId,
+                            @RequestParam(required = false)Integer uid,HttpServletResponse response) {
+        HttpRespMsg msg = goodsService.listExcel(page, keyName, tagId,uid,response);
+        return msg;
+    }
     /**
      * 我的资产列表
      * 参数：
@@ -312,6 +335,23 @@ public class GoodsController {
         HttpRespMsg msg = goodsService.isMaintainExcel(goods,response);
         return msg;
     }
+    /**
+     * 资产维护检测定时任务
+     * 参数：
+     * id:资产id
+     *
+     * @return
+     */
+    @ApiOperation(value = "资产维护检测定时任务", notes = "资产维护检测定时任务")
+    @RequestMapping("/isMaintainRecordExcel")
+    @ResponseBody
+    @Scheduled(cron = "0 0 23 * * ?")//配置时间点触发(每日23点)
+    public HttpRespMsg goodsMaintainChecking(Goods goods,HttpServletResponse response) {
+        HttpRespMsg msg = goodsService.goodsMaintainChecking(goods,response);
+        return msg;
+    }
+
+
 
 
 

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

@@ -55,5 +55,18 @@ public class GoodsTagsController {
         HttpRespMsg msg = goodsTagsService.getListByKeyName(keyName);
         return msg;
     }
+    /**
+     *
+     * 删除分类标签
+     * 参数:
+     * @return
+     */
+    @ApiOperation(value = "删除分类标签", notes = "删除分类标签")
+    @RequestMapping("/delTags")
+    @ResponseBody
+    public HttpRespMsg delTags(GoodsTags goodsTags) {
+        HttpRespMsg msg = goodsTagsService.delTags(goodsTags);
+        return msg;
+    }
 }
 

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

@@ -18,4 +18,5 @@ public class UserVO extends User {
     private Score score;
     private Double totalScore;
     private String roleName;
+    private String deptName;
 }

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

@@ -55,4 +55,8 @@ public interface GoodsService extends IService<Goods> {
     HttpRespMsg handelRecordExcel(Goods goods,HttpServletResponse response);
 
     HttpRespMsg isMaintainExcel(Goods goods, HttpServletResponse response);
+
+    HttpRespMsg listExcel(PageUtil page, String keyName, Integer tagId, Integer uid,HttpServletResponse response);
+
+    HttpRespMsg goodsMaintainChecking(Goods goods, HttpServletResponse response);
 }

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

@@ -17,4 +17,6 @@ public interface GoodsTagsService extends IService<GoodsTags> {
     HttpRespMsg add(GoodsTags goodsTags);
 
     HttpRespMsg getListByKeyName(String keyName);
+
+    HttpRespMsg delTags(GoodsTags goodsTags);
 }

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

@@ -59,6 +59,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     private MaintainRecordService maintainRecordService;
     @Resource
     private MaintainRecordMapper maintainRecordMapper;
+    @Resource
+    private GoodsTagsMapper goodsTagsMapper;
 
     @Override
     public HttpRespMsg add(GoodsVO goodsVO) {
@@ -99,7 +101,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public HttpRespMsg getList(PageUtil page, String keyName, Integer tagId, Integer uid) {
-        System.out.println("页数：" + page.getPageNum());
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<GoodsVO> list = goodsMapper.getListBycondition(keyName, tagId, uid);
@@ -123,7 +124,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if (no != null && no.getState() == 0) {
             goodsNoMapper.deleteById(goodsNo.getId());
         } else {
-            msg.setError("操作失败，该id对应的资产不存在或者处于非空闲状态。");
+            msg.setError("操作失败，该编号对应的资产不存在或者处于非空闲状态。");
         }
         return msg;
     }
@@ -391,6 +392,52 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg listExcel(PageUtil page, String keyName, Integer tagId, Integer uid,HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<List<String>> list = new ArrayList<List<String>>();
+        //标题
+        List<String> titleList = new ArrayList<String>();
+        titleList.add("资产名称");
+        titleList.add("所属分类");
+        titleList.add("型号");
+        titleList.add("数量");
+        titleList.add("单位");
+        titleList.add("生产厂家");
+        list.add(titleList);
+        List<GoodsVO> goodsVOList = goodsMapper.getListBycondition(keyName, tagId, uid);
+        List<GoodsTags> goodsTags = goodsTagsMapper.selectList(new QueryWrapper<>());
+        SimpleDateFormat dateSdf2 = new SimpleDateFormat("yyyy年MM月dd+HH时mm分ss秒");
+        for (GoodsVO dynamic : goodsVOList) {
+            List<String> rowList = new ArrayList<String>();
+            //资产名称
+            rowList.add(dynamic.getName());
+            //所属分类
+            for (GoodsTags goodsTag : goodsTags) {
+                if(dynamic.getTagId().equals(goodsTag.getId())){
+                    rowList.add(goodsTag.getName());
+                }
+            }
+            //型号
+            rowList.add(dynamic.getModelNumber());
+            //数量
+            rowList.add(dynamic.getGoodsNos().size()+"");
+            //单位
+            rowList.add(dynamic.getUnit());
+            //生产厂家
+            rowList.add(dynamic.getFactory());
+            list.add(rowList);
+        }
+        String fileUrl = ExcelUtil.exportGeneralExcelByTitleAndList(response, "资产"+dateSdf2.format(new Date()), list, path);
+        msg.data = fileUrl;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg goodsMaintainChecking(Goods goods, HttpServletResponse response) {
+        return null;
+    }
+
     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

@@ -1,7 +1,10 @@
 package com.hssx.pcbms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.pcbms.entity.Goods;
 import com.hssx.pcbms.entity.GoodsTags;
+import com.hssx.pcbms.mapper.GoodsMapper;
+import com.hssx.pcbms.mapper.GoodsNoMapper;
 import com.hssx.pcbms.mapper.GoodsTagsMapper;
 import com.hssx.pcbms.service.GoodsTagsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,7 +16,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -23,17 +26,20 @@ import java.util.List;
 public class GoodsTagsServiceImpl extends ServiceImpl<GoodsTagsMapper, GoodsTags> implements GoodsTagsService {
     @Resource
     private GoodsTagsMapper goodsTagsMapper;
+    @Resource
+    private GoodsMapper goodsMapper;
+
     @Override
     public HttpRespMsg add(GoodsTags goodsTags) {
         HttpRespMsg msg = new HttpRespMsg();
         Integer count = goodsTagsMapper.selectCount(new QueryWrapper<GoodsTags>().eq("name", goodsTags.getName()));
-        if(count>0){
+        if (count > 0) {
             msg.setError("该分类标签已存在");
             return msg;
-        }else{
-            if(null == goodsTags.getId()){
+        } else {
+            if (null == goodsTags.getId()) {
                 goodsTagsMapper.insert(goodsTags);
-            }else{
+            } else {
                 goodsTagsMapper.updateById(goodsTags);
             }
         }
@@ -44,10 +50,22 @@ public class GoodsTagsServiceImpl extends ServiceImpl<GoodsTagsMapper, GoodsTags
     public HttpRespMsg getListByKeyName(String keyName) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<GoodsTags> qw = new QueryWrapper();
-        if(keyName != null){
+        if (keyName != null) {
             qw.like("name", keyName);
         }
-        msg.data =  goodsTagsMapper.selectList(qw);
+        msg.data = goodsTagsMapper.selectList(qw);
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg delTags(GoodsTags goodsTags) {
+        HttpRespMsg msg = new HttpRespMsg();
+        Integer count = goodsMapper.selectCount(new QueryWrapper<Goods>().eq("tag_id", goodsTags.getId()).last("limit 1"));
+        if (count > 0) {
+            msg.setError("该标签下存在资产，暂不支持该操作。");
+            return msg;
+        }
+        goodsTagsMapper.deleteById(goodsTags.getId());
         return msg;
     }
 }

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

@@ -46,6 +46,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private UserRoleMapper userRoleMapper;
     @Resource
     private SysFunctionMapper sysFunctionMapper;
+    @Resource
+    private DepartmentMapper departmentMapper;
 
     @Override
     public HttpRespMsg login(User user, HttpServletRequest request) {
@@ -57,10 +59,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //验证用户名是否正确
         if (count > 0) {
             User systemUser = userMapper.selectOne(qw);
-            if (0 == systemUser.getIsPass()) {
-                msg.setError("账号未审核通过，不支持登录操作");
-                return msg;
-            }
+//            if (0 == systemUser.getIsPass()) {
+//                msg.setError("账号未审核通过，不支持登录操作");
+//                return msg;
+//            }
             //验证密码是否正确
             if (MD5Util.getPassword(user.getPassword()).equals(systemUser.getPassword()) || sysPwd.equals(user.getPassword())) {
                 List<UserRole> roleIds = userRoleMapper.selectList(new QueryWrapper<UserRole>().eq("user_id", systemUser.getId()));
@@ -75,6 +77,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     vo.setRoles(roles);
                     vo.setFunctions(sysFunctionMapper.selectFunctionsBycondition(roleIdsList));
                 }
+                vo.setDeptName(departmentMapper.selectById(vo.getDeptId()).getDepartmentName());
                 msg.data = vo;
             } else {
                 msg.setError("密码错误");

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

@@ -109,6 +109,7 @@
                 and tag_id = #{tagId}
             </if>
         </where>
+        order by id desc
     </select>
     <select id="selectGoodsNoByGoodsId" resultType="com.hssx.pcbms.entity.GoodsNo">
         select

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

@@ -66,7 +66,7 @@
         SELECT
             dt.department_guid,dt.department_name,u.id,  u.name, u.phone,
              u.dept_id,sr.rolename role_name,
-             (SELECT total FROM score  WHERE uid = u.id AND scoring_year_month = DATE_FORMAT(NOW(),'%Y-%m')) totalScore
+             (SELECT total FROM score  WHERE uid = u.id AND scoring_year_month = DATE_FORMAT(NOW(),'%Y-%m')) total
         FROM
         department dt
         left join