[解决bug]

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

@@ -34,8 +34,11 @@ public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicine
    Mediicinedevice findMediicinedeviceByEquNum(String equNum);
    @Query(value = "select * from t_mediicine_device as a where 1=1 limit ?1,?2 ",nativeQuery = true)
    Iterable<Mediicinedevice> findDeviceAll(int page, int size);
    @Query(value = "select a.* from t_mediicine_device as a where 1=1 and a.belong_community=?3 limit ?1,?2 ",nativeQuery = true)
    List<Mediicinedevice> findDeviceByCommunity(int page, int size,String belongCommunity);
    @Query(value = "select a.* from t_mediicine_device as a where 1=1 and a.equ_num=?3 limit ?1,?2 ",nativeQuery = true)
    List<Mediicinedevice> findDeviceByEquNum(int page, int size,String equNum);
    //查询已使用设备列表
    @Query("select a from Mediicinedevice a where a.del = 1 and a.belongCommunity is not null  ")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/BaseServiceNoEntryPoint.java

@@ -56,6 +56,9 @@ public class BaseServiceNoEntryPoint extends EnvelopRestEndpoint {
    @Value("${testPattern.remote_inner_url}")
    private String remote_inner_url;
    @Autowired
    MedicinedeviceService deviceService;
    @PostMapping(value = BaseRequestMapping.FileUpload.UPLOAD_STREAM_IMG)
    @ApiOperation(value = "文件流上传图片", notes = "文件流上传图片")
    public ObjEnvelop<UploadVO> uploadImg(@ApiParam(value = "文件", required = true)
@@ -95,4 +98,40 @@ public class BaseServiceNoEntryPoint extends EnvelopRestEndpoint {
        UploadVO uploadVO = fileUploadService.uploadImages(jsonData,fastdfs_file_url);
        return success("上传成功", uploadVO);
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateShipmentLogPic)
    @ApiOperation(value = "更新出货单信息-出货图片")
    public String updateShipmentLogPic(
            @ApiParam(name = "shipmentLogId", value = "出货单id", required = true)
            @RequestParam(value = "shipmentLogId", required = true) String shipmentLogId,
            @ApiParam(name = "picPath", value = "图片路径", required = true)
            @RequestParam(value = "picPath") String picPath) throws Exception {
        if (StringUtils.isEmpty(shipmentLogId) || StringUtils.isEmpty(picPath)){
            return "参数缺失";
        }
        if (!deviceService.updateShipmentLogPic(shipmentLogId, picPath)) {
            return "更新失败";
        }
        return "更新成功";
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateDeviceCargoState)
    @ApiOperation(value = "更新设备货道状态")
    public String updateDeviceCargoState(
            @ApiParam(name = "equNum", value = "设备编号", required = true)
            @RequestParam(value = "equNum", required = true) String equNum,
            @ApiParam(name = "layerNo", value = "层", required = true)
            @RequestParam(value = "layerNo") String layerNo,
            @ApiParam(name = "wayerNo", value = "列", required = true)
            @RequestParam(value = "wayerNo") String wayerNo,
            @ApiParam(name = "state", value = "目标货道状态", required = true)
            @RequestParam(value = "state") String state) throws Exception {
        if (StringUtils.isEmpty(equNum) || StringUtils.isEmpty(layerNo) || StringUtils.isEmpty(wayerNo) || StringUtils.isEmpty(state)){
            return "参数缺失";
        }
        if (!deviceService.updateDeviceCargoState(equNum, layerNo, wayerNo, state)) {
            return "更新失败";
        }
        return "更新成功";
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -12,6 +12,7 @@ import com.yihu.jw.entity.a1entity.Mediicinewarray;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
@@ -265,6 +266,14 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(deviceService.getDeviceList());
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.findMediicinecabinetInventoryByDeviceId)
    @ApiOperation(value = "根据设备id查询设备轨道数据", notes = "根据设备id查询设备轨道数据")
    public ListEnvelop selectById(
            @ApiParam(name = "deviceId", value = "设备id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId) throws Exception {
        return success(deviceService.selectById(deviceId));
    }
    @RequestMapping("/fileUpload")
    @ApiOperation("文件上传")
    public String handleFileUpload(@RequestParam("file") MultipartFile file) {

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

@@ -29,6 +29,7 @@ import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wlyy.dao.OauthWlyyConfigDao;
import com.yihu.mysql.query.BaseJpaService;
import com.ylzinfo.onepay.sdk.utils.StringUtil;
import jxl.format.VerticalAlignment;
import jxl.write.*;
import org.apache.commons.collections.map.HashedMap;
@@ -353,7 +354,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        if (!StringUtils.isEmpty(dispensingWindow)) {
            conditionSql += " and t.dispensing_window = '" + dispensingWindow + "'";
        }
        sencodSql = sencodSql + conditionSql;
        sencodSql = sencodSql + conditionSql + " order by  t.prescribe_time desc,t.sell_state asc ";
        orderList = hibenateUtils.createSQLQuery(sencodSql, page, size);
@@ -1802,96 +1803,22 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, int page, int size) {
        List<Map<String,Object>> mapList=new ArrayList<>();
        //查询出所有的设备
        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)) {
            page=(page-1)*size;
            Iterable<Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page, size);
            for (Mediicinedevice mediicinedevice : mediicinedevices) {
                Map<String, Object> map = new HashMap<>();
                map.put("community", mediicinedevice.getCommunity());
                map.put("equName", mediicinedevice.getEquNum() + (mediicinedevice.getEquName() == null ? "" : "/" + mediicinedevice.getEquName()));
                String oneSql = "SELECT SUM(t.amount) AS sumAmount,\n" +
                        "                COUNT(*) AS count,\n" +
                        "                t.shipping_equ AS equNum\n" +
                        "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum() + "'";
                List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
                for (Map<String,Object> oneMap:list){
                    String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                    String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                    float price = Float.parseFloat(sumAmount);
                    BigDecimal b  =   new  BigDecimal(price);
                    float   m_price   =  b.setScale(2,  BigDecimal.ROUND_HALF_UP).floatValue();
                    map.put("ordercount",count);
                    map.put("sumAmount",m_price);
                }
                mapList.add(map);
            }
            String countSql = " select " +
                    "     COUNT(DISTINCT (t.id)) as count " +
                    "   from " +
                    "     t_mediicine_device as t " +
                    "  where " +
                    "  1=1   " ;
            Logger.getAnonymousLogger().info("finalCountSql="+countSql);
            int decCount = jdbcTemplate.queryForObject(countSql,Integer.class);
            //总页数
            int total=decCount/size+(decCount%size>0?1:0);
            MixEnvelop mixEnvelop = MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
            mixEnvelop.setTotalCount(decCount);
            mixEnvelop.setTotalPage(total);
            return mixEnvelop;
        }
        //将同一个设备的社区/名称/设备编码/历史记录/总金额放到一个Map中,并将这些Map放到同一个list中返回
            Map<String,Object> map=new HashMap<>();
            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
        page=(page-1)*size;
        List<Mediicinedevice> mediicinedevices = new ArrayList<>();
        if(org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&& !org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
            mediicinedevices= deviceDao.findDeviceByCommunity(page, size,belongCommunity);
        }else if(org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&& org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
            mediicinedevices= deviceDao.findDeviceByEquNum(page, size,equNum);
        }
        for (Mediicinedevice mediicinedevice : mediicinedevices) {
            Map<String, Object> map = new HashMap<>();
            map.put("community", mediicinedevice.getCommunity());
            map.put("equName", mediicinedevice.getEquNum() + (mediicinedevice.getEquName() == null ? "" : "/" + mediicinedevice.getEquName()));
            String oneSql = "SELECT SUM(t.amount) AS sumAmount,\n" +
                    "                COUNT(*) AS count,\n" +
                    "                t.shipping_equ AS equNum\n" +
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 ";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
                oneSql += "AND t.belong_community = '"+belongCommunity+"' ";
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
                    if (device==null){
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    if (device==null){
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
            }else {
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
//                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
//                    map.put("community",device.getCommunity());
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    if (device==null){
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
//                oneSql += "AND t.shipping_equ = '" + equNum + "'";
//                Mediicinedevice daoByEquNum=deviceDao.findMediicinedeviceByEquNum(equNum);
//                map.put("equName",daoByEquNum.getEquNum()+(daoByEquNum.getEquName()==null?"":"/"+daoByEquNum.getEquName()));
//            }else {
//                map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
//                oneSql += "AND t.shipping_time >= "+ startTime  ;
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
//                oneSql += "AND t.shipping_time <= "+ endTime ;
//            }
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum() + "'";
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
@@ -1903,9 +1830,20 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                map.put("sumAmount",m_price);
            }
            mapList.add(map);
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device as t " +
                "  where " +
                "  1=1   " ;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int decCount = jdbcTemplate.queryForObject(countSql,Integer.class);
        //总页数
        int total=decCount/size+(decCount%size>0?1:0);
        MixEnvelop mixEnvelop = MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
        mixEnvelop.setTotalPage(mapList.size()/size+(mapList.size()%size==0?0:1));
        mixEnvelop.setTotalCount(mapList.size());
        mixEnvelop.setTotalCount(decCount);
        mixEnvelop.setTotalPage(total);
        return mixEnvelop;
    }

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

@@ -347,6 +347,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        sql = sql + conditionSql +" order by t.state desc,t.doc_time desc  ";
        List<Map<String,Object>> list=null;
        System.out.print("sql"+sql);
        list = hibenateUtils.createSQLQuery(sql,page,size);
        String countSql = " select " +

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

@@ -756,16 +756,18 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
            if (mediicinedevice.getHumiditycontrol().equalsIgnoreCase("1")){
                if (humidity!=null&&(humidity>humidityHeight||humidity<humidityLow)){
                    if (StringUtils.isEmpty(type)){
                        type += "湿度异常";
                        type += "/湿度异常";
                    }else {
                        type +="/湿度异常";
                    }
                }
            }
        }else {
            type="湿度正常";
            type+="/湿度正常";
        }
        mediicinedevice.setTemperature(humidity+"");
        mediicinedevice.setHumidity(humidity+"");
        mediicinedevice.setNetworkStatus("1");
        mediicinedevice.setSaleStatus("1");
        deviceDao.save(mediicinedevice);
        Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type);
        result.put("msg",mediicinewarray);

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

@@ -888,7 +888,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            conditionSql += " AND t.sale_status = '" + saleStatus + "'";
        }
        sql = sql + conditionSql;
        sql = sql + conditionSql+ " and t.belong_community is not null ";
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);