查询医院接口查询条件新增

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1027,6 +1027,7 @@ public class BaseHospitalRequestMapping {
        public static final String deleteEquipment  = "/deleteEquipment";
        public static final String getEquipment  = "/getEquipment";
        public static final String getEquipmentAndCount  = "/getEquipmentAndCount";
        public static final String getHospital  = "/getHospital";
    }
    

svr/svr-iot/src/main/java/com/yihu/iot/controller/equipment/IotEquipmentController.java

@@ -73,4 +73,18 @@ public class IotEquipmentController extends EnvelopRestEndpoint {
        JSONObject jsonObject =iotEqtDetailService.showJKXW(startTime,endTime,area);
        return success(jsonObject);
    }
    @GetMapping(value = BaseHospitalRequestMapping.IotEquipmentManage.getHospital)
    @ApiOperation(value = "查询医院")
    public Envelop getHospital(
            @ApiParam(name = "name", value = "name", required = false)
            @RequestParam(value = "name", required = false)String name,
            @ApiParam(name = "code", value = "code", required = false)
            @RequestParam(value = "code", required = false)String code,
            @ApiParam(name = "town", value = "town", required = false)
            @RequestParam(value = "town", required = false)String town,
            @ApiParam(name = "city", value = "city", required = false)
            @RequestParam(value = "city", required = false)String city) throws Exception{
        return success( iotEqtDetailService.getHosptital(name, code, town,city));
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/equipment/IotEqtDetailService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.equipment.IotEquipmentDetailDao;
import com.yihu.iot.util.excel.EntityUtils;
import com.yihu.iot.util.excel.HibenateUtils;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
@@ -92,6 +93,13 @@ public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, I
            params.put("area", area);
        }
        List<Map<String,Object>> total = hibenateUtils.createSQLQuery(sql,params);
        for (Map<String,Object> map:total){
            if(null!=map.get("create_time")){
                String createTime= map.get("create_time").toString();
                map.put("create_time",DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
            }
        }
        result.put("equipmentDetails",total);
        List<Map<String, Object>> areCount = hibenateUtils.createSQLQuery(areCountSql.toString(),params);
        if (areCount.size()>=0){
@@ -129,5 +137,25 @@ public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, I
        }
        return count;
    }
    public List<Map<String,Object>> getHosptital(String name,String code,String town,String city){
        StringBuffer sql = new StringBuffer();
        Map<String,Object> params = new HashedMap();
        sql.append("select * from wlyy.dm_hospital t where 1=1");
       if (StringUtils.isNotEmpty(name)){
           sql.append(" and t.name like '%"+name+"%'");
       }if (StringUtils.isNotEmpty(code)){
            sql.append(" and t.code =:code");
            params.put("code",code);
        }if (StringUtils.isNotEmpty(town)){
            sql.append(" and t.town =:town");
            params.put("town",town);
        }
        if (StringUtils.isNotEmpty(city)){
            sql.append(" and t.city =:city");
            params.put("city",city);
        }
       List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql.toString(),params);
       return list;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -185,7 +185,12 @@ public class MonitorPlatformService  {
            }
            return jsonObject.toString();
        }else if (list.size()==1&&list.contains(iotSystemDictDO.getCode())){
            jsonObject.replace("data",iotEquip.toString());
            List list1 = new ArrayList();
            for (Map<String,Object> mao:iotEquip){
               JSONObject jo = new JSONObject(mao);
               list1.add(jo);
            }
            jsonObject.replace("data",JSONArray.parse(list1.toString()));
            return jsonObject.toString();
        }else {
           return anotherResult;