药柜-----居民分析

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -344,8 +344,11 @@ public class ElasticsearchUtil {
            String sqlArea = " select area_level from wlyy_job_config_new where id='"+index+"' ";
            List<String> areaLevels = jdbcTemplate.queryForList(sqlArea,String.class);
            if (areaLevels.size()>0){
                areaLevel = areaLevels.get(0);
                if (StringUtils.isNotBlank(areaLevels.get(0))){
                    areaLevel = areaLevels.get(0);
                }
            }
        }
@@ -1144,7 +1147,9 @@ public class ElasticsearchUtil {
            String sqlArea = " select area_level from wlyy_job_config_new where id='"+index+"' ";
            List<String> areaLevels = jdbcTemplate.queryForList(sqlArea,String.class);
            if (areaLevels.size()>0){
                areaLevel = areaLevels.get(0);
                if (StringUtils.isNotBlank(areaLevels.get(0))){
                    areaLevel = areaLevels.get(0);
                }
            }
        }

common/common-entity/sql记录

@@ -1600,4 +1600,12 @@ CREATE TABLE wlyy_patient_safe_area_confirm (
  `manage_status` tinyint(2) DEFAULT '0' COMMENT '电子围栏确认情况 0待确认 1已确认',
  `del` varchar(1) DEFAULT '1' COMMENT '作废标识，1正常，0作废',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='患者电子围栏新增记录';
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='患者电子围栏新增记录';
-- 2021-12-27
CREATE TABLE `base_activity_click` (
  `id` varchar(50) NOT NULL,
  `activity_type` tinyint(2) DEFAULT NULL COMMENT '活动类型 1-活动浏览2公益课程播放',
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='幼儿活动点击次数统计表';

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/OpenStatisticsEndpoint.java

@@ -53,7 +53,7 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop executeESSQL1(
            @RequestParam(required = true) String sql) {
        try {
            return success(elasticsearchUtil.excute(sql, SaveModel.class,null,null));
            return success(elasticsearchUtil.excute(sql, SaveModel.class, null, null));
        } catch (Exception e) {
            return failedListEnvelopException2(e);
        }
@@ -87,14 +87,47 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop patientAnalysis(@RequestParam(required = true) String endDate,
                                      @RequestParam(required = true) String area,
                                      @RequestParam(required = true) int level,
                                      @ApiParam(name="index",value="42幼儿，37老人",defaultValue = "")@RequestParam(required = true) String index){
                                      @ApiParam(name = "index", value = "42幼儿，37老人", defaultValue = "") @RequestParam(required = true) String index) {
        try {
            JSONObject result = statisticsService.patientAnalysisDP(endDate, area, level, index);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "patientTypeTotalAnalysis")
    @ApiOperation(value = "老人幼儿类型统计分析")
    public ObjEnvelop patientTypeTotalAnalysis(
            @RequestParam(required = true) String startDate,
            @RequestParam(required = true) String endDate,
            @ApiParam(name = "index", value = "42幼儿，37老人", defaultValue = "") @RequestParam(required = true) String index) {
        try {
            JSONObject result = statisticsService.combinedTotal(index,startDate,endDate);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "curveTotal")
    @ApiOperation(value = "曲线图")
    public ObjEnvelop curveTotal(@RequestParam(required = true) String day,
                                 @ApiParam(name = "type", value = "39-老人-生活照料-服务工单数 44-老人-生活照料-代预约 3-幼儿活动报名 41-紧急呼叫  43-老人安放监护 2-公艺课程播放  1-活动浏览次数 28-新生儿-在线咨询总数 32-新生儿-在线咨询总数  35-新生儿-上门辅导-服务工单数")
                                 @RequestParam(required = true) String type,
                                 @RequestParam(required = true) String area,
                                 @RequestParam(required = true) int level,
                                 @RequestParam(required = false) String timeLevel,
                                 @RequestParam(required = false) String interval,
                                 @RequestParam(required = false) String lowLevel
    ) {
        try {
            JSONObject result = statisticsService.curveTotal(day, type, area, level, timeLevel, interval, lowLevel);
            return success(result);
        } catch (Exception e) {
            e.printStackTrace();
            return failedObjEnvelopException2(e);
        }
        return null;
    }
@@ -123,9 +156,9 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getAllDynamics")
    @ApiOperation(value = "综合动态v0.7.0")
    public PageEnvelop getAllDynamics(
            @RequestParam(required = true) Integer page,@RequestParam(required = true) Integer size) {
            @RequestParam(required = true) Integer page, @RequestParam(required = true) Integer size) {
        try {
            return statisticsService.getAllDynamics(page,size);
            return statisticsService.getAllDynamics(page, size);
        } catch (Exception e) {
            return failedPageEnvelopException2(e);
        }
@@ -134,9 +167,9 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "serviceRankingAnalysis")
    @ApiOperation(value = "服务排名分析")
    public ListEnvelop serviceRankingAnalysis(
            @RequestParam(required = true) String endDate,@RequestParam(required = true) String orgType) {
            @RequestParam(required = true) String endDate, @RequestParam(required = true) String orgType) {
        try {
            return success(statisticsService.serviceRankingAnalysis(endDate,orgType));
            return success(statisticsService.serviceRankingAnalysis(endDate, orgType));
        } catch (Exception e) {
            return failedListEnvelopException2(e);
        }
@@ -145,9 +178,9 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "fingLoginLog")
    @ApiOperation(value = "获取登录记录")
    public PageEnvelop fingLoginLog(
            @RequestParam(required = true) Integer page,@RequestParam(required = true) Integer size) {
            @RequestParam(required = true) Integer page, @RequestParam(required = true) Integer size) {
        try {
            return statisticsService.fingLoginLog(page,size);
            return statisticsService.fingLoginLog(page, size);
        } catch (Exception e) {
            return failedPageEnvelopException2(e);
        }
@@ -178,60 +211,60 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "findUserByType")
    @ApiOperation(value = "人员实时动态搜索")
    public Envelop findUserByType(@ApiParam(name = "type", value = "类型：1幼儿，2老人，3助老员，4医生。不传返回四个类型的数据")
                                    @RequestParam(value = "type", required = false)String type,
                                    @ApiParam(name = "name", value = "姓名")
                                    @RequestParam(value = "name", required = false)String name,
                                    @ApiParam(name = "residentialArea", value = "居住小区")
                                    @RequestParam(value = "residentialArea", required = false)String residentialArea,
                                    @ApiParam(name = "page", value = "第几页")
                                        @RequestParam(value = "page", required = false)Integer page,
                                    @ApiParam(name = "size", value = "页面大小")
                                        @RequestParam(value = "size", required = false)Integer size){
        try{
            return success("修改成功",patientService.findUserByType(type, name, residentialArea, page, size));
        }catch (Exception e){
                                  @RequestParam(value = "type", required = false) String type,
                                  @ApiParam(name = "name", value = "姓名")
                                  @RequestParam(value = "name", required = false) String name,
                                  @ApiParam(name = "residentialArea", value = "居住小区")
                                  @RequestParam(value = "residentialArea", required = false) String residentialArea,
                                  @ApiParam(name = "page", value = "第几页")
                                  @RequestParam(value = "page", required = false) Integer page,
                                  @ApiParam(name = "size", value = "页面大小")
                                  @RequestParam(value = "size", required = false) Integer size) {
        try {
            return success("修改成功", patientService.findUserByType(type, name, residentialArea, page, size));
        } catch (Exception e) {
            return failedException2(e);
        }
    }
    @GetMapping(value = "doctorInfo")
    @ApiOperation(value = "获取医生详情")
    public ObjEnvelop doctorInfo (
    public ObjEnvelop doctorInfo(
            @ApiParam(name = "doctorId", value = "医生id", required = true)
            @RequestParam(value = "doctorId",required = true) String doctorId) throws Exception {
        try{
            return ObjEnvelop.getSuccess("查询成功",doctorService.doctorSimpleInfo(doctorId));
        }catch (Exception e){
            @RequestParam(value = "doctorId", required = true) String doctorId) throws Exception {
        try {
            return ObjEnvelop.getSuccess("查询成功", doctorService.doctorSimpleInfo(doctorId));
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "getDoctorOrderList")
    @ApiOperation("获取医生生活照料列表")
    public ObjEnvelop getDoctorOrderList(@ApiParam(name="doctor",value = "医生id",required = true)
                                      @RequestParam(value = "doctor")String doctor,
                                      @ApiParam(name="page",value="page")
                                      @RequestParam(name = "page")Integer page,
                                      @ApiParam(name="size",value="size")
                                      @RequestParam(name = "size")Integer size){
    public ObjEnvelop getDoctorOrderList(@ApiParam(name = "doctor", value = "医生id", required = true)
                                         @RequestParam(value = "doctor") String doctor,
                                         @ApiParam(name = "page", value = "page")
                                         @RequestParam(name = "page") Integer page,
                                         @ApiParam(name = "size", value = "size")
                                         @RequestParam(name = "size") Integer size) {
        try {
            return ObjEnvelop.getSuccess("查询成功",lifeCareOrderService.getDoctorOrderList(doctor,page,size));
        }catch (Exception e){
            return ObjEnvelop.getSuccess("查询成功", lifeCareOrderService.getDoctorOrderList(doctor, page, size));
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "getEmergencyAssistanceList")
    @ApiOperation(value = "紧急救助列表")
    public PageEnvelop getEmergencyAssistanceList(@ApiParam(name="doctor",value = "医生id",required = true)
                                                     @RequestParam(value = "doctor")String doctor,
                                                 @ApiParam(name="page",value = "page")
                                                 @RequestParam(value = "page") Integer page,
                                                 @ApiParam(name="size",value = "size")
                                                 @RequestParam(value = "size") Integer size){
    public PageEnvelop getEmergencyAssistanceList(@ApiParam(name = "doctor", value = "医生id", required = true)
                                                  @RequestParam(value = "doctor") String doctor,
                                                  @ApiParam(name = "page", value = "page")
                                                  @RequestParam(value = "page") Integer page,
                                                  @ApiParam(name = "size", value = "size")
                                                  @RequestParam(value = "size") Integer size) {
        try {
            return emergencyAssistanceService.getEmergencyAssistanceList(page,size,doctor);
        }catch (Exception e){
            return emergencyAssistanceService.getEmergencyAssistanceList(page, size, doctor);
        } catch (Exception e) {
            return failedPageEnvelopException2(e);
        }
    }
@@ -241,7 +274,7 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop statisticsOrderServer(
            @RequestParam(required = true) String endDate) {
        try {
            JSONObject result = statisticsService.statisticsOrderServer("46,48",endDate,2,"4");
            JSONObject result = statisticsService.statisticsOrderServer("46,48", endDate, 2, "4");
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
@@ -265,7 +298,7 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop statisticsOlderAge(
            @RequestParam(required = true) String endDate) {
        try {
            JSONObject result = statisticsService.statisticsOrderServer("50",endDate,2,"2");
            JSONObject result = statisticsService.statisticsOrderServer("50", endDate, 2, "2");
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
@@ -277,18 +310,18 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop searchBySql(
            @RequestParam(required = true) String sql) {
        try {
            return ListEnvelop.getSuccess("查询成功",statisticsService.searchBySql(sql));
            return ListEnvelop.getSuccess("查询成功", statisticsService.searchBySql(sql));
        } catch (Exception e) {
            return failedListEnvelopException2(e);
        }
    }
    @RequestMapping(value="esDataModify",method = RequestMethod.GET)
    public ObjEnvelop esDataModify(@RequestParam(required = true) String sql,@RequestParam(required = true) String jsonStr){
    @RequestMapping(value = "esDataModify", method = RequestMethod.GET)
    public ObjEnvelop esDataModify(@RequestParam(required = true) String sql, @RequestParam(required = true) String jsonStr) {
        try {
            return ObjEnvelop.getSuccess("success",statisticsService.esDataModify(sql,jsonStr));
        }catch (Exception e){
           return failedObjEnvelopException2(e);
            return ObjEnvelop.getSuccess("success", statisticsService.esDataModify(sql, jsonStr));
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/activity/ChildActivityRegistrationService.java

@@ -14,8 +14,14 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
 * Created by yeshijie on 2021/10/16.
@@ -114,7 +120,13 @@ public class ChildActivityRegistrationService {
     */
    @Transactional
    public void activityClick(Integer type){
        String sql = " UPDATE base_child_activity_click SET num = num+1 where type="+type;
        //取当前时间
        Date nowdate=new Date();
        //转换时间格式
        SimpleDateFormat simpleDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Timestamp timestamp = Timestamp.valueOf(simpleDate.format(nowdate));
        //String sql = " UPDATE base_child_activity_click SET num = num+1 where type="+type;
        String sql = " INSERT INTO base_activity_click VALUES ('"+UUID.randomUUID().toString().replace("-","")+"',"+type+",'"+timestamp+"')";
        jdbcTemplate.execute(sql);
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -43,8 +43,12 @@ import org.springframework.transaction.annotation.Transactional;
import javax.persistence.Transient;
import javax.persistence.criteria.CriteriaBuilder;
import java.awt.print.Pageable;
import java.sql.Timestamp;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -168,28 +172,72 @@ public class StatisticsService {
        return res;
    }
    /*曲线*/
    public JSONObject curveTotal(String day,String type){
    public JSONObject curveTotal(String day,String type,String area,int level,String timeLevel,String interval,String lowLevel) throws Exception {
        JSONObject res = new JSONObject();
        StringBuffer sqlbuff = new StringBuffer();
        List<Map<String,Object>> listMaps = null;
        //sql
        //3 幼儿活动
        /*幼儿活动*/
        if("activity_3".equals(type)){
            /*幼儿活动报名 曲线*/
            String sqlActivity = "SELECT count(id),DATE_FORMAT(create_time,'%Y-%m-%d') as total FROM base_child_activity_registration" +
                    " WHERE DATE_SUB(CURDATE(), INTERVAL "+day+" DAY) <= date(create_time)" +
                    " GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') ORDER BY create_time";
            List<Map<String, Object>> maps = jdbcTemplate.queryForList(sqlActivity);
        Calendar cal = Calendar.getInstance();
        cal.setTime(new Date());
        cal.add(Calendar.DATE, -Integer.parseInt(day));
        java.sql.Date date = new java.sql.Date(cal.getTime().getTime());
        /*---------sql----------*/
        // 3 幼儿活动
        if("3".equals(type)){
            sqlbuff.append("SELECT count(id) amount,DATE_FORMAT(create_time,'%Y-%m-%d') as `range` FROM base_child_activity_registration WHERE DATE_SUB(CURDATE(), INTERVAL "+day+" DAY) <= date(create_time) GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') ORDER BY create_time");
            listMaps = jdbcTemplate.queryForList(String.valueOf(sqlbuff));
            res.put("count",listMaps);
        }
        //41 老人-紧急呼叫
        if("41".equals(type)){
            sqlbuff.append("SELECT COUNT(id) amount,DATE_FORMAT(create_time,'%Y-%m-%d') AS `range` FROM base_emergency_assistance_order WHERE DATE_SUB(CURDATE(), INTERVAL "+day+" DAY) <= DATE(create_time) AND status >= 0 GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') ORDER BY create_time");
            listMaps = jdbcTemplate.queryForList(String.valueOf(sqlbuff));
            res.put("count",listMaps);
        }
        //43 老人 安放监护
        if ("43".equals(type)){
            sqlbuff.append("SELECT COUNT(id) amount,DATE_FORMAT(create_time,'%Y-%m-%d') AS `range` FROM base_security_monitoring_order WHERE DATE_SUB(CURDATE(), INTERVAL "+day+" DAY) <= DATE(create_time) AND status >= 0 GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') ORDER BY create_time");
            listMaps = jdbcTemplate.queryForList(String.valueOf(sqlbuff));
            res.put("count",listMaps);
        }
        // 1   活动浏览次数
        if ("1".equals(type)){
            sqlbuff.append("SELECT COUNT(id) amount,DATE_FORMAT(create_time,'%Y-%m-%d') AS `range` FROM base_activity_click WHERE DATE_SUB(CURDATE(), INTERVAL "+day+" DAY) <= DATE(create_time) AND activity_type = 1 GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') ORDER BY create_time");
            listMaps = jdbcTemplate.queryForList(String.valueOf(sqlbuff));
            res.put("count",listMaps);
        }
        // 2 公艺课程播放
        if ("2".equals(type)){
            sqlbuff.append("SELECT COUNT(id) amount,DATE_FORMAT(create_time,'%Y-%m-%d') AS `range` FROM base_activity_click WHERE DATE_SUB(CURDATE(), INTERVAL "+day+" DAY) <= DATE(create_time) AND activity_type = 2 GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') ORDER BY create_time");
            listMaps = jdbcTemplate.queryForList(String.valueOf(sqlbuff));
            res.put("count",listMaps);
        }
        /*----------es-----------*/
        // 39 老人-生活照料-服务工单数
        // 44 老人-生活照料-代预约
        // 28 新生儿-在线咨询总数
        // 32 新生儿-在线咨询总数
        // 35 新生儿-上门辅导-服务工单数
        if (!"3".equals(type)&&!"41".equals(type)&&!"43".equals(type)&&!"1".equals(type)&&!"2".equals(type)){
            JSONArray esResoult = addLine(String.valueOf(date),LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), area, level, type, timeLevel, interval, lowLevel);
            List<Map> maps = JSONObject.parseArray(esResoult.toJSONString(), Map.class);
            res.put("count",maps);
        }
        return null;
        return res;
    }
    /*综合总数*/
    public JSONObject combinedTotal(String type ,String endDate) throws Exception {
    public JSONObject combinedTotal(String type,String startDate,String endDate) throws Exception {
        JSONObject res = new JSONObject();
        String index = "";
        //es
@@ -205,13 +253,13 @@ public class StatisticsService {
        //41 老人-紧急呼叫
        //43 老人 安放监护
        //type 1 老人 2 幼儿
        if ("1".equals(type)){
        //type 42 老人 37 幼儿
        if ("42".equals(type)){
             index = "39,44";
            String[] indexes = index.split(",");
            for(String ind:indexes){
                //总量
                SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(endDate, endDate, defalutArea, defalutLevel, ind, SaveModel.timeLevel_DDL);
                SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, defalutArea, defalutLevel, ind, SaveModel.timeLevel_DDL);
                res.put("index_"+ind,saveModel.getResult2().longValue());
            }
            String emergencyCallSql = "SELECT COUNT(1) FROM base_emergency_assistance_order WHERE status >= 0 ";
@@ -225,12 +273,12 @@ public class StatisticsService {
            String[] indexes = index.split(",");
            for(String ind:indexes){
                //总量
                SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(endDate, endDate, defalutArea, defalutLevel, ind, SaveModel.timeLevel_DDL);
                SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, defalutArea, defalutLevel, ind, SaveModel.timeLevel_DDL);
                res.put("index_"+ind,saveModel.getResult2().longValue());
            }
            //   活动浏览次数
            //   公艺课程播放
            // activity-1   活动浏览次数
            // activity-2   公艺课程播放
            String sql = " select type,num from base_child_activity_click where type in(1,2)";
            List<Map<String,Object>> lists = jdbcTemplate.queryForList(sql);
            for (Map<String,Object> tmp:lists){
@@ -243,7 +291,7 @@ public class StatisticsService {
            Integer count = jdbcTemplate.queryForObject(sqlActivity,Integer.class);
            res.put("activity_3",count);
        }
        return null;
        return res;
    }
    public JSONObject serviceResources(){
@@ -1581,8 +1629,6 @@ public class StatisticsService {
    }
    /*大屏 老人云照护 病人分析 */
    public JSONObject patientAnalysisDP(String endDate, String area, int level,String index) throws Exception{
        JSONObject res = new JSONObject();

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -1121,6 +1121,22 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
        }
    }
    @ApiOperation("获取智慧药房取药信息")
    @RequestMapping(value = "getBuyDrugMessage",method = {RequestMethod.GET})
    public ObjEnvelop getBuyDrugMessage(@ApiParam(name = "deviceid", defaultValue = "设备id")
                                        @RequestParam(value = "deviceid", required = true) String deviceid,
                                        @ApiParam(name = "startTime", defaultValue = "开始时间")
                                        @RequestParam(value = "startTime", required = true) String startTime,
                                        @ApiParam(name = "endTime", defaultValue = "开始时间")
                                        @RequestParam(value = "endTime", required = true) String endTime){
        try {
            JSONObject jsonObject = monitorPlatformService.getBuyDrugMessage(deviceid,startTime,endTime);
            return ObjEnvelop.getSuccess("成功",jsonObject,200);
        } catch (Exception e) {
            return ObjEnvelop.getError("失败"+e.getMessage());
        }
    }
    @ApiOperation("智慧药房库存检测信息")
    @RequestMapping(value = "getYgStockDetection", method = {RequestMethod.GET})
    public ObjEnvelop getYgStockDetection(@ApiParam(name = "deviceid", defaultValue = "设备id")

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

@@ -3,7 +3,6 @@ package com.yihu.iot.service.monitorPlatform;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonArray;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.dao.equipment.IotEquipmentDetailDao;
import com.yihu.iot.service.analyzer.WlyyIotTzDict;
@@ -1911,10 +1910,10 @@ public class MonitorPlatformService {
            JSONObject quyaoQbject = mediicineorderList.getJSONObject(i);
            //取药方式（1、扫码，2、医保卡）
            String shippingType = quyaoQbject.getString("shippingType");
            String payTime = quyaoQbject.getString("payTime");
            String shippingTime = quyaoQbject.getString("shippingTime");
            String name = quyaoQbject.getString("name");
            listMap.put("shippingType", shippingType);
            listMap.put("payTime", payTime);
            listMap.put("shippingTime", shippingTime);
            listMap.put("name", name);
            mediicineorderListMap.add(listMap);
        }
@@ -2008,6 +2007,19 @@ public class MonitorPlatformService {
        }
    }
    /*取药信息*/
    public JSONObject getBuyDrugMessage(String deviceid, String startTime,String endTime) throws Exception {
        Map parameterMap = new HashMap<String, String>();
        parameterMap.put("deviceId", deviceid);
        parameterMap.put("startTime", startTime);
        parameterMap.put("endTime", endTime);
        String content = com.alibaba.fastjson.JSONObject.toJSONString(parameterMap);
        String params = AesEncryptUtils.agEncrypt(content);
        JSONObject jsonObject = getUrl("/open/noLogin/getDeviceOrderInfo", params, "detailModelList");
        System.out.println(jsonObject);
        return jsonObject;
    }
    /*智慧药房库存检测
     * 药房有6层，每层40个货道
     * 商品状态：未设商品、已有商品