Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldEquipment.java

@@ -112,7 +112,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     }
 
     /**
-     * 状态,0-正常，1-温度过高，2-电量过低
+     * 状态,0-正常，1-温度过高，2-电量过低,3-温度过高且电量低
      */
     @TableField("stage")
     private Integer stage;

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

@@ -139,7 +139,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         HttpRespMsg msg = new HttpRespMsg();
         List<Integer> mouldsEquipmentIds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", mouldEquipmentVO.getBelongCompanyId()).isNotNull("equipment_id")).stream().map(Mould::getEquipmentId).collect(Collectors.toList());
         mouldsEquipmentIds.add(-1);
-        List<Integer> equipmentIds = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipmentVO.getBelongCompanyId())).stream().map(MouldEquipment::getId).collect(Collectors.toList());
+        List<Integer> equipmentIds = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>().eq("belong_company_id", mouldEquipmentVO.getBelongCompanyId()).eq("stage", 0)).stream().map(MouldEquipment::getId).collect(Collectors.toList());
         equipmentIds.add(-1);
         equipmentIds.removeAll(mouldsEquipmentIds);//把已经使用的设备剔除
         List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId(), equipmentIds);
@@ -159,14 +159,18 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
             uids.add(project.getManagerId());
             uids.add(project.getCreatorId());
             uids.add(-1);
-            List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("id", uids).isNotNull("openid").eq("is_disable",1));
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("id", uids).isNotNull("openid").eq("is_disable", 1));
             if (Constant.ELECTRICITY_THRESHOLD >= Double.parseDouble(mouldEquipment.getHillNumber())) {
-                mouldEquipment.setStage(2);
+                if (0 == mouldEquipment.getStage()) {
+                    mouldEquipment.setStage(2);
+                }else{
+                    mouldEquipment.setStage(3);
+                }
                 mouldEquipmentMapper.updateById(mouldEquipment);
                 //公众号的推送to do
-                userList.forEach(u ->{
+                userList.forEach(u -> {
                     try {
-                        WechatTemplateUtil.sendEmergencyTemplateMessage(u.getOpenid(),mouldEquipment.getEquipmentName(),Constant.ELECTRICITY_TYPE,Constant.ELECTRICITY_CONTENT,token);
+                        WechatTemplateUtil.sendEmergencyTemplateMessage(u.getOpenid(), mouldEquipment.getEquipmentName(), Constant.ELECTRICITY_TYPE, Constant.ELECTRICITY_CONTENT, token);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -219,12 +223,16 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                 }
             }
             if (Constant.TEMPERATURE_THRESHOLD <= mouldEquipment.getTemperature()) {
-                mouldEquipment.setStage(1);
+                if (0 == mouldEquipment.getStage()) {
+                    mouldEquipment.setStage(1);
+                }else{
+                    mouldEquipment.setStage(3);
+                }
                 mouldEquipmentMapper.updateById(mouldEquipment);
                 //公众号的推送to do
-                userList.forEach(u ->{
+                userList.forEach(u -> {
                     try {
-                        WechatTemplateUtil.sendEmergencyTemplateMessage(u.getOpenid(),mouldEquipment.getEquipmentName(),Constant.TEMPERATURE_TYPE,Constant.TEMPERATURE_CONTENT,token);
+                        WechatTemplateUtil.sendEmergencyTemplateMessage(u.getOpenid(), mouldEquipment.getEquipmentName(), Constant.TEMPERATURE_TYPE, Constant.TEMPERATURE_CONTENT, token);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -357,14 +365,14 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     public HttpRespMsg getEquipmentListByOldMouldAndUser(UserVO userVO) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
-        if(user==null){
+        if (user == null) {
             msg.setError("用户不存在或者未登录");
-        }else{
+        } else {
             Mould mould = mouldMapper.selectById(userVO.getMouldId());
             User admin = userMapper.selectById(projectMapper.selectById(mould.getProjectId()).getCreatorId());
             List<Integer> mouldsEquipmentIds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", admin.getCompanyId()).isNotNull("equipment_id")).stream().map(Mould::getEquipmentId).collect(Collectors.toList());
             mouldsEquipmentIds.add(-1);
-            List<Integer> equipmentIds = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>().eq("belong_company_id", admin.getCompanyId())).stream().map(MouldEquipment::getId).collect(Collectors.toList());
+            List<Integer> equipmentIds = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>().eq("belong_company_id", admin.getCompanyId()).eq("stage", 0)).stream().map(MouldEquipment::getId).collect(Collectors.toList());
             equipmentIds.add(-1);
             equipmentIds.removeAll(mouldsEquipmentIds);//把已经使用的设备剔除
             List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(admin.getCompanyId(), equipmentIds);

cloud-model/src/test/java/com/hssx/cloudmodel/CloudModelApplicationTests.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
@@ -24,11 +25,10 @@ public class CloudModelApplicationTests {
 //    @Autowired
     private ProjectUserMapper projectUserMapper;
 
-    @Autowired
+    @Resource
     UserMapper userMapper;
     @Test
     public void contextLoads() {
-
     }