Browse Source

update bug

wangzhinan 3 years ago
parent
commit
06d03fe8bd

+ 3 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/dao/equipment/WlyyUserAreaDao.java

@ -14,6 +14,9 @@ public interface WlyyUserAreaDao extends PagingAndSortingRepository<WlyyUserArea
    @Query("select a from WlyyUserAreaDO a where a.userId = ?1 and a.del=1")
    List<WlyyUserAreaDO> findAllByUserId(String userId);
    @Query("select a from WlyyUserAreaDO a where a.hospital = ?1 and a.del=1")
    List<WlyyUserAreaDO> findAllByHospital(String hospital);
    @Modifying
    @Query("delete from WlyyUserAreaDO p where p.userId=?1 ")
    void deleteByUserId(String userId);

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

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.org.apache.xpath.internal.operations.Bool;
import com.yihu.jw.base.dao.a2dao.*;
import com.yihu.jw.base.dao.equipment.WlyyUserAreaDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
@ -12,6 +13,7 @@ import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
@ -114,6 +116,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    @Autowired
    private MedicineWarrayRuleDao medicineWarrayRuleDao;
    @Autowired
    private WlyyUserAreaDao userAreaDao;
    /**
     * 新增药品信息
@ -1371,6 +1375,23 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    }
    /**
     * 预警发送模板消息
     * @param hospital
     */
    public void yjSendMessage(String hospital,String deviceName){
        if (org.apache.commons.lang.StringUtils.isNotBlank(hospital)){
            List<WlyyUserAreaDO> userAreaDOList = userAreaDao.findAllByHospital(hospital);
            for (WlyyUserAreaDO userAreaDO:userAreaDOList){
                UserDO userDO = userDao.findById(userAreaDO.getUserId());
                RoleDO roleDO = roleDao.findOne(userDO.getRoleId());
                if (!roleDO.getCode().equalsIgnoreCase("replenisher")){
                    sendDoctorTemplates(userDO.getIdcard(),"9","","您好,您的设备药品库存已达到预警值,请及时补充药品。",deviceName,"缺货预警");
                }
            }
        }
    }
    /**
     *
     * @param idcard 医生身份证

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

@ -15,6 +15,7 @@ import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.sms.dao.HospitalSysDictDao;
@ -97,6 +98,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    private MediicinestockoutdetailDao mediicinestockoutdetailDao;
    @Autowired
    private HospitalSysDictDao hospitalSysDictDao;
    @Autowired
    private MedicineOrderService medicineOrderService;
@ -4472,6 +4475,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        }
        if (isZeroNum == collect.size()) {
            mediicinedevice.setStatus("0");
            try {
                System.out.println("开始发送模板消息");
                medicineOrderService.yjSendMessage(mediicinedevice.getBelongCommunity(),mediicinedevice.getEquName());
                System.out.println("结束发送模板消息");
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        deviceDao.save(mediicinedevice);
    }