update bug

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -1446,7 +1446,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    /**
     * 预警发送模板消息
     * 取货预警发送模板消息
     * @param hospital
     */
    public void yjSendMessage(String hospital,String deviceName){
@@ -1464,6 +1464,26 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
    }
    /**
     * 温度、在线离线发送模板消息
     * @param hospital
     */
    public void wdOrSdSendMessage(String hospital,String deviceName,Integer flage){
        if (org.apache.commons.lang.StringUtils.isNotBlank(hospital)){
            List<WlyyUserAreaDO> userAreaDOList = userAreaDao.findAllByHospital(hospital);
            for (WlyyUserAreaDO userAreaDO:userAreaDOList){
                UserDO userDO = userDao.findById(userAreaDO.getUserId());
                if (userDO!=null){
                    if (flage==1){
                        sendDoctorTemplates(userDO.getIdcard(),"9","","您好，您的设备温湿度异常，请及时处理，预防药品损坏。",deviceName,"温湿度预警,"+userAreaDO.getHospitalName()+","+userDO.getName());
                    }else if (flage==2){
                        sendDoctorTemplates(userDO.getIdcard(),"9","","您好，您的设备正处于离线状态，请及时处理，如您正常操作请忽略。",deviceName,"离线预警,"+userAreaDO.getHospitalName()+","+userDO.getName());
                    }
                }
            }
        }
    }
    /**
     *
     * @param idcard 医生身份证

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@@ -49,6 +49,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
    private UserDao userDao;
    @Autowired
    private RoleDao roleDao;
    @Autowired
    private MedicineOrderService medicineOrderService;
    @Autowired
    private HibenateUtils hibenateUtils;
@@ -1034,6 +1036,9 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
        }else {
            type+="/湿度正常";
        }
        if (type.contains("异常")){
            medicineOrderService.wdOrSdSendMessage(mediicinedevice.getBelongCommunity(),mediicinedevice.getEquName(),1);
        }
        mediicinedevice.setAbnormal(type);
        mediicinedevice.setLogTime(new Date());
        mediicinedevice.setNowHumidity(humidity+"");

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -486,6 +486,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        if(networkStatus.equalsIgnoreCase("0")){
            mediicinedevice.setSaleStatus("2");
            mediicinewarray.setType("网络离线");
            medicineOrderService.wdOrSdSendMessage(mediicinedevice.getBelongCommunity(),mediicinedevice.getEquName(),2);
        }else {
            mediicinewarray.setType("网络在线");
            mediicinedevice.setSaleStatus("1");
@@ -2151,6 +2152,23 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    stringObjectMap.put("cardStatusName", "未知");
                }
            }
            String tempSql = "SELECT\n" +
                    "\tifnull(sum(t.qty), 0) AS qty\n" +
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory t\n" +
                    "WHERE\n" +
                    "\tt.id_device = '"+ stringObjectMap.get("id") + "" +"'\n" +
                    "AND (t.state = '1' OR t.state = '21')\n" +
                    "AND t.shelf_status = '1'";
            Map<String, Object> tempMap = jdbcTemplate.queryForMap(tempSql);
            int inStock = 0;
            if (tempMap != null) {
                if (tempMap.get("qty") != null) {
                    inStock = (int) Double.parseDouble(tempMap.get("qty") + "");
                }
            }
            //在架库存数
            stringObjectMap.put("shangPinKuCun", inStock);
        }
        result.put("response", ConstantUtils.SUCCESS);