Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

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

@@ -180,6 +180,7 @@ public class BaseRequestMapping {
        public static final String UPDATESTATUS  = "/updateStatus";
        public static final String updateUpgrAdesit  = "/updateUpgrAdesit";
        public static final String updateNetWorkStatus  = "/updateNetWorkStatus";
        public static final String updateTAndH  = "/updateTAndH";
        public static final String UPDATESALESTATUS  = "/updateSaleStatus";
        public static final String UNBINDDEVICE  = "/unbindDevice";
        public static final String mergeAndSplitCargo  = "/mergeAndSplitCargo";

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

@@ -220,12 +220,27 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
//    @PostMapping(value = BaseRequestMapping.BaseDevice.updateTAndH)
//    @ApiOperation(value = "更新设备温度湿度and控制")
//    public Envelop updateSaleStatus(
//            @ApiParam(name = "deviceId", value = "设备Id", required = true)
//            @RequestParam(value = "deviceId", required = true) String deviceId,
//            @ApiParam(name = "saleStatus", value = "设备销售状态", required = true)
//            @RequestParam(value = "saleStatus", required = true) String saleStatus) throws Exception {
//        String str = deviceService.updateDeviceSaleStatus(deviceId, saleStatus);
//    public Envelop updateTAndH(
//            @ApiParam(name = "humidity", value = "目标湿度")
//            @RequestParam(value = "humidity") String humidity,
//            @ApiParam(name = "temperature", value = "目标温度")
//            @RequestParam(value = "temperature") String temperature,
//            @ApiParam(name = "humiditycontrol", value = "湿度控制，1开启，0关闭")
//            @RequestParam(value = "humiditycontrol") String humiditycontrol,
//            @ApiParam(name = "temperaturecontrol", value = "温度控制，1开启，0关闭")
//            @RequestParam(value = "temperaturecontrol") String temperaturecontrol,
//            @ApiParam(name = "heat", value = "加热控制，1开启，0关闭")
//            @RequestParam(value = "heat") String heat,
//            @ApiParam(name = "warningTemperatureHeight", value = "预警温度上限")
//            @RequestParam(value = "warningTemperatureHeight") String warningTemperatureHeight,
//            @ApiParam(name = "waringHumidityHeight", value = "预警湿度上限")
//            @RequestParam(value = "waringHumidityHeight") String waringHumidityHeight,
//            @ApiParam(name = "warningTemperatureLow", value = "预警温度下限")
//            @RequestParam(value = "warningTemperatureLow") String warningTemperatureLow,
//            @ApiParam(name = "waringHumidityLow", value = "预警湿度下限", required = true)
//            @RequestParam(value = "waringHumidityLow") String waringHumidityLow) throws Exception {
//        String str = deviceService.updateTAndH(humidity, temperature, humiditycontrol,temperaturecontrol,
//                heat,warningTemperatureHeight, waringHumidityHeight,warningTemperatureLow, waringHumidityLow);
//        JSONObject jsonObject = JSONObject.parseObject(str);
//        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
//            return failed(jsonObject.getString("msg"));

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

@@ -236,7 +236,7 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
            conditionSql += " and t.state = '" + state + "'";
        }
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and CONCAT(t.drug_code, t.drug_bar_code, drug_name, t.drug_short_code) like '%"+content+"%'";
            conditionSql += " and CONCAT(t.drug_code, t.drug_bar_code, t.drug_name, t.drug_short_code) like '%"+content+"%'";
        }
        if (!StringUtils.isEmpty(drugClass)){
            conditionSql += " and t.drug_class_code = '" + drugClass + "'";

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

@@ -718,6 +718,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @param status
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public JSONObject updateOrderOutStatus(String shipmentLogId, String status, String msg) {
        JSONObject result = new JSONObject();
        if (shipmentLogId == null || StringUtils.isEmpty(shipmentLogId)) {
@@ -777,8 +778,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "\tt_medicine_shipment_log\n" +
                "WHERE\n" +
                "\torder_id = '" + orderId + "'\n" +
                "AND `status` = 1\n" +
                "OR `status` = 3";
                "AND (`status` = 1\n" +
                "OR `status` = 3)";
        int count = jdbcTemplate.queryForObject(sql, Integer.class);
        if (count == 0) {
            Mediicineorder order = orderDao.findOne(orderId);
@@ -801,6 +802,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @param cardNum
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public JSONObject checkOrderAndReturn(String deviceId, String pickUpNum, String cardNum) {
        JSONObject result = new JSONObject();
        if (deviceId == null || StringUtils.isEmpty(deviceId)) {
@@ -830,6 +832,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        if ("1".equals(mediicineorder.getSellState())) {
            result.put("msg", "已取药");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //订单详细内容--备用方案---
        List<Mediicineorderdetail> list = orderdetailDao.findMediicineorderdetailsByIdOrder(mediicineorder.getId());
        Boolean isInStock = true;

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

@@ -487,7 +487,36 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }
    //updateTAndH
    public String updateTAndH(String deviceId, String humidity, String temperature, String humiditycontrol,String temperaturecontrol,
                              String heat,String warningTemperatureHeight, String waringHumidityHeight,String warningTemperatureLow, String waringHumidityLow){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId) ){
            result.put("msg","deviceId  is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        if (mediicinedevice == null) {
            result.put("msg","device doesn't exist");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        mediicinedevice.setHumidity(humidity);
        mediicinedevice.setTemperature(temperature);
        mediicinedevice.setHumiditycontrol(humiditycontrol);
        mediicinedevice.setTemperaturecontrol(temperaturecontrol);
        mediicinedevice.setHeat(heat);
        mediicinedevice.setWaringHumidityHeight(waringHumidityHeight);
        mediicinedevice.setWarningTemperatureHeight(warningTemperatureHeight);
        mediicinedevice.setWarningTemperatureLow(warningTemperatureLow);
        mediicinedevice.setWaringHumidityLow(waringHumidityLow);
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }
    /**
     * 解绑设备
     * @param deviceIds
@@ -557,10 +586,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    //mergeAndSplitCargo
    /**
     * 合并和分离货道
     * 合并和分离货道， state《---1单列货道，21合并货道的主货道，20次货道
     * @param cargoIds
     * @param isMerge
     * @return