Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

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

@@ -52,6 +52,7 @@ public class BaseRequestMapping {
        public static final String CREATE  = "/create";
        public static final String createUp  = "/createUp";
        public static final String getUpDetailListById  = "/getUpDetailListById";
        public static final String getUpDetailById  = "/getUpDetailById";
        public static final String getRecordDetailListById  = "/getRecordDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
@@ -137,6 +138,7 @@ public class BaseRequestMapping {
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getDeviceListByUserId  = "/getDeviceListByUserId";
        public static final String getUserListByDeviceId  = "/getUserListByDeviceId";
        public static final String getOutOfStockDeviceList  = "/getOutOfStockDeviceList";
        public static final String getDetialOutOfStock  = "/getDetialOutOfStock";
        public static final String countall  = "/countall";

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

@@ -7,6 +7,7 @@ import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineuser;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -141,6 +142,16 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getUserListByDeviceId)
    @ApiOperation(value = "通过设备id获取补货员列表" , notes="获取补货员列表")
    public ListEnvelop<Mediicineuser> getUserListByDeviceId(
            @ApiParam(name = "deviceId", value = "设备id", required = true)
            @RequestParam(value = "deviceId") String deviceId) throws Exception {
        JSONObject jsonObject = deviceService.getUsers(deviceId);
        List<Mediicineuser> list = JSONObject.parseArray(jsonObject.getJSONArray("msg").toJSONString(), Mediicineuser.class);
        return success(list, Mediicineuser.class);
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.FINDBYID)
    @ApiOperation(value = "获取设备信息" , notes="获取设备信息")
    public Envelop getdevicedetail(

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

@@ -126,6 +126,20 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.getUpDetailById)
    @ApiOperation(value = "备货单id获取备货详细信息" , notes="获取药品备货详细信息")
    public Envelop getUpDetailById(
            @ApiParam(name = "idUp", value = "备货单id", required = true)
            @RequestParam(value = "idUp") String idUp) throws Exception {
        JSONObject result = new JSONObject();
        JSONObject jsonObject = stockupService.getUpDetailById(idUp);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getJSONObject("msg"));
    }
    @ApiOperation(value = "读备货单列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")

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

@@ -79,7 +79,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            mediicinestockup.setReplenishEqu(upDO.getDeviceId());
            mediicinestockup.setState("1");
            mediicinestockup.setReplenishInventory(String.valueOf(upDO.getDrugs().stream().mapToInt(DrugDO::getQty).sum()));
            mediicinestockup.setReplenishEr("123");
//            mediicinestockup.setReplenishEr("123");
            upDao.save(mediicinestockup);
            for (DrugDO drug : upDO.getDrugs()) {
                Mediicinedrugs mediicinedrugs = drugsDao.findOne(drug.getDrugId());
@@ -89,7 +89,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                mediicinestockupdetail.setDrugName(mediicinedrugs.getDrugName());
                mediicinestockupdetail.setProductPic(mediicinedrugs.getPic());
                mediicinestockupdetail.setOutofstock(drug.getQty().toString());
                mediicinestockupdetail.setWarehouses(drug.getQty().toString());
                mediicinestockupdetail.setClaim(drug.getQty().toString());
                mediicinestockupdetail.setQuantity(drug.getQty().toString());
                updetailDao.save(mediicinestockupdetail);
            }
@@ -261,7 +261,20 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        return updetailDao.getoutdetail(idstockup);
    }
    public JSONObject getUpDetailById(String idstockup) {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(idstockup)){
            result.put("msg","idstockup is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("info", upDao.findOne(idstockup));
        jsonObject.put("list", updetailDao.getoutdetail(idstockup));
        result.put("msg", jsonObject);
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
    //补货记录
    public JSONObject getRecordByPage(

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

@@ -206,7 +206,19 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        for (Map<String, Object> stringObjectMap : list) {
            if(!StringUtils.isEmpty(stringObjectMap.get("status"))){
                if ("1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "在线");
                }
                if ("0".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "离线");
                }
                if ("-1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "异常");
                }
            }
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
@@ -307,7 +319,19 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        for (Map<String, Object> stringObjectMap : list) {
            if(!StringUtils.isEmpty(stringObjectMap.get("status"))){
                if ("1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "在线");
                }
                if ("0".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "离线");
                }
                if ("-1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "异常");
                }
            }
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
@@ -387,7 +411,69 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        for (Map<String,Object> map:list){
        for (Map<String, Object> stringObjectMap : list) {
            if(!StringUtils.isEmpty(stringObjectMap.get("status"))){
                if ("1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "在线");
                }
                if ("0".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "离线");
                }
                if ("-1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "异常");
                }
            }
        }
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    /**
     * 根据设备id，查询与之绑定的补货员
     * @param deviceId
     * @return
     * @throws Exception
     */
    public JSONObject getUsers(String deviceId) throws Exception {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId)){
            result.put("msg","parameter deviceId is null ");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        String sql = "SELECT\n" +
                "    t.id AS id,\n" +
                "    t.account AS account,\n" +
                "    t.belong_community AS belongCommunity,\n" +
                "    t.bir_date AS birDate,\n" +
                "    t.confirm_password AS confirmPassword,\n" +
                "    t.contact_info AS contactInfo,\n" +
                "    t.`name` AS `name`,\n" +
                "    t.`password` AS `password`,\n" +
                "    t.res_med_cabinet AS resMedCabinet,\n" +
                "    t.res_pon_area AS resPonArea,\n" +
                "    t.role AS role,\n" +
                "    t.sex AS sex,\n" +
                "    t.create_time AS createTime,\n" +
                "    t.create_user AS createUser,\n" +
                "    t.create_user_name AS createUserName,\n" +
                "    t.update_time AS updateTime,\n" +
                "    t.update_user AS updateUser,\n" +
                "    t.update_user_name AS updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_user AS t where\n";
        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and du.device_id = " + deviceId + ")";
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        for (Map<String, Object> stringObjectMap : list) {
        }
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
@@ -592,12 +678,32 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql);
        for (Map<String, Object> stringObjectMap : list) {
            if(!StringUtils.isEmpty(stringObjectMap.get("status"))){
                if ("1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "在线");
                }
                if ("0".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "离线");
                }
                if ("-1".equals(stringObjectMap.get("status").toString())) {
                    stringObjectMap.put("statusName", "异常");
                }
            }
        }
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg",list);
        return result;
    }
    /**
     * 获取所属id的缺货信息
     * @param ids
     * @return
     * @throws Exception
     */
    public JSONObject getDetialOutOfStock(String ids) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
@@ -638,7 +744,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.ratio AS ratio,\n" +
                "    t.cargo_capacity AS cargoCapacity\n" +
                "FROM\n" +
                "    t_mediicine_device AS t WHERE id in(" + ids + ",'')";
                "    t_mediicine_device AS t WHERE  t.id in (" + ids + ")";
        String sencordSql = "SELECT\n" +
                "\ttmi.layer_no AS layerNo,\n" +
                "\ttmi.wayer_no AS wayerNo,\n" +