跟新相关bug

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -239,6 +239,8 @@ public class BaseRequestMapping {
        public static final String getDevicePriceStatistics = "/getDevicePriceStatistics";
        public static final String getShippingType = "/getShippingType";
        public static final String getPrescriptionStatics = "/getPrescriptionStatics";
        public static final String SYSTEMUPDATE  = "/systemUpdate";
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineServive;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.MedicineDeviceDelivery;
@@ -34,6 +35,8 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private  MedicinedeviceService deviceService;
    @Autowired
    private MedicineServive medicineServive;
    @Autowired
    private ObjectMapper objectMapper;
@@ -748,4 +751,24 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * 设备端系统更新
     * @param equNum
     * @param type
     * @param mess
     * @return
     * @throws Exception
     */
    @PostMapping(value = BaseRequestMapping.BaseDevice.SYSTEMUPDATE)
    @ApiOperation(value = "设备端系统更新")
    public Envelop systemUpdate(
            @ApiParam(name = "equNum", value = "设备编码", required = false)
            @RequestParam(value = "equNum", required = false) String equNum,
            @ApiParam(name = "type", value = "事件类型", required = true)
            @RequestParam(value = "type", required = true) String type,
            @ApiParam(name = "mess", value = "事件说明", required = true)
            @RequestParam(value = "mess", required = true) String mess) throws Exception {
        return success(medicineServive.systemUpdate(equNum,type,mess));
    }
}

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

@@ -2,9 +2,10 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
import org.apache.commons.lang3.StringUtils;
@@ -26,6 +27,9 @@ public class MedicineServive {
    private HttpClientUtil httpClientUtil;
    @Autowired
    private MediicinedrugsDao mediicinedrugsDao;
    @Autowired
    private MediicineDeviceDao deviceDao;
    @Value("${medicine.socketUrl}")
    private String socketUrl;
@@ -101,20 +105,22 @@ public class MedicineServive {
            , Boolean humidityControl, Boolean heat) throws Exception {
        JSONObject object = new JSONObject();
        String param = "";
        if (StringUtils.isNoneBlank(devId)) {
            param = "?devId=" + devId;
            param += "?devId=" + devId;
        }
        if (StringUtils.isNoneBlank(temperature)) {
            param += "?temperature=" + temperature;
            object.put("temperature",temperature);
        }
        if (StringUtils.isNoneBlank(humidity)) {
            param += "?humidity=" + humidity;
            object.put("humidity",humidity);
        }
        param += "?temperatureControl=" + temperatureControl;
        param += "?humidityControl=" + humidityControl;
        param += "?heat=" + heat;
        object.put("temperatureControl",temperatureControl);
        object.put("humidityControl",humidityControl);
        object.put("heat",heat);
        param+="&type=SetTemperatureAndHumidity&mess="+object.toJSONString()+"";
        String res = httpClientUtil.get(socketUrl+param,"utf-8");
       System.out.println(res);
        System.out.println(res);
        /* if (StringUtils.isNoneBlank(res)){
            object =JSONObject.parseObject(res);
        }else{
@@ -123,27 +129,47 @@ public class MedicineServive {
    }
    /*public void sendSocketMessage(String devId, String type,String message) throws Exception {
    /**
     * socket发送事件
     * @param devId
     * @param type
     * @param message
     * @throws Exception
     */
    public String sendSocketMessage(String devId, String type,String message) throws Exception {
        JSONObject object = new JSONObject();
        String param = "";
        if (StringUtils.isNoneBlank(devId)) {
            param = "?devId=" + devId;
        }
        if (StringUtils.isNoneBlank(temperature)) {
            param += "?temperature=" + temperature;
        }
        if (StringUtils.isNoneBlank(humidity)) {
            param += "?humidity=" + humidity;
        }
        param += "?temperatureControl=" + temperatureControl;
        param += "?humidityControl=" + humidityControl;
        param += "?heat=" + heat;
        param +="&type="+type+"&mess="+message+"";
        String res = httpClientUtil.get(socketUrl+param,"utf-8");
        System.out.println(res);
        *//* if (StringUtils.isNoneBlank(res)){
            object =JSONObject.parseObject(res);
        }else{
            throw new Exception("调用设备通信接口设置温湿度失败!");
        }*//*
    }*/
        return res;
    }
    /**
     * socket发送事件
     * @param equNum
     * @param type
     * @param message
     * @throws Exception
     */
    public String systemUpdate(String equNum, String type,String message) throws Exception {
        int i=0;
        if (StringUtils.isNoneBlank(equNum)){
            String res = sendSocketMessage(equNum+"_T",type,message);
            logger.info("更新设备"+res);
            i++;
        }else {
            List<Mediicinedevice> mediicinedeviceList =deviceDao.selectByBelongComminity();
            for (Mediicinedevice mediicinedevice:mediicinedeviceList){
                String res = sendSocketMessage(mediicinedevice.getEquNum()+"_T",type,message);
                logger.info("更新设备"+res);
                i++;
            }
            logger.info("更新"+i+"台设备");
        }
        return "更新"+i+"台设备";
    }
}

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

@@ -319,7 +319,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                "t.remark AS remark,\n" +
                "t.replenish_cate AS replenishCate,\n" +
                "t.replenish_equ AS replenishEqu,\n" +
                "t.replenish_equ_name AS replenishEquName,\n" +
                "t.replenish_er AS replenishEr,\n" +
                "t.replenish_er_name AS replenishErName,\n" +
                "t.replenish_inventory AS replenishInventory,\n" +
                "t.state AS state,\n" +
                "t.track_num AS trackNum,\n" +

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

@@ -528,7 +528,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String updateDeviceSaleStatus(String deviceId, String saleStatus){
    public String updateDeviceSaleStatus(String deviceId, String saleStatus) throws Exception {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId) && StringUtils.isEmpty(saleStatus)){
            result.put("msg","deviceId and saleStatus is null");
@@ -543,6 +543,13 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        }
        mediicinedevice.setSaleStatus(saleStatus);
        this.save(mediicinedevice);
        //设备发送事件给前端
        if (saleStatus.equalsIgnoreCase("2")){
            medicineServive.sendSocketMessage(mediicinedevice.getEquNum()+"_T","equ_maintenance","设备维护");
        }else {
            medicineServive.sendSocketMessage(mediicinedevice.getEquNum()+"_T","equ_normal","设备正常");
        }
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
@@ -4025,4 +4032,6 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
}