svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -3,10 +3,12 @@ package com.yihu.jw.base.endpoint.open.nologin;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineWarrayService;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.service.advrtisement.AdvertisementLaunchService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.MedicineShipmentLog;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -22,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@@ -42,6 +45,9 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
    @Autowired
    MedicinedeviceService deviceService;
    @Autowired
    MedicineWarrayService warrayService;
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单个设备上的所有广告")
    public Envelop solo(
@@ -176,7 +182,14 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "humidity", required = false) Float humidity,
            @ApiParam(name = "type",value = "故障类型",required = false)
            @RequestParam(value = "type",required = false)String type) throws Exception {
        return success(deviceService.uploadDeviceInfo(equNum,temperature,humidity,type));
        Map<String,Object> mediicinewarray = warrayService.warning(equNum,temperature,humidity,type);
        if (mediicinewarray==null){
            return failed("请确认设备编码是否正确");
        }
        if (mediicinewarray.get("msg")==null){
            return success("设备正常");
        }
        return success(mediicinewarray.get("msg"));
    }
}

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

@@ -81,7 +81,10 @@ public class MedOrderService {
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(params.getString("pick_up_num"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();

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

@@ -4,9 +4,11 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.a2dao.MediicinestoreDao;
import com.yihu.jw.base.dao.a2dao.MediicinewarrayDao;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinestore;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import com.yihu.jw.util.date.DateUtil;
@@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
@@ -31,6 +34,11 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
    private MediicinewarrayDao warrayDao;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private MediicineDeviceDao deviceDao;
    @Autowired
    private MedicinedeviceService medicinedeviceService;
    @Autowired
@@ -721,4 +729,38 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.getexceed( idDevice, equClass, networkStatus, durationebeg, durationend, codename,startDate,endDate);
    }
    public Map<String,Object> warning(String equNum, Float temperature, Float humidity ,String type) {
        Map<String,Object> result=new HashMap<>();
        Mediicinedevice mediicinedevice=deviceDao.findMediicinedeviceByEquNum(equNum);
        type = "";
        if (mediicinedevice==null){
            return null;
        }
        if (!StringUtils.isEmpty(mediicinedevice.getWarningTemperatureHeight())&&!StringUtils.isEmpty(mediicinedevice.getWarningTemperatureLow())){
            Float temperatureHeight= Float.parseFloat(mediicinedevice.getWarningTemperatureHeight());
            Float temperatureLow = Float.parseFloat(mediicinedevice.getWarningTemperatureLow());
            if (mediicinedevice.getTemperaturecontrol().equalsIgnoreCase("1")){
                if(temperature!=null&&(temperature>temperatureHeight||temperature<temperatureLow)){
                    type="温度异常";
                }
            }
        }
        if (!StringUtils.isEmpty(mediicinedevice.getWaringHumidityHeight())&&!StringUtils.isEmpty(mediicinedevice.getWaringHumidityLow())){
            Float humidityHeight = Float.parseFloat(mediicinedevice.getWaringHumidityHeight());
            Float humidityLow = Float.parseFloat(mediicinedevice.getWaringHumidityLow());
            if (mediicinedevice.getHumiditycontrol().equalsIgnoreCase("1")){
                if (humidity!=null&&(humidity>humidityHeight||humidity<humidityLow)){
                    type += "湿度异常";
                }
            }
        }
        if (!StringUtils.isEmpty(type)) {
            Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type);
            result.put("msg",mediicinewarray);
            return result;
        }
        result.put("msg",null);
        return result;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -95,11 +95,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    public UserDO registerWithIdcard(UserDO userDO) {
        userDO.setSalt(randomString(5));
        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
            userDO.setEnabled(1);
        }else {
            userDO.setEnabled(userDO.getEnabled());
        }
//        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
//            userDO.setEnabled(1);
//        }else {
//            userDO.setEnabled(userDO.getEnabled());
//        }
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
@@ -118,6 +119,11 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     */
    public UserDO registerWithMobile(UserDO userDO) {
        userDO.setSalt(randomString(5));
//        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
//            userDO.setEnabled(1);
//        }else {
//            userDO.setEnabled(userDO.getEnabled());
//        }
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setLoginFailureCount(0);
@@ -464,7 +470,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            userDO = EntityUtils.jsonToEntity(user.toString(),UserDO.class);
            UserDO oldUser = userDao.findOne(userDO.getId());
            userDO.setPassword(oldUser.getPassword());
            userDO.setSalt(randomInt(5));
            userDO.setSalt(oldUser.getSalt());
            userDO.setUpdateTime(new Date());
        } catch (Exception e) {
            result.put("msg", "convert user jsonObject to UserDO failed," + e.getCause());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedOrderService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.hospital.dao.med.MedicineorderDao;
import com.yihu.jw.hospital.dao.med.MediicineorderdetailDao;
import org.apache.commons.lang.StringUtils;
@@ -26,6 +28,8 @@ public class MedOrderService {
    MedicineorderDao mediicineorderDao;
    @Autowired
    MediicineorderdetailDao mediicineorderdetailDao;
    @Autowired
    HospitalDao hospitalDao;
    /**
     * 获取续方订单及药方
     * @return
@@ -50,6 +54,11 @@ public class MedOrderService {
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            String belongCommunity=params.getString("belong_community");
            mediicineorder.setBelongCommunity(belongCommunity);
            mediicineorder.setSellState("0");
            DmHospitalDO hospitalDO=hospitalDao.findByCode(belongCommunity);
            mediicineorder.setCommunity(hospitalDO.getName());
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
@@ -70,8 +79,11 @@ public class MedOrderService {
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(params.getString("pick_up_num"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            mediicineorder.setPickUpNum(mediicineorder.getPrescribeNum());
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
@@ -93,6 +105,8 @@ public class MedOrderService {
                mediicineorderdetail.setManufactor(jsonObject.getString("drug_firm_name"));
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetail.setOrgCode(jsonObject.getString("org_code"));
                mediicineorderdetail.setName(ord.getName());
                mediicineorderdetail.setSex(ord.getSex());
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setOrderNo(ord.getOrderNum());