common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -219,9 +219,16 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     */
    private String socialSecurityCardNum;
    /*
    社区id
    */
    private String belongCommunity;
    /*
    社区名
    * */
    private String community;
    public Mediicineorder() {
    }
@@ -314,6 +321,14 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        this.idNum = idNum;
    }
    public String getCommunity() {
        return community;
    }
    public void setCommunity(String community) {
        this.community = community;
    }
    public String getInfoAccess() {
        return infoAccess;
    }

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

@@ -218,6 +218,7 @@ public class BaseRequestMapping {
        public static final String  updateMediicinecabineInventory = "/updateMediicinecabineInventory";
        public static final String selectMediicinecabineInventoryById="/selectMediicinecabineInventoryById";
        public static final String updateMediicinecabineInventoryInfoById = "/updateMediicinecabineInventoryInfoById";
        public static final String uploadDeviceInfo = "/uploadDeviceInfo";
    }
    /**

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

@@ -187,19 +187,19 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            for (Map<String,Object> tmp : list) {
                addCell(sheet, j, 0, ii + "img");
                addCell(sheet, j, 1, tmp.get("drugNameAlies") +"/" + tmp.get("drugBarCode"));
                addCell(sheet, j, 2, tmp.get("drugTypeCode")==null?"":new String(tmp.get("drugTypeCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 3, tmp.get("dosForm")==null?"":new String(tmp.get("dosForm").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 4, tmp.get("drugTypeCode")==null?"":new String(tmp.get("drugTypeCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 5, tmp.get("unit")==null?"":new String(tmp.get("unit").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 6, tmp.get("price")==null?"":new String(tmp.get("price").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 7, tmp.get("inventory")==null?"":new String(tmp.get("inventory").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 8, tmp.get("saleVolume")==null?"":new String(tmp.get("saleVolume").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 9, tmp.get("selfCode")==null?"":new String(tmp.get("selfCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 10, tmp.get("specif") == null?"":new String(tmp.get("specif").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 11, tmp.get("manufactor") ==null? "":new String(tmp.get("manufactor").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 12, tmp.get("approvalNum") ==null? "":new String(tmp.get("approvalNum").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 13, tmp.get("brand") ==null? "":new String(tmp.get("brand").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 14, tmp.get("state") ==null? "":new String(tmp.get("state").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 2, tmp.get("drugTypeCode")==null?"":tmp.get("drugTypeCode").toString());
                addCell(sheet, j, 3, tmp.get("dosForm")==null?"":tmp.get("dosForm").toString());
                addCell(sheet, j, 4, tmp.get("drugTypeCode")==null?"":tmp.get("drugTypeCode").toString());
                addCell(sheet, j, 5, tmp.get("unit")==null?"":tmp.get("unit").toString());
                addCell(sheet, j, 6, tmp.get("price")==null?"":tmp.get("price").toString());
                addCell(sheet, j, 7, tmp.get("inventory")==null?"":tmp.get("inventory").toString());
                addCell(sheet, j, 8, tmp.get("saleVolume")==null?"":tmp.get("saleVolume").toString());
                addCell(sheet, j, 9, tmp.get("selfCode")==null?"":tmp.get("selfCode").toString());
                addCell(sheet, j, 10, tmp.get("specif") == null?"":tmp.get("specif").toString());
                addCell(sheet, j, 11, tmp.get("manufactor") ==null? "":tmp.get("manufactor").toString());
                addCell(sheet, j, 12, tmp.get("approvalNum") ==null? "":tmp.get("approvalNum").toString());
                addCell(sheet, j, 13, tmp.get("brand") ==null? "":tmp.get("brand").toString());
                addCell(sheet, j, 14, tmp.get("state") ==null? "":tmp.get("state").toString());
                j++;
                ii++;
            }

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

@@ -165,4 +165,18 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(jsonObject.getString("response"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.uploadDeviceInfo)
    @ApiOperation(value = "上传设备预警信息")
    public Envelop uploadDeviceInfo(
            @ApiParam(name = "equNum", value = "设备编码", required = true)
            @RequestParam(value = "equNum", required = true) String equNum,
            @ApiParam(name = "temperature", value = "温度", required = false)
            @RequestParam(value = "temperature", required = false) Float temperature,
            @ApiParam(name = "humidity", value = "湿度", required = false)
            @RequestParam(value = "humidity", required = false) Float humidity,
            @ApiParam(name = "type",value = "故障类型",required = false)
            @RequestParam(value = "type",required = false)String type) throws Exception {
        return success(deviceService.uploadDeviceInfo(equNum,temperature,humidity,type));
    }
}

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

@@ -50,6 +50,8 @@ public class MedOrderService {
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setBelongCommunity(params.getString("belong_community"));
            mediicineorder.setCommunity(params.getString("community"));
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));

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

@@ -71,6 +71,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicinedrugsDao mediicinedrugsDao;
    @Autowired
    private MediicinewarrayDao mediicinewarrayDao;
    @Transactional(rollbackFor = Exception.class)
@@ -434,6 +436,31 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    /**
     * 更新设备网络状态
     * @param
     * @param
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Mediicinewarray  uploadDeviceInfo(String equNum, Float temperature,Float humidity,String type){
        Mediicinewarray mediicinewarray = new Mediicinewarray();
        Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(equNum);
        mediicinewarray.setEquNum(mediicinedevice.getEquNum());
        mediicinewarray.setEquName(mediicinedevice.getEquName());
        mediicinewarray.setEquArea(mediicinedevice.getEquArea());
        mediicinewarray.setEquClass(mediicinedevice.getEquClass());
        mediicinewarray.setCommunity(mediicinedevice.getCommunity());
        mediicinewarray.setType(type);
        mediicinewarray.setBelongCommunity(mediicinedevice.getBelongCommunity());
        mediicinewarray.setTemperature(temperature);
        mediicinewarray.setHumidity(humidity);
        mediicinewarray.setEquType(mediicinedevice.getEquType());
        mediicinewarray.setEquInfo(mediicinedevice.getEquInfo());
        mediicinewarray.setLogTime(new Date());
        return mediicinewarrayDao.save(mediicinewarray);
    }
    /**
     * 更新设备销售状态
     * @param deviceId