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

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

@@ -224,23 +224,23 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "deviceId", value = "设备id")
            @RequestParam(value = "deviceId") String deviceId,
            @ApiParam(name = "humidity", value = "目标湿度")
            @RequestParam(value = "humidity") String humidity,
            @RequestParam(value = "humidity",required = false) String humidity,
            @ApiParam(name = "temperature", value = "目标温度")
            @RequestParam(value = "temperature") String temperature,
            @RequestParam(value = "temperature",required = false) String temperature,
            @ApiParam(name = "humiditycontrol", value = "湿度控制，1开启，0关闭")
            @RequestParam(value = "humiditycontrol") String humiditycontrol,
            @RequestParam(value = "humiditycontrol",required = false) String humiditycontrol,
            @ApiParam(name = "temperaturecontrol", value = "温度控制，1开启，0关闭")
            @RequestParam(value = "temperaturecontrol") String temperaturecontrol,
            @RequestParam(value = "temperaturecontrol",required = false) String temperaturecontrol,
            @ApiParam(name = "heat", value = "加热控制，1开启，0关闭")
            @RequestParam(value = "heat") String heat,
            @RequestParam(value = "heat",required = false) String heat,
            @ApiParam(name = "warningTemperatureHeight", value = "预警温度上限")
            @RequestParam(value = "warningTemperatureHeight") String warningTemperatureHeight,
            @RequestParam(value = "warningTemperatureHeight",required = false) String warningTemperatureHeight,
            @ApiParam(name = "waringHumidityHeight", value = "预警湿度上限")
            @RequestParam(value = "waringHumidityHeight") String waringHumidityHeight,
            @RequestParam(value = "waringHumidityHeight",required = false) String waringHumidityHeight,
            @ApiParam(name = "warningTemperatureLow", value = "预警温度下限")
            @RequestParam(value = "warningTemperatureLow") String warningTemperatureLow,
            @RequestParam(value = "warningTemperatureLow",required = false) String warningTemperatureLow,
            @ApiParam(name = "waringHumidityLow", value = "预警湿度下限", required = true)
            @RequestParam(value = "waringHumidityLow") String waringHumidityLow) throws Exception {
            @RequestParam(value = "waringHumidityLow",required = false) String waringHumidityLow) throws Exception {
        String str = deviceService.updateTAndH(deviceId, humidity, temperature, humiditycontrol,temperaturecontrol,
                heat,warningTemperatureHeight, waringHumidityHeight,warningTemperatureLow, waringHumidityLow);
        JSONObject jsonObject = JSONObject.parseObject(str);

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

@@ -1553,6 +1553,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    public List<Map<String,Object>> getSumAmount(String belongCommunity, String equNum, String startTime, String endTime,int page,int size) {
        List<Map<String,Object>> mapList=new ArrayList<>();
        Map<String,Object> countMap = new HashMap<>();
        //第几页
        countMap.put("page",page);
        //多少条
        countMap.put("size",size);
        page = (page - 1) * size;
        //查询出所有的设备
        Iterable <Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page,size);
@@ -1565,7 +1570,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "  1=1   " ;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int decCount = jdbcTemplate.queryForObject(countSql,Integer.class);
        Map<String,Object> countMap = new HashMap<>();
        //总页数
        int total=decCount/size+(decCount%size>0?1:0);
        countMap.put("total",total);
        countMap.put("count",decCount);
        mapList.add(countMap);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
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;
import org.slf4j.Logger;
@@ -21,6 +22,8 @@ public class MedicineServive {
    @Autowired
    private WlyyHttpService wlyyHttpService;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private MediicinedrugsDao mediicinedrugsDao;
@@ -89,8 +92,9 @@ public class MedicineServive {
        }
    }
    public JSONObject SetTemperatureAndHumidity(String devId, String temperature, String humidity, Boolean temperatureControl
            , Boolean humidityControl, Boolean heat) {
    public void SetTemperatureAndHumidity(String devId, String temperature, String humidity, Boolean temperatureControl
            , Boolean humidityControl, Boolean heat) throws Exception {
        JSONObject object = new JSONObject();
        String param = "";
        if (StringUtils.isNoneBlank(devId)) {
            param = "?devId=" + devId;
@@ -104,6 +108,12 @@ public class MedicineServive {
        param += "?temperatureControl=" + temperatureControl;
        param += "?humidityControl=" + humidityControl;
        param += "?heat=" + heat;
        return wlyyHttpService.sendWlyyMesGet("http://yik.ab-inbev.vip/c/upws/send", param);
        String res = httpClientUtil.get("http://yik.ab-inbev.vip/c/upws/send"+param,"utf-8");
       System.out.println(res);
        /* if (StringUtils.isNoneBlank(res)){
            object =JSONObject.parseObject(res);
        }else{
            throw new Exception("调用设备通信接口设置温湿度失败!");
        }*/
    }
}

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

@@ -508,7 +508,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    //updateTAndH
    public String updateTAndH(String deviceId, String humidity, String temperature, String humiditycontrol,String temperaturecontrol,
                              String heat,String warningTemperatureHeight, String waringHumidityHeight,String warningTemperatureLow, String waringHumidityLow){
                              String heat,String warningTemperatureHeight, String waringHumidityHeight,String warningTemperatureLow, String waringHumidityLow)throws Exception{
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId) ){
            result.put("msg","deviceId  is null");

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

@@ -997,8 +997,8 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        List<WlyyUserAreaDO> areaDOList=new ArrayList<>();
        String finalSql="SELECT\n" +
                "\t\t\tusr . ID AS \"id\",\n" +
                "\t\t\tusr . NAME AS \"realName\",\n" +
                "\t\t\tusr . id AS \"id\",\n" +
                "\t\t\tusr . name AS \"realName\",\n" +
                "\t\t\tusr .username AS \"username\",\n" +
                "\t\t\tusr .update_time AS \"updateTime\",\n" +
                "\t\t\tusr .create_time AS \"createTime\",\n" +
@@ -1012,15 +1012,16 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "\t\tusr .mobile AS \"mobile\",\n" +
                "\t\tsaas. NAME AS \"saasName\"\n" +
//                "\t\tROLE . NAME AS \"roleName\"\n" +
                "\tFROM\n" +
                "\t\tbase_user usr,\n" +
                "\t\tbase_saas saas\n" +
//                "\t\tbase_role ROLE\n" +
                "\tWHERE\n" +
                "\t\tusr .saas_id = saas. ID\n" ;
                "FROM\n" +
                "    base_user usr\n" +
                "    left join\n" +
                "    base_saas saas\n" +
                "    on\n" +
                "    usr .saas_id = saas. ID\n" +
                "  where 1=1 ";
//                "\tAND usr .role_id = ROLE . ID\n" ;
                if(!realName.equals(null) && !realName.equals("")){
                    finalSql = finalSql + " and usr . NAME LIKE '%"+realName+"%'";
                    finalSql = finalSql + " and usr . name LIKE '%"+realName+"%'";
                }
                if(!saasidValue.equals(null) && !saasidValue.equals("")){
                    finalSql = finalSql + " and saas. id = '"+saasidValue+"'";