Merge remote-tracking branch 'origin/master'

cloud-model/src/main/java/com/hssx/cloudmodel/controller/VnoticeUserController.java

@@ -10,6 +10,7 @@ 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;
 
@@ -32,19 +33,28 @@ public class VnoticeUserController {
 
     /**
      * 消息通知列表
-     * 默认显示五条的参数：token 登陆者的用户凭证,flag = 0,(默认显示最近五条)
-     * 查看全部时传的参数：token 登陆者的用户凭证，flag = 0，pageNum 当前页码，pageSize 每页条数，
-     * （筛选字段：notice_type 0-审批，1-告警，2-保养）（默认不传）
+     * 默认显示五条的参数：token 登陆者的用户凭证,
+     * 查看全部时传的参数：token 登陆者的用户凭证，pageNum 当前页码，pageSize 每页条数，
      * @return
      */
     @ApiOperation("消息通知列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg deleteRole(HttpServletRequest request, String token,
+    public HttpRespMsg list(HttpServletRequest request, String token,
                                   HttpServletResponse response, PageUtil page, Integer flag) {
         HttpRespMsg msg = new HttpRespMsg();
         msg = vnoticeUserService.pageList(page, token);
         return msg;
     }
+
+    @ApiOperation("消息通知列表")
+    @RequestMapping("/read")
+    @ResponseBody
+    public HttpRespMsg read(@RequestParam Integer id,
+                                  HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = vnoticeUserService.read(id);
+        return msg;
+    }
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/VnoticeUserService.java

@@ -17,4 +17,6 @@ import com.hssx.cloudmodel.util.PageUtil;
 public interface VnoticeUserService extends IService<VnoticeUser> {
 
     HttpRespMsg pageList(PageUtil page, String token);
+
+    HttpRespMsg read(Integer id);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -2,13 +2,11 @@ package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.Company;
-import com.hssx.cloudmodel.entity.Factory;
-import com.hssx.cloudmodel.entity.LngLatCompany;
-import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.LngLatCompanyMapper;
+import com.hssx.cloudmodel.mapper.ProjectMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,6 +36,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     UserMapper userMapper;
     @Resource
     LngLatCompanyMapper lngLatCompanyMapper;
+    @Resource
+    ProjectMapper projectMapper;
 
     @Override
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag) {
@@ -126,7 +126,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             qw.eq("company_type", Constant.ASSETS_COMPANY);
         } else {
             //此时是项目经理创建其他用户
-
+//            projectMapper.selectList(new QueryWrapper<Project>().eq(""))
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
             qw.eq("company_type", Constant.PRODUCER_COMPANY).or().eq("id", admin.getCompanyId());
         }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/VnoticeUserServiceImpl.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.entity.NewsNotice;
+import com.hssx.cloudmodel.entity.NewsNoticeUser;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.VnoticeUser;
 import com.hssx.cloudmodel.entity.vo.NewsNoticeVO;
 import com.hssx.cloudmodel.mapper.NewsNoticeMapper;
+import com.hssx.cloudmodel.mapper.NewsNoticeUserMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
 import com.hssx.cloudmodel.mapper.VnoticeUserMapper;
 import com.hssx.cloudmodel.service.VnoticeUserService;
@@ -32,6 +34,10 @@ import java.util.List;
 public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, VnoticeUser> implements VnoticeUserService {
     @Resource
     VnoticeUserMapper vnoticeUserMapper;
+
+    @Resource
+    NewsNoticeUserMapper newsNoticeUserMapper;
+
     @Resource
     UserMapper userMapper;
     @Override
@@ -50,4 +56,15 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg read(Integer id) {
+        HttpRespMsg msg = new HttpRespMsg();
+        NewsNoticeUser item = new NewsNoticeUser();
+        item.setId(id);
+        item.setIsRead(1);
+        newsNoticeUserMapper.updateById(item);
+        msg.data = vnoticeUserMapper.selectById(id);
+        return msg;
+    }
 }

cloud-model/src/main/resources/mapper/MouldEquipmentMapper.xml

@@ -74,7 +74,7 @@
                 and tbme.belong_company_id = #{companyId}
             </if>
             <if test="keyName != null and keyName != ''">
-                and tbme.equipment_no like concat('%',#{keyName},'%');
+                and tbme.equipment_no like concat('%',#{keyName},'%')
             </if>
         </where>
     </select>