Merge branch 'medicare' of liubing/wlyy2.0 into medicare

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

@@ -244,6 +244,7 @@ public class BaseRequestMapping {
        public static final String updateDeviceCargoState = "/updateDeviceCargoState";
        public static final String getDeviceList = "/getDeviceList";
        public static final String getDeviceListWlyy = "/getDeviceListWlyy";//i健康获取设备列表
        public static final String getDeviceInfo = "/getDeviceInfo";
        public static final String getDeviceOrderInfo = "/getDeviceOrderInfo";
        public static final String getDeviceOrderInfoPage = "/getDeviceOrderInfoPage";

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

@@ -302,6 +302,13 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(deviceService.getDeviceList());
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceListWlyy)
    @ApiOperation(value = "物联网大屏-获取设备列表")
    public Envelop getDeviceListWlyy(@ApiParam(value = "orgCode",readOnly = false)
                                         @RequestParam(name = "orgCode",required = false)String orgCode) throws Exception {
        return success(deviceService.getDeviceListWlyy(orgCode));
    }
    @GetMapping(value = "roleDictList")
    @ApiOperation(value = "获取用户角色字典")
    public Envelop roleDictList() throws Exception {

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

@@ -852,10 +852,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                Mediicineorder order = orderDao.findOne(medicineShipmentLog.getOrderId());
                order.setSellState("1");
                if (org.apache.commons.lang.StringUtils.isNotBlank(order.getApplyNo())){
                    Boolean flag = sickPhysicDosage(order.getBelongCommunity(),order.getApplyNo());
                    Boolean flag = sickPhysicDosage(order.getBelongCommunity(),order.getApplyNo(),order.getDeptNum());
                    logger.info("flag"+flag);
                }else {
                    Boolean flag = scanQrdispensaryCode(order.getPickUpNum());
                    Boolean flag = scanQrdispensaryCode(order.getPickUpNum(),medicineShipmentLog.getEquNum());
                    logger.info("flag"+flag);
                }
@@ -1192,7 +1192,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     * @param code
     * @return
     */
    public boolean scanQrdispensaryCode(String code){
    public boolean scanQrdispensaryCode(String code,String deviceNum){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("scanQrdispensaryCode");
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
@@ -1210,6 +1210,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            //设置入参
            List<NameValuePair> p = new ArrayList<>();
            p.add(new BasicNameValuePair("code", code));
            p.add(new BasicNameValuePair("equ_num", deviceNum));
            //设置头部
            token = rsjson.getJSONObject("result").getString("accesstoken");
@@ -1300,7 +1301,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
     *
     * @return
     */
    public boolean sickPhysicDosage(String orgCode,String applyNo){
    public boolean sickPhysicDosage(String orgCode,String applyNo,String deptNum){
        OauthWlyyConfigDO oauthWlyyConfigDO = oauthWlyyConfigDao.findOne("sickPhysicDosage");
        //token获取accesstoken
        List<NameValuePair> params = new ArrayList<>();
@@ -1383,6 +1384,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            List<NameValuePair> p = new ArrayList<>();
            p.add(new BasicNameValuePair("orgCode", orgCode));
            p.add(new BasicNameValuePair("cardNo", cardNo));
            p.add(new BasicNameValuePair("equ_num", deviceId));
            //设置头部
            token = rsjson.getJSONObject("result").getString("accesstoken");
@@ -1427,6 +1429,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                    mediicineorder.setSocialSecurityCardNum(cardNo);
                                    mediicineorder.setBelongCommunity(orgCode);
                                    mediicineorder.setCommunity(community);
                                    mediicineorder.setDeptNum(jsonObject.getString("EXEC_DEPT"));
                                    mediicineorder.setDoctorName(jsonObject.getString("APPLY_OPERATOR_NAME"));
                                    mediicineorder.setPrescribeTime(DateUtil.strToDateLong(jsonObject.getString("APPLY_TIME")+" 00:00:00"));
                                    mediicineorder.setPayTime(DateUtil.strToDateLong(jsonObject.getString("APPLY_TIME")+" 00:00:00"));

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

@@ -5258,6 +5258,19 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return object;
    }
    /**
     * i健康获取药柜设备列表
     * @return
     */
    public List<Map<String,Object>> getDeviceListWlyy(String orgCode){
        List<Map<String,Object>> result = new ArrayList<>();
        String sql = " select belong_community,equ_num,equ_name from t_mediicine_device where del=1 ";
        if (org.apache.commons.lang.StringUtils.isNotBlank(orgCode)){
            sql += " and belong_community='"+orgCode+"' ";
        }
        result = jdbcTemplate.queryForList(sql);
        return result;
    }
    /**
     * 物联网大屏单个设备信息数据