跟新相关bug

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

@@ -238,6 +238,7 @@ public class BaseRequestMapping {
        public static final String getDeviceList = "/getDeviceList";
        public static final String getDeviceInfo = "/getDeviceInfo";
        public static final String getDeviceOrderInfo = "/getDeviceOrderInfo";
        public static final String getDeviceOrderInfoPage = "/getDeviceOrderInfoPage";
        public static final String getDeviceStatistics = "/getDeviceStatistics";
        public static final String getDevicePriceStatistics = "/getDevicePriceStatistics";

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineorderDao.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -35,6 +36,13 @@ public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineo
    @Query("select a from Mediicineorder a where a.shippingEqu=?1 and a.shippingTime>=?2 and a.shippingTime<=?3 and a.sellState=1 order by a.shippingTime desc ")
    List<Mediicineorder> findByEquNumAndDate(String equNum,Date startTime,Date endTime);
    @Query("select a from Mediicineorder a where a.shippingEqu=?1  and a.sellState=1 order by a.shippingTime desc ")
    List<Mediicineorder> findByEquNumAndPage(String equNum, Pageable pageable);
    @Query("select a from Mediicineorder a where a.shippingEqu=?1 and a.shippingTime>=?2 and a.shippingTime<=?3 and a.sellState=1 ")
    List<Mediicineorder> findByEquNumAndDateAndPage(String equNum, Date startTime, Date endTime, Pageable pageable);
    Mediicineorder findMediicineorderByPickUpNum(String pickUpNum);

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

@@ -808,16 +808,20 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success(medicineServive.systemUpdate(equNum,type,mess));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceOrderInfo)
    @ApiOperation(value = "物联网大屏-获取某台设备订单详情")
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceOrderInfoPage)
    @ApiOperation(value = "设备信息--取药信息")
    public Envelop getDeviceInfo(
            @ApiParam(name = "deviceId", value = "设备Id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId,
            @ApiParam(name = "startTime", value = "开始时间", required = true)
            @RequestParam(value = "startTime", required = true) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = true)
            @RequestParam(value = "endTime", required = true) String endTime) throws Exception {
        return success(deviceService.getDeviceOrderInfo(deviceId,startTime,endTime));
            @RequestParam(value = "deviceId", required = false) String deviceId,
            @ApiParam(name = "startTime", value = "开始时间", required = false)
            @RequestParam(value = "startTime", required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false)
            @RequestParam(value = "endTime", required = false) String endTime,
            @ApiParam(name = "page", value = "页码", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        return success(deviceService.getDeviceOrderInfoPage(deviceId,startTime,endTime,page,size));
    }

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

@@ -1,7 +1,6 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -15,19 +14,17 @@ import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.common.LatitudeUtils;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.jsoup.helper.DataUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -3986,6 +3983,30 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return mediicineorderList;
    }
    /**
     * 物联网大屏单个设备信息数据
     * @return
     */
    public List<Mediicineorder> getDeviceOrderInfoPage(String deviceId,String startTime,String endTime,Integer page,Integer size) throws ParseException {
        JSONObject jsonObject = new JSONObject();
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        Sort sort = new Sort(Sort.Direction.DESC, "shippingTime");
        PageRequest pageRequest = new PageRequest(page, size, sort);
        List<Mediicineorder> mediicineorderList = new ArrayList<>();
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)&& org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
            Date startDate = DateUtil.strToDateLong(startTime);
            Date endDate = DateUtil.strToDateLong(endTime);
            mediicineorderList = mediicineorderDao.findByEquNumAndDateAndPage(mediicinedevice.getEquNum(),startDate,endDate,pageRequest);
        }else {
            mediicineorderList = mediicineorderDao.findByEquNumAndPage(mediicinedevice.getEquNum(),pageRequest);
        }
        for (Mediicineorder mediicineorder:mediicineorderList){
            List<Mediicineorderdetail> mediicineorderdetails = mediicineorderdetailDao.findMediicineorderdetailsByIdOrder(mediicineorder.getId());
            mediicineorder.setMediicineorderdetails(mediicineorderdetails);
        }
        return mediicineorderList;
    }
    /**
     * 总览-设备