Merge branch 'medicare' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -98,7 +98,7 @@ public class HealthCareService {
    private String ylzConfigSignKey;
    private String ylzConfigOrgCode;
    public static String entranceHealthCareUrl = "http://172.16.100.240:10023/healthCare/";
    public static String entranceHealthCareUrl = "http://127.0.0.1:10023/healthCare/";
    public void initConfig() throws Exception{
@@ -811,7 +811,7 @@ public class HealthCareService {
            throw new Exception("患者his信息不存在");
        }
        JSONObject data = new JSONObject();
        data.put("service_id","10000");
        data.put("service_id","100000");
        data.put("name",patientDO.getName());
        data.put("idcard",patientDO.getIdcard());
        data.put("cert_type","01");//TODO
@@ -864,7 +864,7 @@ public class HealthCareService {
            throw new Exception("患者his信息不存在");
        }
        JSONObject data = new JSONObject();
        data.put("service_id","10000");
        data.put("service_id","100000");
        data.put("name",patientDO.getName());
        data.put("idcard",patientDO.getIdcard());
        data.put("cert_type","01");//TODO

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/HcyyPrescriptionService.java

@@ -1199,4 +1199,361 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            return str;
        }
    }
    //======================合理用药===========================
    public String getUseDrugUrl(){
        List<WlyyHospitalSysDictDO> list =  wlyyHospitalSysDictDao.findByDictName("useDrugUrl");
        String url = list.get(0).getDictCode();
        return url;
    }
    /**
     * 3.1	基础标记
     *
     * @param hospitalCode 医院/院区编码
     * @param eventNo 就诊流水号
     * @param patientId 患者id
     * @param source 请求数据的来源，传入固定值：门诊
     * @return
     */
    public String initBaseParam(String hospitalCode,String eventNo,String patientId,String source){
        String base = "<base> ";
        source = "门诊";
        if (StringUtils.isNoneBlank(hospitalCode)){
            base +=" <hospital_code>"+hospitalCode+"</hospital_code> ";
        }
        if (StringUtils.isNoneBlank(eventNo)){
            base +=" <event_no>"+eventNo+"</event_no> ";
        }
        if (StringUtils.isNoneBlank(patientId)){
            base +=" <patient_id>"+patientId+"</patient_id> ";
        }
        if (StringUtils.isNoneBlank(source)){
            base +=" <source>"+source+"</source> ";
        }
        base+="</base>";
        return base;
    }
    /**
     *3.2	患者就诊
     * @param sex 传入4种值：男/女/M/F
     * @param name
     * @param idType 患者在医院登记的证件类型，如：身份证、户口本等
     * @param idNo 患者在医院登记证件对应的号码
     * @param birthWeight 患者出生时的体重, 必须包含数字和单位，计量单位：g，如3500g
     * @param birthday 患者的出生日期，格式：yyyy-mm-dd
     * @param medCardNo 患者就诊时所使用的医疗卡号
     * @param eventTime 患者到医院的就诊时间，一般为挂号时间，格式：yyyy-mm-dd hh24:mi:ss
     * @param deptId 系统运行核心关联字段，患者挂号的科室id
     * @param deptName 患者挂号的科室名称
     * @param payType 患者付费方式，如：自费、市医保、省医保等
     * @param pregnancy 是否怀孕 1: 是0: 否
     * @param timeOfPreg 孕期 孕妇的妊娠时长，只传数字，默认计量单位：周
     * @param breastFeeding 是否哺乳1: 是0: 否
     * @param height 身高
     * @param weight 体重
     * @param address 联系地址
     * @param phoneNo 联系电话
     * @param dialysis 是否透析 1: 是0: 否
     * @param patientCondition 一些笼统的描述信息，如：普通病人、危重病人
     * @return
     */
    public String initOptPatientParam(String sex,String name,String idType,String idNo,String birthWeight,String birthday,String medCardNo,
                                      String eventTime,String deptId,String deptName,String payType,String pregnancy,String timeOfPreg,String breastFeeding,
                                      String height,String weight,String address,String phoneNo,String dialysis,String patientCondition){
        String optPatient = "<opt_patient> ";
        if (StringUtils.isNoneBlank(sex)){
            optPatient +=" <sex>"+sex+"</sex> ";
        }
        if (StringUtils.isNoneBlank(name)){
            optPatient +=" <name>"+name+"</name> ";
        }
        if (StringUtils.isNoneBlank(idType)){
            optPatient +=" <id_type>"+idType+"</id_type> ";
        }
        if (StringUtils.isNoneBlank(idNo)){
            optPatient +=" <id_no>"+idNo+"</id_no> ";
        }
        if (StringUtils.isNoneBlank(birthWeight)){
            optPatient +=" <birth_weight>"+birthWeight+"</birth_weight> ";
        }
        if (StringUtils.isNoneBlank(birthday)){
            optPatient +=" <birthday>"+birthday+"</birthday> ";
        }
        if (StringUtils.isNoneBlank(medCardNo)){
            optPatient +=" <med_card_no>"+medCardNo+"</med_card_no> ";
        }
        if (StringUtils.isNoneBlank(eventTime)){
            optPatient +=" <event_time>"+eventTime+"</event_time> ";
        }
        if (StringUtils.isNoneBlank(deptId)){
            optPatient +=" <dept_id>"+deptId+"</dept_id> ";
        }
        if (StringUtils.isNoneBlank(deptName)){
            optPatient +=" <dept_name>"+deptName+"</dept_name> ";
        }
        if (StringUtils.isNoneBlank(payType)){
            optPatient +=" <pay_type>"+payType+"</pay_type> ";
        }
        if (StringUtils.isNoneBlank(pregnancy)){
            optPatient +=" <pregnancy>"+pregnancy+"</pregnancy> ";
        }
        if (StringUtils.isNoneBlank(timeOfPreg)){
            optPatient +=" <time_of_preg>"+timeOfPreg+"</time_of_preg> ";
        }
        if (StringUtils.isNoneBlank(breastFeeding)){
            optPatient +=" <breast_feeding>"+breastFeeding+"</breast_feeding> ";
        }
        if (StringUtils.isNoneBlank(height)){
            optPatient +=" <height>"+height+"</height> ";
        }
        if (StringUtils.isNoneBlank(weight)){
            optPatient +=" <weight>"+weight+"</weight> ";
        }
        if (StringUtils.isNoneBlank(address)){
            optPatient +=" <address>"+address+"</address> ";
        }
        if (StringUtils.isNoneBlank(phoneNo)){
            optPatient +=" <phone_no>"+phoneNo+"</phone_no> ";
        }
        if (StringUtils.isNoneBlank(dialysis)){
            optPatient +=" <dialysis>"+dialysis+"</dialysis> ";
        }
        if (StringUtils.isNoneBlank(patientCondition)){
            optPatient +=" <patient_condition>"+patientCondition+"</patient_condition> ";
        }
        optPatient+="</opt_patient>";
        return optPatient;
    }
    /**3.3.1	处方单
     *
     * @param recipeId  系统运行核心关联字段，一张处方实体的唯一标记，院内唯一，主键
     * @param recipeNo 如不存在，和处方id传值一样即可
     * @param recipeSource 三种值：门诊，急诊
     * @param recipeType 三种值：西药方，中成药方，草药方
     * @param recipeDocId 系统运行核心关联字段，开方医生工号
     * @param recipeDocName 开方医生姓名
     * @param recipeDocTitle 开方医生的职称，如：主治医师、副主任医师、主任医师等。
     * @param deptId 系统运行核心关联字段，开方医师所属科室id
     * @param deptName 开方医师所属科室名称
     * @param recipeTime 系统运行核心字段，格式：yyyy-mm-dd hh24:mi:ss
     * @param herbUnitPrice 如果是中药饮片处方，此处必填
     * @param herbPacketCount 如果是中药饮片处方，此处必填
     * @param recipeFeeTotal 处方总金额
     * @param recipeStatus 0: 新开或修改处方。数据要求：传入的所有药品明细发药数量值均必须大于0
     * @param originalRecipeId 当Recipe_status为1时表示退药处方时，则必须传入当前退药处方所对应原始处方的处方id
     * @param urgentFlag 用于处方的优先审核 1: 是0: 否
     * @return
     */
    public String initPrescriptionInfoParam(String recipeId,String recipeNo,String recipeSource,String recipeType,String recipeDocId,String recipeDocName,String recipeDocTitle,
                                      String deptId,String deptName,String recipeTime,String herbUnitPrice,String herbPacketCount,String recipeFeeTotal,
                                      String recipeStatus,String originalRecipeId,String urgentFlag){
        String optPatient = "<opt_prescription_info>";
        if (StringUtils.isNoneBlank(recipeId)){
            optPatient +=" <recipe_id>"+recipeId+"</recipe_id> ";
        }
        if (StringUtils.isNoneBlank(recipeNo)){
            optPatient +=" <recipe_no>"+recipeNo+"</recipe_no> ";
        }
        if (StringUtils.isNoneBlank(recipeSource)){
            optPatient +=" <recipe_source>"+recipeSource+"</recipe_source> ";
        }
        if (StringUtils.isNoneBlank(recipeType)){
            optPatient +=" <recipe_type>"+recipeType+"</recipe_type> ";
        }
        if (StringUtils.isNoneBlank(recipeDocId)){
            optPatient +=" <recipe_doc_id>"+recipeDocId+"</recipe_doc_id> ";
        }
        if (StringUtils.isNoneBlank(recipeDocName)){
            optPatient +=" <recipe_doc_name>"+recipeDocName+"</recipe_doc_name> ";
        }
        if (StringUtils.isNoneBlank(recipeDocTitle)){
            optPatient +=" <recipe_doc_title>"+recipeDocTitle+"</recipe_doc_title> ";
        }
        if (StringUtils.isNoneBlank(deptId)){
            optPatient +=" <dept_id>"+deptId+"</dept_id> ";
        }
        if (StringUtils.isNoneBlank(deptName)){
            optPatient +=" <dept_name>"+deptName+"</dept_name> ";
        }
        if (StringUtils.isNoneBlank(recipeTime)){
            optPatient +=" <recipe_time>"+recipeTime+"</recipe_time> ";
        }
        if (StringUtils.isNoneBlank(herbUnitPrice)){
            optPatient +=" <herb_unit_price>"+herbUnitPrice+"</herb_unit_price> ";
        }
        if (StringUtils.isNoneBlank(herbPacketCount)){
            optPatient +=" <herb_packet_count>"+herbPacketCount+"</herb_packet_count> ";
        }
        if (StringUtils.isNoneBlank(recipeFeeTotal)){
            optPatient +=" <recipe_fee_total>"+recipeFeeTotal+"</recipe_fee_total> ";
        }
        if (StringUtils.isNoneBlank(recipeStatus)){
            optPatient +=" <recipe_status>"+recipeStatus+"</recipe_status> ";
        }
        if (StringUtils.isNoneBlank(originalRecipeId)){
            optPatient +=" <original_recipe_id>"+originalRecipeId+"</original_recipe_id> ";
        }
        if (StringUtils.isNoneBlank(urgentFlag)){
            optPatient +=" <urgent_flag>"+urgentFlag+"</urgent_flag> ";
        }
        optPatient+="</opt_prescription_info>";
        return optPatient;
    }
    /**
     * 3.3.2	处方明细
     *
     * @param recipeId 系统运行核心关联字段，一张处方实体的唯一标记，院内唯一，主键
     * @param recipeItemId 系统运行核心关联字段，唯一标记处方中的每一项药物医嘱
     * @param drugId 系统运行核心关联字段，医院药品id，传入约定的药品编码
     * @param drugName 药品的通用名称
     * @param specification 药品规格的描述，如0.5gx24
     * @param preparation 药品剂型名称
     * @param manufacturerName 药品产地名称
     * @param countUnit 如果一盒药品12片，发药单位为片时，包装规格数量为1
     * @param drugDose 医生开立的单次给药剂量，值必须是数字+单位，如：0.5g 、200ml等
     * @param despensingNum 当处方状态为-1(部分药品退费退药)时，这里填写负值，表示具体退多少。
    正常处方状态情况，请填写最终生效值，表示最终的发药数量。
     * @param packUnit  发药单位，和发药数量对应，例如：瓶、盒、片等
     * @param unitPrice 药品的费用单价
     * @param feeTotal 药品的单价*发药数量，计量单位为元　
     * @param groupNo 药物的分组号，同组药物组号一致。
     * @param drugAdminRouteName 传入约定的药品使用途径，如：静脉推注等
     * @param drugUsingFreq 传入约定的药品给药频次，如：qd、bid等，
     * @param drugUsingTimePoint 药品给药时机，如：饭前、饭后、空腹等
     * @param drugUsingAim 药品的用药目的，预防|治疗|其他
     * @param drugUsingArea 药品使用部位
     * @param infusionSpeed 静脉输液药品滴注时长或速度的描述，需同时包含数字和单位，如：1小时、20滴/分钟
     * @param duration 由医生指定的药品使用天数或次数，如：5天，10次等
     * @param specialPrompt 备注信息，如饮片的先煎、后下等
     * @param skinTestFlag 1: 皮试0: 非皮试
     * @param skinTestResult 皮试结果
     * @param ouvasFlag 门诊静配标志
     * @param medicareType 结算方式
     * @param startTime 开始使用时间
     * @param endTime 结束使用时间
     * @return
     */
    public String initPrescriptionItemParam(String recipeId,String recipeItemId,String drugId,String drugName,String specification,String preparation,String manufacturerName,
                                            String countUnit,String drugDose,String despensingNum,String packUnit,String unitPrice,String feeTotal,
                                            String groupNo,String drugAdminRouteName,String drugUsingFreq,String drugUsingTimePoint,String drugUsingAim,String drugUsingArea,
                                            String infusionSpeed,String duration,String specialPrompt,String skinTestFlag,String skinTestResult,String ouvasFlag,
                                            String medicareType,String startTime,String endTime){
        String optPatient = "<opt_prescription_item>";
        if (StringUtils.isNoneBlank(recipeId)){
            optPatient +=" <recipe_id>"+recipeId+"</recipe_id> ";
        }
        if (StringUtils.isNoneBlank(recipeItemId)){
            optPatient +=" <recipe_item_id>"+recipeItemId+"</recipe_item_id> ";
        }
        if (StringUtils.isNoneBlank(drugId)){
            optPatient +=" <drug_id>"+drugId+"</drug_id> ";
        }
        if (StringUtils.isNoneBlank(drugName)){
            optPatient +=" <drug_name>"+drugName+"</drug_name> ";
        }
        if (StringUtils.isNoneBlank(specification)){
            optPatient +=" <specification>"+specification+"</specification> ";
        }
        if (StringUtils.isNoneBlank(preparation)){
            optPatient +=" <preparation>"+preparation+"</preparation> ";
        }
        if (StringUtils.isNoneBlank(manufacturerName)){
            optPatient +=" <manufacturer_name>"+manufacturerName+"</manufacturer_name> ";
        }
        if (StringUtils.isNoneBlank(countUnit)){
            optPatient +=" <count_unit>"+countUnit+"</count_unit> ";
        }
        if (StringUtils.isNoneBlank(drugDose)){
            optPatient +=" <drug_dose>"+drugDose+"</drug_dose> ";
        }
        if (StringUtils.isNoneBlank(despensingNum)){
            optPatient +=" <despensing_num>"+despensingNum+"</despensing_num> ";
        }
        if (StringUtils.isNoneBlank(packUnit)){
            optPatient +=" <pack_unit>"+packUnit+"</pack_unit> ";
        }
        if (StringUtils.isNoneBlank(unitPrice)){
            optPatient +=" <unit_price>"+unitPrice+"</unit_price> ";
        }
        if (StringUtils.isNoneBlank(feeTotal)){
            optPatient +=" <fee_total>"+feeTotal+"</fee_total> ";
        }
        if (StringUtils.isNoneBlank(groupNo)){
            optPatient +=" <group_no>"+groupNo+"</group_no> ";
        }
        if (StringUtils.isNoneBlank(drugAdminRouteName)){
            optPatient +=" <drug_admin_route_name>"+drugAdminRouteName+"</drug_admin_route_name> ";
        }
        if (StringUtils.isNoneBlank(drugUsingFreq)){
            optPatient +=" <drug_using_freq>"+drugUsingFreq+"</drug_using_freq> ";
        }
        if (StringUtils.isNoneBlank(drugUsingTimePoint)){
            optPatient +=" <drug_using_time_point>"+drugUsingTimePoint+"</drug_using_time_point> ";
        }
        if (StringUtils.isNoneBlank(drugUsingAim)){
            optPatient +=" <drug_using_aim>"+drugUsingAim+"</drug_using_aim> ";
        }
        if (StringUtils.isNoneBlank(drugUsingArea)){
            optPatient +=" <drug_using_area>"+drugUsingArea+"</drug_using_area> ";
        }
        if (StringUtils.isNoneBlank(infusionSpeed)){
            optPatient +=" <infusion_speed>"+infusionSpeed+"</infusion_speed> ";
        }
        if (StringUtils.isNoneBlank(duration)){
            optPatient +=" <duration>"+duration+"</duration> ";
        }
        if (StringUtils.isNoneBlank(specialPrompt)){
            optPatient +=" <special_prompt>"+specialPrompt+"</special_prompt> ";
        }
        if (StringUtils.isNoneBlank(skinTestFlag)){
            optPatient +=" <skin_test_flag>"+skinTestFlag+"</skin_test_flag> ";
        }
        if (StringUtils.isNoneBlank(skinTestResult)){
            optPatient +=" <skin_test_result>"+skinTestResult+"</skin_test_result> ";
        }
        if (StringUtils.isNoneBlank(ouvasFlag)){
            optPatient +=" <ouvas_flag>"+ouvasFlag+"</ouvas_flag> ";
        }
        if (StringUtils.isNoneBlank(ouvasFlag)){
            optPatient +=" <ouvas_flag>"+ouvasFlag+"</ouvas_flag> ";
        }
        if (StringUtils.isNoneBlank(medicareType)){
            optPatient +=" <medicare_type>"+medicareType+"</medicare_type> ";
        }
        if (StringUtils.isNoneBlank(startTime)){
            optPatient +=" <start_time>"+startTime+"</start_time> ";
        }
        if (StringUtils.isNoneBlank(endTime)){
            optPatient +=" <end_time>"+endTime+"</end_time> ";
        }
        optPatient+="</opt_prescription_item>";
        return optPatient;
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -336,7 +336,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public static String entranceUrl = "http://172.16.100.240:10023/xzzx/";
    public static String entranceHealthCareUrl = "http://172.16.100.240:10023/healthCare/";
    public static String entranceHealthCareUrl = "http://127.0.0.1:10023/healthCare/";
    @Value("${demo.flag}")
    private boolean demoFlag;
@@ -7350,6 +7350,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        rs.put("cardType",basePatientDO.getCardType());
        rs.put("healthStatus","");
        rs.put("diseaseType","");
        rs.put("medicalState",basePatientDO.getMedicalState());
        if (patientMedicareCardDO != null) {
            rs.put("ssc", patientMedicareCardDO.getCode());
        } else {
@@ -9830,7 +9831,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                    //同步处方
                    String applyDoctor = doctorMappingDO.getDoctorName()+"/"+doctorMappingDO.getMappingCode();
                    com.alibaba.fastjson.JSONObject object = hcyyPrescriptionService.savePrescriptionToEntrance("0",outpatientDO.getCardNo(),outpatientDO.getRegisterNo(),outpatientDO.getDept(),applyDoctor,"50100",infoDOS);
                    com.alibaba.fastjson.JSONObject object = hcyyPrescriptionService.savePrescriptionToEntrance("0",outpatientDO.getCardNo(),outpatientDO.getRegisterNo(),outpatientDO.getDept(),applyDoctor,"50400",infoDOS);
                    logger.info("成功上传处方"+object);
                    //{"msg":"交易成功","code":"0","data":{"PresDetail":{"PresNo":"16151365"}},"success":"True"}
                    if (object!=null){
@@ -9845,20 +9846,20 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                    logger.info("进入处方签名");
                  /*  //处方签名
                    String baseSign=xzyyPrescriptionService.SOF_SignDataWithExtraInfo(wlyyPrescriptionDO);
                    String baseSign=xzyyPrescriptionService.SOF_SignDataWithExtraInfo(wlyyPrescriptionDO);*/
                    //同步电子病历
                    WlyyPrescriptionEmrDO prescriptionEmrDO = prescriptionEmrDao.findEmrByPrescriptionId(prescriptionId);
                    try {
                        if (prescriptionEmrDO != null) {
                            logger.info("电子病历同步");
                            xzzxEntranceService.saveEmrToEntrance(prescriptionId,baseSign);
                            hcyyPrescriptionService.saveEmrToEntrance(prescriptionId,null);
                            logger.info("电子病历同步");
                            logger.info("电子病历签名");
                            xzyyPrescriptionService.SOF_SignDataWithExtraInfoEmr(wlyyPrescriptionDO);
                           /* xzyyPrescriptionService.SOF_SignDataWithExtraInfoEmr(wlyyPrescriptionDO);*/
                        }
                    }catch (Exception e){
                        e.printStackTrace();
                    }*/
                    }
                    try {
                        if (object!=null){
                            if (object.getString("code").equalsIgnoreCase("0")){
@@ -12524,7 +12525,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            //先进行核算检测预约
            String realOrder="";
            String addressNow=provinceName+cityName+townName+streetName+address;
            String result = tasyNatService.initNatParams(HisSeqNo,name.trim(),mediaCard.trim(),addressNow,firstJobCode,secondJobCode);
            String result = tasyNatService.initNatParams(HisSeqNo,name.trim(),mediaCard.trim(),addressNow,firstJobCode,secondJobCode,mobile);
            Boolean flag = false;
            if (StringUtils.isNoneBlank(result)){
                com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(result);

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/TasyNatService.java

@@ -231,6 +231,9 @@ public class TasyNatService {
        if (StringUtils.isNoneBlank(jsonObject.getString("ncp_profession_sub"))){
            condition += "<ncp_profession_sub>"+jsonObject.getString("ncp_profession_sub")+"</ncp_profession_sub>";
        }
        if (StringUtils.isNoneBlank(jsonObject.getString("telephone"))){
            condition += "<telephone>"+jsonObject.getString("telephone")+"</telephone>";
        }
        String itemCoditon="";
        if (StringUtils.isNoneBlank(jsonObject.getString("item"))){
            JSONObject itemObject=jsonObject.getJSONObject("item");
@@ -345,7 +348,7 @@ public class TasyNatService {
    }
    //组装核算下单参数
    public String initNatParams(String preNo,String patientName,String icCardNo,String address,String job,String jobChild){
    public String initNatParams(String preNo,String patientName,String icCardNo,String address,String job,String jobChild,String telephone){
        List<WlyyHospitalSysDictDO> natConfigList = wlyyHospitalSysDictDao.findByDictName("natConfigList");
        String deptCode = "0001";
        String staffNo = "0001";
@@ -393,6 +396,7 @@ public class TasyNatService {
        jsonObject.put("address_now",address);
        jsonObject.put("ncp_profession",job);
        jsonObject.put("ncp_standing_type",ncpStandingType);
        jsonObject.put("telephone",telephone);
        JSONObject item = new JSONObject();
        item.put("itemCode",itemCode);
        item.put("itemName",itemName);
@@ -885,6 +889,20 @@ public class TasyNatService {
                                                }
                                                //取消号源
                                                //cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum());
                                            }else if ("作废".equalsIgnoreCase(child.getString("Status"))) {
                                                logger.info("进入作废订单同步");
                                                baseNatAppointmentDO.setPayStatus("-1");
                                                baseNatAppointmentDO.setIsSuccess("-1");
                                                baseNatAppointmentDO.setCancelReson("患者本人线下作废");
                                                baseNatAppointmentDO.setCancelTime(new Date());
                                                baseNatAppointmentDO.setCancelBy(patientId);
                                                BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(baseNatAppointmentDO.getId().toString());
                                                if (businessOrderDO != null) {
                                                    businessOrderDO.setStatus(-1);
                                                    businessOrderDao.save(businessOrderDO);
                                                }
                                                //取消号源
                                                //cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum());
                                            }
                                            baseNatAppointmentDO.setVoucherNo(child.getString("ApplyNo"));
                                            baseNatAppointmentDao.save(baseNatAppointmentDO);
@@ -915,6 +933,20 @@ public class TasyNatService {
                                    }
                                    //取消号源
                                    //cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum());
                                }else if ("作废".equalsIgnoreCase(jsonObject1.getString("Status"))){
                                    logger.info("进入作废订单同步");
                                    baseNatAppointmentDO.setPayStatus("-1");
                                    baseNatAppointmentDO.setIsSuccess("-1");
                                    baseNatAppointmentDO.setCancelReson("患者本人线下作废");
                                    baseNatAppointmentDO.setCancelTime(new Date());
                                    baseNatAppointmentDO.setCancelBy(patientId);
                                    BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(baseNatAppointmentDO.getId().toString());
                                    if (businessOrderDO!=null){
                                        businessOrderDO.setStatus(-1);
                                        businessOrderDao.save(businessOrderDO);
                                    }
                                    //取消号源
                                    //cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum());
                                }
                                baseNatAppointmentDO.setVoucherNo(jsonObject1.getString("ApplyNo"));
                                baseNatAppointmentDao.save(baseNatAppointmentDO);

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/HcyyEntranceService.java

@@ -167,6 +167,14 @@ public class HcyyEntranceService {
        return url;
    }
    public String getCaServiceUrl(){
        List<WlyyHospitalSysDictDO> list =  wlyyHospitalSysDictDao.findByDictName("hcyyCaService");
        String url = list.get(0).getDictCode();
        return url;
    }
    public String getWXTokenUrl(){
        WlyyHospitalSysDictDO sysDictDO = wlyyHospitalSysDictDao.findById("getXzToken");
        return sysDictDO.getDictCode();
@@ -185,6 +193,19 @@ public class HcyyEntranceService {
        return WebserviceUtil.post(url,xzzxNamespace,api,params);
    }
    public String getHcyyCAWebServiceInfo(String api, Map<String,String> params,String url)throws Exception{
        logger.info("url"+url);
        List<WlyyHospitalSysDictDO> xzzxNamespaces =  wlyyHospitalSysDictDao.findByDictName("hcyyCaNamespace");
        String xzzxNamespace = xzzxNamespaces.get(0).getDictCode();
        logger.info("hcyyCaNamespace",xzzxNamespace);
        return WebserviceUtil.post(url,xzzxNamespace,api,params);
    }
    /**
     * 获取部门信息
     * @return
@@ -3071,6 +3092,133 @@ public class HcyyEntranceService {
    }
//===========================entrance访问hospital============end=======================
    //===========================CA签名================================
    /**
     * 判断个人实名软证书是否已申请(通过身份证号)
     * @return
     */
    public String XMCAF_SOFT_judgeRealNameSoftCertIsApplied(String idcard)throws Exception{
        String api = "XMCAF_SOFT_judgeRealNameSoftCertIsApplied";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
                "   <serverName>"+api+"</serverName>  " +
                "   <format>xml</format>" +
                "   <callOperator></callOperator> " +
                "   <certificate>"+key+"</certificate> " +
                "</root>";
        String condition ="";
        if (StringUtils.isNoneBlank(idcard)){
            condition += "<strUserIdcardNum>"+idcard+"</strUserIdcardNum>";
        }
        String msgBody ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>"+condition+"</root>";
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("XMCAF_SOFT_judgeRealNameSoftCertIsApplied params:"+params.toString());
        String xml = getHcyyCAWebServiceInfo("XMCA6_UnifiedCallInterface",params,getCaServiceUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("XMCAF_SOFT_judgeRealNameSoftCertIsApplied json:"+json);
        return json;
    }
    /**
     * 3.2.2 判断个人实名软证调用保护口令是否在暂存期间内(可通过多种方式)
     * @param type 0-通过微信号 openid、1-通过手机号、2-身份证号
     * @param openId 微信号
     * @param mobile 手机号
     * @param idcard 身份证
     * @return
     * @throws Exception
     */
    public String XMCA14_PRNSC_judgeCalledPasswdIsInTempSaveTime(String type,String openId,String mobile,String idcard)throws Exception{
        String api = "XMCA14_PRNSC_judgeCalledPasswdIsInTempSaveTime";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
                "   <serverName>"+api+"</serverName>  " +
                "   <format>xml</format>" +
                "   <callOperator></callOperator> " +
                "   <certificate>"+key+"</certificate> " +
                "</root>";
        String condition ="";
        if (StringUtils.isNoneBlank(type)){
            condition += "<strJudgeMode>"+type+"</strJudgeMode>";
        }
        if (StringUtils.isNoneBlank(openId)){
            condition += "<strWxid>"+openId+"</strWxid>";
        }
        if (StringUtils.isNoneBlank(mobile)){
            condition += "<strMobilePhoneNum>"+mobile+"</strMobilePhoneNum>";
        }
        if (StringUtils.isNoneBlank(idcard)){
            condition += "<strUserIdcardNum>"+idcard+"</strUserIdcardNum>";
        }
        String msgBody ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>"+condition+"</root>";
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("XMCA14_PRNSC_judgeCalledPasswdIsInTempSaveTime params:"+params.toString());
        String xml = getHcyyCAWebServiceInfo("XMCA6_UnifiedCallInterface",params,getCaServiceUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("XMCA14_PRNSC_judgeCalledPasswdIsInTempSaveTime json:"+json);
        return json;
    }
    /**
     * 3.2.3 通过身份证号，请求个人实名软证书并进行 P1 数字签名(单笔)
     * @param strOriginalData 原文的 MD5 哈希摘要值
     * @param strRealNameSoftCertCalledPasswd 证书被调用保护口令(的大写 32 位 MD5 摘要值)
     * @param idcard 用户身份证号
     * @return
     * @throws Exception
     */
    public String XMCAF_SOFT_requestRealNameSoftCertAndSign(String strOriginalData,String strRealNameSoftCertCalledPasswd,String idcard)throws Exception{
        String api = "XMCAF_SOFT_requestRealNameSoftCertAndSign";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
                "   <serverName>"+api+"</serverName>  " +
                "   <format>xml</format>" +
                "   <callOperator></callOperator> " +
                "   <certificate>"+key+"</certificate> " +
                "</root>";
        String condition ="";
        if (StringUtils.isNoneBlank(strOriginalData)){
            condition += "<strOriginalData>"+strOriginalData+"</strOriginalData>";
        }
        condition += "<strRealNameSoftCertCalledPasswd>"+strRealNameSoftCertCalledPasswd+"</strRealNameSoftCertCalledPasswd>";
        if (StringUtils.isNoneBlank(idcard)){
            condition += "<strUserIdcardNum>"+idcard+"</strUserIdcardNum>";
        }
        String msgBody ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>"+condition+"</root>";
        Map<String,String> params = new HashedMap();
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("XMCAF_SOFT_requestRealNameSoftCertAndSign params:"+params.toString());
        String xml = getHcyyCAWebServiceInfo("XMCA6_UnifiedCallInterface",params,getCaServiceUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("XMCAF_SOFT_requestRealNameSoftCertAndSign json:"+json);
        return json;
    }
}

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@@ -362,7 +362,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("organ_code", orgCode);
                jb.put("organ_name", orgName);
                jb.put("doc_name", info.get("name")== null ? "0":info.get("name"));
                jb.put("docimg",info.get("photo")==null ?null:getImg("https://hlwyy.xmzsh.com/fastdfs/"+info.get("photo").toString()));
                jb.put("docimg",info.get("photo")==null ?null:getImg("https://hlwyy.xmhcyy.com/hcyy/fastdfs/"+info.get("photo").toString()));
                jb.put("id_card", info.get("idcard")== null ? "0":info.get("idcard"));
                jb.put("sex", info.get("sex")== null ? "0":info.get("sex"));
                jb.put("birthday", info.get("birthday")  == null?"2020-01-01": DateUtil.dateToStrShort((Date)info.get("birthday")));
@@ -782,7 +782,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
               "WHERE\n" +
               "\ta.id = b.consult\n" +
               " AND a.symptoms IS NOT NULL AND b.status=1 " +
               "  and c.doctor not in ('402803816babc778016babd0dee21112')";
               "  and c.id not in ('402803816babc778016babd0dee21112')";
        Map<String,Object> params = new HashedMap();
@@ -1818,6 +1818,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
        String[] res = new String[2];
        DictDoctorDutyDO doctorDutyDO = dictDoctorDutyDao.findByCode(duty);
        if (doctorDutyDO!=null){
            logger.info("getTitleCode"+doctorDutyDO.getTitleCode()+","+doctorDutyDO.getName());
            res[0]=doctorDutyDO.getTitleCode();
            res[1]=doctorDutyDO.getName();
        }else {

business/base-service/src/main/java/com/yihu/jw/utils/ImgUtils.java

@@ -61,6 +61,7 @@ public class ImgUtils {
    }
    public static String getImageStr(String imgFile) {
        System.out.print("imgFile==="+imgFile);
        //将图片文件转化为字节数组字符串，并对其进行Base64编码处理
        InputStream in = null;
        byte[] data = null;

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

@@ -0,0 +1,381 @@
package com.yihu.jw.entity.a1entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_device")
public class Mediicinedevice implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * 设备id
     */
    @Column(length = 50)
    private String idDevice;
    /**
     * 设备分类
     */
    @Column(length = 50)
    private String equClass;
    /**
     * 所属
     */
    @Column(length = 50)
    private String belongCommunity;
    /**
     * 网络状态
     */
    @Column(length = 10)
    private Integer networkStatus;
    /**
     * 售卖状态
     */
    private Integer saleStatus;
    /**
     * 设备名称
     */
    @Column(length = 50)
    private String equName;
    /**
     * 设备编号
     */
    @Column(length = 50)
    private Integer equNum;
    /**
     * 机器编码
     */
    @Column(length = 50)
    private String machineCode;
    /**
     * 设备型号
     */
    @Column(length = 50)
    private String equType;
    /**
     * 上电测试
     */
    @Column(length = 50)
    private String poweronTest;
    /**
     * 设备详情
     */
    @Column(length = 100)
    private String equInfo;
    /**
     * 注册日期
     */
    private Date regDate;
    /**
     * 信号强度
     */
    private Integer signalintensity;
    /**
     * 所属
     */
    private String fbelongCommunity;
    /**
     * 社区中心名称
     */
    @Column(length = 100)
    private String community;
    /**
     * 投放地址
     */
    @Column(length = 200)
    private String deliveryAddress;
    /**
     * 升级情况
     */
    @Column(length = 40)
    private String upgrAdesit;
    /**
     * 设备区域
     */
    @Column(length = 40)
    private String equArea;
    /**
     * 详细地址
     */
    @Column(length = 140)
    private String detailAddress;
    /**
     * 套餐
     */
    @Column(length = 140)
    private String packAge;
    /**
     * 流量
     */
    @Column(length = 140)
    private String flow;
    /**
     * 已使用流量
     */
    @Column(length = 140)
    private String UsageFlow;
    /**
     * 卡状态
     */
    @Column(length = 140)
    private String cardStatus;
    /**
     * 运营商
     */
    @Column(length = 140)
    private String operator;
    /**
     * 删除
     */
    private Integer del;
    /**
     * 状态
     */
    private Integer status;
    public Mediicinedevice() {
    }
    public String getIdDevice() {
        return idDevice;
    }
    public void setIdDevice(String idDevice) {
        this.idDevice = idDevice;
    }
    public String getEquClass() {
        return equClass;
    }
    public void setEquClass(String equClass) {
        this.equClass = equClass;
    }
    public String getBelongCommunity() {
        return belongCommunity;
    }
    public void setBelongCommunity(String belongCommunity) {
        this.belongCommunity = belongCommunity;
    }
    public Integer getNetworkStatus() {
        return networkStatus;
    }
    public void setNetworkStatus(Integer networkStatus) {
        this.networkStatus = networkStatus;
    }
    public Integer getSaleStatus() {
        return saleStatus;
    }
    public void setSaleStatus(Integer saleStatus) {
        this.saleStatus = saleStatus;
    }
    public String getEquName() {
        return equName;
    }
    public void setEquName(String equName) {
        this.equName = equName;
    }
    public Integer getEquNum() {
        return equNum;
    }
    public void setEquNum(Integer equNum) {
        this.equNum = equNum;
    }
    public String getMachineCode() {
        return machineCode;
    }
    public void setMachineCode(String machineCode) {
        this.machineCode = machineCode;
    }
    public String getEquType() {
        return equType;
    }
    public void setEquType(String equType) {
        this.equType = equType;
    }
    public String getPoweronTest() {
        return poweronTest;
    }
    public void setPoweronTest(String poweronTest) {
        this.poweronTest = poweronTest;
    }
    public String getEquInfo() {
        return equInfo;
    }
    public void setEquInfo(String equInfo) {
        this.equInfo = equInfo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getRegDate() {
        return regDate;
    }
    public void setRegDate(Date regDate) {
        this.regDate = regDate;
    }
    public Integer getSignalintensity() {
        return signalintensity;
    }
    public void setSignalintensity(Integer signalintensity) {
        this.signalintensity = signalintensity;
    }
    public String getFbelongCommunity() {
        return fbelongCommunity;
    }
    public void setFbelongCommunity(String fbelongCommunity) {
        this.fbelongCommunity = fbelongCommunity;
    }
    public String getCommunity() {
        return community;
    }
    public void setCommunity(String community) {
        this.community = community;
    }
    public String getDeliveryAddress() {
        return deliveryAddress;
    }
    public void setDeliveryAddress(String deliveryAddress) {
        this.deliveryAddress = deliveryAddress;
    }
    public String getUpgrAdesit() {
        return upgrAdesit;
    }
    public void setUpgrAdesit(String upgrAdesit) {
        this.upgrAdesit = upgrAdesit;
    }
    public String getEquArea() {
        return equArea;
    }
    public void setEquArea(String equArea) {
        this.equArea = equArea;
    }
    public String getDetailAddress() {
        return detailAddress;
    }
    public void setDetailAddress(String detailAddress) {
        this.detailAddress = detailAddress;
    }
    public String getPackAge() {
        return packAge;
    }
    public void setPackAge(String packAge) {
        this.packAge = packAge;
    }
    public String getFlow() {
        return flow;
    }
    public void setFlow(String flow) {
        this.flow = flow;
    }
    public String getUsageFlow() {
        return UsageFlow;
    }
    public void setUsageFlow(String usageFlow) {
        UsageFlow = usageFlow;
    }
    public String getCardStatus() {
        return cardStatus;
    }
    public void setCardStatus(String cardStatus) {
        this.cardStatus = cardStatus;
    }
    public String getOperator() {
        return operator;
    }
    public void setOperator(String operator) {
        this.operator = operator;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

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

@@ -0,0 +1,341 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
@Entity
@Table(name="t_mediicine_drugs")
public class Mediicinedrugs implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * iddrug
     */
    @Column(length = 40)
    private String idDrug;
    /**
     * 名称
     */
    @Column(length = 40)
    private String drugName;
    /**
     * 条码
     */
    @Column(length = 40)
    private String barcode;
    /**
     * 编码
     */
    @Column(length = 40)
    private String drugCode;
    /**
     * 简码
     */
    @Column(length = 40)
    private String drugShortCode;
    /**
     * 药品分类
     */
    @Column(length = 40)
    private String drugClass;
    /**
     * 预警类型
     */
    @Column(length = 40)
    private String earlywarningcate;
    /**
     * 药柜
     */
    @Column(length = 40)
    private String medCabinet;
    /**
     * 图片
     */
    @Column(length = 200)
    private String pic;
    /**
     * 药品名称
     */
    @Column(length = 40)
    private String drugNameAlies;
    /**
     * 药品条码
     */
    @Column(length = 40)
    private String drugBarCode;
    /**
     * 分类
     */
    @Column(length = 40)
    private String drugClassCode;
    /**
     * 剂型
     */
    @Column(length = 40)
    private String dosForm;
    /**
     * drugtypecode
     */
    @Column(length = 40)
    private String drugTypeCode;
    /**
     * 单位
     */
    @Column(length = 40)
    private String unit;
    /**
     * 售价
     */
    private float price;
    /**
     * 库存
     */
    @Column(length = 40)
    private String inventory;
    /**
     * 销量
     */
    @Column(length = 40)
    private String saleVolume;
    /**
     * 自编码
     */
    @Column(length = 40)
    private String selfCode;
    /**
     * 规格
     */
    @Column(length = 40)
    private String specif;
    /**
     * 厂家
     */
    @Column(length = 40)
    private String manufactor;
    /**
     * 批准文号
     */
    @Column(length = 40)
    private Integer approvalNum;
    /**
     * 品牌
     */
    @Column(length = 40)
    private String brand;
    public Mediicinedrugs() {
    }
    public String getIdDrug() {
        return idDrug;
    }
    public void setIdDrug(String idDrug) {
        this.idDrug = idDrug;
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    public String getBarcode() {
        return barcode;
    }
    public void setBarcode(String barcode) {
        this.barcode = barcode;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public String getDrugShortCode() {
        return drugShortCode;
    }
    public void setDrugShortCode(String drugShortCode) {
        this.drugShortCode = drugShortCode;
    }
    public String getDrugClass() {
        return drugClass;
    }
    public void setDrugClass(String drugClass) {
        this.drugClass = drugClass;
    }
    public String getEarlywarningcate() {
        return earlywarningcate;
    }
    public void setEarlywarningcate(String earlywarningcate) {
        this.earlywarningcate = earlywarningcate;
    }
    public String getMedCabinet() {
        return medCabinet;
    }
    public void setMedCabinet(String medCabinet) {
        this.medCabinet = medCabinet;
    }
    public String getPic() {
        return pic;
    }
    public void setPic(String pic) {
        this.pic = pic;
    }
    public String getDrugNameAlies() {
        return drugNameAlies;
    }
    public void setDrugNameAlies(String drugNameAlies) {
        this.drugNameAlies = drugNameAlies;
    }
    public String getDrugBarCode() {
        return drugBarCode;
    }
    public void setDrugBarCode(String drugBarCode) {
        this.drugBarCode = drugBarCode;
    }
    public String getDrugClassCode() {
        return drugClassCode;
    }
    public void setDrugClassCode(String drugClassCode) {
        this.drugClassCode = drugClassCode;
    }
    public String getDosForm() {
        return dosForm;
    }
    public void setDosForm(String dosForm) {
        this.dosForm = dosForm;
    }
    public String getDrugTypeCode() {
        return drugTypeCode;
    }
    public void setDrugTypeCode(String drugTypeCode) {
        this.drugTypeCode = drugTypeCode;
    }
    public String getUnit() {
        return unit;
    }
    public void setUnit(String unit) {
        this.unit = unit;
    }
    public float getPrice() {
        return price;
    }
    public void setPrice(float price) {
        this.price = price;
    }
    public String getInventory() {
        return inventory;
    }
    public void setInventory(String inventory) {
        this.inventory = inventory;
    }
    public String getSaleVolume() {
        return saleVolume;
    }
    public void setSaleVolume(String saleVolume) {
        this.saleVolume = saleVolume;
    }
    public String getSelfCode() {
        return selfCode;
    }
    public void setSelfCode(String selfCode) {
        this.selfCode = selfCode;
    }
    public String getSpecif() {
        return specif;
    }
    public void setSpecif(String specif) {
        this.specif = specif;
    }
    public String getManufactor() {
        return manufactor;
    }
    public void setManufactor(String manufactor) {
        this.manufactor = manufactor;
    }
    public Integer getApprovalNum() {
        return approvalNum;
    }
    public void setApprovalNum(Integer approvalNum) {
        this.approvalNum = approvalNum;
    }
    public String getBrand() {
        return brand;
    }
    public void setBrand(String brand) {
        this.brand = brand;
    }
}

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

@@ -0,0 +1,406 @@
package com.yihu.jw.entity.a1entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_order")
public class Mediicineorder implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idorder
     */
    private String idOrder;
    /**
     * 订单号
     */
    private String orderNum;
    /**
     * 订单状态
     */
    private String orderState;
    /**
     * 出货状态
     */
    private String sellState;
    /**
     * 取药区域
     */
    private String dispensingWindow;
    /**
     * 开方时间
     */
    private Date prescribeTime;
    /**
     * 处方号
     */
    private String prescribeNum;
    /**
     * 交易金额
     */
    private float amount;
    /**
     * 实收销售额
     */
    private float netSaleAmount;
    /**
     * 商品总金额
     */
    private String goodsTotalAmount;
    /**
     * 付款时间
     */
    private Date payTime;
    /**
     * 订单来源
     */
    private String orderSource;
    /**
     * 存取信息
     */
    private String infoAccess;
    /**
     * 取货码
     */
    private Integer pickUpNum;
    /**
     * 订单金额
     */
    private String orderAmount;
    /**
     * 订单类型
     */
    private String orderType;
    /**
     * 社保扣款
     */
    private String socialinsurPayment;
    /**
     * 姓名
     */
    private String name;
    /**
     * 性别
     */
    private String sex;
    /**
     * 身份证号
     */
    private Integer idNum;
    /**
     * 年龄
     */
    private Integer age;
    /**
     * 联系方式
     */
    private String contact;
    /**
     * 住址
     */
    private String address;
    /**
     * 出货设备
     */
    private String shippingEqu;
    /**
     * 设备编号
     */
    private Integer equNum;
    /**
     * 设备地址
     */
    private String equAddress;
    /**
     * 商品名称
     */
    private String goodsName;
    /**
     * 出货时间
     */
    private Date shippingTime;
    /**
     * 货道信息
     */
    private String cargoInfo;
    public Mediicineorder() {
    }
    public String getIdOrder() {
        return idOrder;
    }
    public void setIdOrder(String idOrder) {
        this.idOrder = idOrder;
    }
    public String getOrderNum() {
        return orderNum;
    }
    public void setOrderNum(String orderNum) {
        this.orderNum = orderNum;
    }
    public String getOrderState() {
        return orderState;
    }
    public void setOrderState(String orderState) {
        this.orderState = orderState;
    }
    public String getSellState() {
        return sellState;
    }
    public void setSellState(String sellState) {
        this.sellState = sellState;
    }
    public String getDispensingWindow() {
        return dispensingWindow;
    }
    public void setDispensingWindow(String dispensingWindow) {
        this.dispensingWindow = dispensingWindow;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getPrescribeTime() {
        return prescribeTime;
    }
    public void setPrescribeTime(Date prescribeTime) {
        this.prescribeTime = prescribeTime;
    }
    public String getPrescribeNum() {
        return prescribeNum;
    }
    public void setPrescribeNum(String prescribeNum) {
        this.prescribeNum = prescribeNum;
    }
    public float getAmount() {
        return amount;
    }
    public void setAmount(float amount) {
        this.amount = amount;
    }
    public float getNetSaleAmount() {
        return netSaleAmount;
    }
    public void setNetSaleAmount(float netSaleAmount) {
        this.netSaleAmount = netSaleAmount;
    }
    public String getGoodsTotalAmount() {
        return goodsTotalAmount;
    }
    public void setGoodsTotalAmount(String goodsTotalAmount) {
        this.goodsTotalAmount = goodsTotalAmount;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getPayTime() {
        return payTime;
    }
    public void setPayTime(Date payTime) {
        this.payTime = payTime;
    }
    public String getOrderSource() {
        return orderSource;
    }
    public void setOrderSource(String orderSource) {
        this.orderSource = orderSource;
    }
    public String getInfoAccess() {
        return infoAccess;
    }
    public void setInfoAccess(String infoAccess) {
        this.infoAccess = infoAccess;
    }
    public Integer getPickUpNum() {
        return pickUpNum;
    }
    public void setPickUpNum(Integer pickUpNum) {
        this.pickUpNum = pickUpNum;
    }
    public String getOrderAmount() {
        return orderAmount;
    }
    public void setOrderAmount(String orderAmount) {
        this.orderAmount = orderAmount;
    }
    public String getOrderType() {
        return orderType;
    }
    public void setOrderType(String orderType) {
        this.orderType = orderType;
    }
    public String getSocialinsurPayment() {
        return socialinsurPayment;
    }
    public void setSocialinsurPayment(String socialinsurPayment) {
        this.socialinsurPayment = socialinsurPayment;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    public Integer getIdNum() {
        return idNum;
    }
    public void setIdNum(Integer idNum) {
        this.idNum = idNum;
    }
    public Integer getAge() {
        return age;
    }
    public void setAge(Integer age) {
        this.age = age;
    }
    public String getContact() {
        return contact;
    }
    public void setContact(String contact) {
        this.contact = contact;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public String getShippingEqu() {
        return shippingEqu;
    }
    public void setShippingEqu(String shippingEqu) {
        this.shippingEqu = shippingEqu;
    }
    public Integer getEquNum() {
        return equNum;
    }
    public void setEquNum(Integer equNum) {
        this.equNum = equNum;
    }
    public String getEquAddress() {
        return equAddress;
    }
    public void setEquAddress(String equAddress) {
        this.equAddress = equAddress;
    }
    public String getGoodsName() {
        return goodsName;
    }
    public void setGoodsName(String goodsName) {
        this.goodsName = goodsName;
    }
    public Date getShippingTime() {
        return shippingTime;
    }
    public void setShippingTime(Date shippingTime) {
        this.shippingTime = shippingTime;
    }
    public String getCargoInfo() {
        return cargoInfo;
    }
    public void setCargoInfo(String cargoInfo) {
        this.cargoInfo = cargoInfo;
    }
}

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

@@ -0,0 +1,519 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_order_detail")
public class Mediicineorderdetail implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idorderdetail
     */
    @Column(length = 40)
    private String idOrderDetail;
    /**
     * idorder
     */
    @Column(length = 40)
    private String idOrder;
    /**
     * orderno
     */
    @Column(length = 40)
    private String orderNo;
    /**
     * 药品信息
     */
    @Column(length = 40)
    private String medInfo;
    /**
     * 售价
     */
    private float price;
    /**
     * 数量
     */
    private float quantity;
    /**
     * 批次号
     */
    @Column(length = 40)
    private String batchNum;
    /**
     * cargoinfo
     */
    @Column(length = 40)
    private String cargoInfo;
    /**
     * drugcode
     */
    @Column(length = 40)
    private String drugCode;
    /**
     * 订单号
     */
    @Column(length = 40)
    private String orderNum;
    /**
     * 订单状态
     */
    @Column(length = 40)
    private String orderState;
    /**
     * 出货状态
     */
    @Column(length = 40)
    private String sellState;
    /**
     * 取药区域
     */
    @Column(length = 40)
    private String dispensingWindow;
    /**
     * 开方时间
     */
    @Column(length = 40)
    private Date prescribeTime;
    /**
     * 处方号
     */
    @Column(length = 40)
    private String prescribeNum;
    /**
     * 交易金额
     */
    private float amount;
    /**
     * 实收销售额
     */
    private float netSaleAmount;
    /**
     * 商品总金额
     */
    @Column(length = 40)
    private String goodsTotalAmount;
    /**
     * 付款时间
     */
    private Date payTime;
    /**
     * 订单来源
     */
    @Column(length = 40)
    private String orderSource;
    /**
     * 存取信息
     */
    @Column(length = 40)
    private String infoAccess;
    /**
     * 取货码
     */
    private Integer pickUpNum;
    /**
     * 订单金额
     */
    private String orderAmount;
    /**
     * 订单类型
     */
    @Column(length = 40)
    private String orderType;
    /**
     * 社保扣款
     */
    @Column(length = 40)
    private String socialinsurpayment;
    /**
     * 姓名
     */
    @Column(length = 40)
    private String name;
    /**
     * 性别
     */
    @Column(length = 40)
    private String sex;
    /**
     * 身份证号
     */
    private Integer idNum;
    /**
     * 年龄
     */
    private Integer age;
    /**
     * 联系方式
     */
    @Column(length = 40)
    private String contact;
    /**
     * 住址
     */
    @Column(length = 40)
    private String address;
    /**
     * 出货设备
     */
    @Column(length = 40)
    private String shippingEqu;
    /**
     * 设备编号
     */
    @Column(length = 40)
    private Integer equNum;
    /**
     * 设备地址
     */
    @Column(length = 40)
    private String equAddress;
    /**
     * 商品名称
     */
    @Column(length = 40)
    private String goodsName;
    /**
     * 出货时间
     */
    @Column(length = 40)
    private Date shippingTime;
    public Mediicineorderdetail() {
    }
    public String getIdOrderDetail() {
        return idOrderDetail;
    }
    public void setIdOrderDetail(String idOrderDetail) {
        this.idOrderDetail = idOrderDetail;
    }
    public String getIdOrder() {
        return idOrder;
    }
    public void setIdOrder(String idOrder) {
        this.idOrder = idOrder;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getMedInfo() {
        return medInfo;
    }
    public void setMedInfo(String medInfo) {
        this.medInfo = medInfo;
    }
    public float getPrice() {
        return price;
    }
    public void setPrice(float price) {
        this.price = price;
    }
    public float getQuantity() {
        return quantity;
    }
    public void setQuantity(float quantity) {
        this.quantity = quantity;
    }
    public String getBatchNum() {
        return batchNum;
    }
    public void setBatchNum(String batchNum) {
        this.batchNum = batchNum;
    }
    public String getCargoInfo() {
        return cargoInfo;
    }
    public void setCargoInfo(String cargoInfo) {
        this.cargoInfo = cargoInfo;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public String getOrderNum() {
        return orderNum;
    }
    public void setOrderNum(String orderNum) {
        this.orderNum = orderNum;
    }
    public String getOrderState() {
        return orderState;
    }
    public void setOrderState(String orderState) {
        this.orderState = orderState;
    }
    public String getSellState() {
        return sellState;
    }
    public void setSellState(String sellState) {
        this.sellState = sellState;
    }
    public String getDispensingWindow() {
        return dispensingWindow;
    }
    public void setDispensingWindow(String dispensingWindow) {
        this.dispensingWindow = dispensingWindow;
    }
    public Date getPrescribeTime() {
        return prescribeTime;
    }
    public void setPrescribeTime(Date prescribeTime) {
        this.prescribeTime = prescribeTime;
    }
    public String getPrescribeNum() {
        return prescribeNum;
    }
    public void setPrescribeNum(String prescribeNum) {
        this.prescribeNum = prescribeNum;
    }
    public float getAmount() {
        return amount;
    }
    public void setAmount(float amount) {
        this.amount = amount;
    }
    public float getNetSaleAmount() {
        return netSaleAmount;
    }
    public void setNetSaleAmount(float netSaleAmount) {
        this.netSaleAmount = netSaleAmount;
    }
    public String getGoodsTotalAmount() {
        return goodsTotalAmount;
    }
    public void setGoodsTotalAmount(String goodsTotalAmount) {
        this.goodsTotalAmount = goodsTotalAmount;
    }
    public Date getPayTime() {
        return payTime;
    }
    public void setPayTime(Date payTime) {
        this.payTime = payTime;
    }
    public String getOrderSource() {
        return orderSource;
    }
    public void setOrderSource(String orderSource) {
        this.orderSource = orderSource;
    }
    public String getInfoAccess() {
        return infoAccess;
    }
    public void setInfoAccess(String infoAccess) {
        this.infoAccess = infoAccess;
    }
    public Integer getPickUpNum() {
        return pickUpNum;
    }
    public void setPickUpNum(Integer pickUpNum) {
        this.pickUpNum = pickUpNum;
    }
    public String getOrderAmount() {
        return orderAmount;
    }
    public void setOrderAmount(String orderAmount) {
        this.orderAmount = orderAmount;
    }
    public String getOrderType() {
        return orderType;
    }
    public void setOrderType(String orderType) {
        this.orderType = orderType;
    }
    public String getSocialinsurpayment() {
        return socialinsurpayment;
    }
    public void setSocialinsurpayment(String socialinsurpayment) {
        this.socialinsurpayment = socialinsurpayment;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    public Integer getIdNum() {
        return idNum;
    }
    public void setIdNum(Integer idNum) {
        this.idNum = idNum;
    }
    public Integer getAge() {
        return age;
    }
    public void setAge(Integer age) {
        this.age = age;
    }
    public String getContact() {
        return contact;
    }
    public void setContact(String contact) {
        this.contact = contact;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public String getShippingEqu() {
        return shippingEqu;
    }
    public void setShippingEqu(String shippingEqu) {
        this.shippingEqu = shippingEqu;
    }
    public Integer getEquNum() {
        return equNum;
    }
    public void setEquNum(Integer equNum) {
        this.equNum = equNum;
    }
    public String getEquAddress() {
        return equAddress;
    }
    public void setEquAddress(String equAddress) {
        this.equAddress = equAddress;
    }
    public String getGoodsName() {
        return goodsName;
    }
    public void setGoodsName(String goodsName) {
        this.goodsName = goodsName;
    }
    public Date getShippingTime() {
        return shippingTime;
    }
    public void setShippingTime(Date shippingTime) {
        this.shippingTime = shippingTime;
    }
}

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

@@ -0,0 +1,201 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockout")
public class Mediicinestockout implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * idstockout
     */
    @Id
    @Column(length = 40)
    private String idStockOut;
    /**
     * community
     */
    @Column(length = 40)
    private String community;
    /**
     * replenisher
     */
    @Column(length = 40)
    private String replenishEr;
    /**
     * state
     */
    @Column(length = 40)
    private String state;
    /**
     * replenishequ
     */
    @Column(length = 40)
    private String replenishEqu;
    /**
     * replenishcate
     */
    @Column(length = 40)
    private String replenishCate;
    /**
     * replenishinventory
     */
    @Column(length = 40)
    private String replenishInventory;
    /**
     * doctime
     */
    private Date docTime;
    /**
     * remark
     */
    @Column(length = 40)
    private String remark;
    /**
     * 单号
     */
    private Integer trackNum;
    /**
     * 地址
     */
    @Column(length = 40)
    private String address;
    /**
     * 单据编号
     */
    @Column(length = 40)
    private Integer docNum;
    /**
     * 领取状态
     */
    @Column(length = 40)
    private String receiveState;
    public Mediicinestockout() {
    }
    public String getIdStockOut() {
        return idStockOut;
    }
    public void setIdStockOut(String idStockOut) {
        this.idStockOut = idStockOut;
    }
    public String getCommunity() {
        return community;
    }
    public void setCommunity(String community) {
        this.community = community;
    }
    public String getReplenishEr() {
        return replenishEr;
    }
    public void setReplenishEr(String replenishEr) {
        this.replenishEr = replenishEr;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public String getReplenishEqu() {
        return replenishEqu;
    }
    public void setReplenishEqu(String replenishEqu) {
        this.replenishEqu = replenishEqu;
    }
    public String getReplenishCate() {
        return replenishCate;
    }
    public void setReplenishCate(String replenishCate) {
        this.replenishCate = replenishCate;
    }
    public String getReplenishInventory() {
        return replenishInventory;
    }
    public void setReplenishInventory(String replenishInventory) {
        this.replenishInventory = replenishInventory;
    }
    public Date getDocTime() {
        return docTime;
    }
    public void setDocTime(Date docTime) {
        this.docTime = docTime;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getTrackNum() {
        return trackNum;
    }
    public void setTrackNum(Integer trackNum) {
        this.trackNum = trackNum;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public Integer getDocNum() {
        return docNum;
    }
    public void setDocNum(Integer docNum) {
        this.docNum = docNum;
    }
    public String getReceiveState() {
        return receiveState;
    }
    public void setReceiveState(String receiveState) {
        this.receiveState = receiveState;
    }
}

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

@@ -0,0 +1,217 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockout_detail")
public class Mediicinestockoutdetail implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstockoutdetail
     */
    @Column(length = 40)
    private String idStockOutDetail;
    /**
     * idstockout
     */
    @Column(length = 40)
    private String idStockOut;
    /**
     * orderno
     */
    @Column(length = 40)
    private String orderNo;
    /**
     * 药品信息
     */
    @Column(length = 40)
    private String medInfo;
    /**
     * 售价
     */
    @Column(length = 40)
    private float price;
    /**
     * 数量
     */
    @Column(length = 40)
    private String quantity;
    /**
     * 批次号
     */
    @Column(length = 40)
    private Integer batchNum;
    /**
     * cargoinfo
     */
    @Column(length = 40)
    private String cargoInfo;
    /**
     * drugcode
     */
    @Column(length = 40)
    private String drugCode;
    /**
     * 生产日期
     */
    @Column(length = 40)
    private Date proDate;
    /**
     * 有效期至
     */
    @Column(length = 40)
    private Date expDate;
    /**
     * 商品图
     */
    @Column(length = 40)
    private String productPic;
    /**
     * 订单号
     */
    @Column(length = 40)
    private String idOrder;
    /**
     * 订单明细
     */
    @Column(length = 40)
    private String IdOrderDetail;
    public Mediicinestockoutdetail() {
    }
    public String getIdStockOutDetail() {
        return idStockOutDetail;
    }
    public void setIdStockOutDetail(String idStockOutDetail) {
        this.idStockOutDetail = idStockOutDetail;
    }
    public String getIdStockOut() {
        return idStockOut;
    }
    public void setIdStockOut(String idStockOut) {
        this.idStockOut = idStockOut;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getMedInfo() {
        return medInfo;
    }
    public void setMedInfo(String medInfo) {
        this.medInfo = medInfo;
    }
    public float getPrice() {
        return price;
    }
    public void setPrice(float price) {
        this.price = price;
    }
    public String getQuantity() {
        return quantity;
    }
    public void setQuantity(String quantity) {
        this.quantity = quantity;
    }
    public Integer getBatchNum() {
        return batchNum;
    }
    public void setBatchNum(Integer batchNum) {
        this.batchNum = batchNum;
    }
    public String getCargoInfo() {
        return cargoInfo;
    }
    public void setCargoInfo(String cargoInfo) {
        this.cargoInfo = cargoInfo;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public Date getProDate() {
        return proDate;
    }
    public void setProDate(Date proDate) {
        this.proDate = proDate;
    }
    public Date getExpDate() {
        return expDate;
    }
    public void setExpDate(Date expDate) {
        this.expDate = expDate;
    }
    public String getProductPic() {
        return productPic;
    }
    public void setProductPic(String productPic) {
        this.productPic = productPic;
    }
    public String getIdOrder() {
        return idOrder;
    }
    public void setIdOrder(String idOrder) {
        this.idOrder = idOrder;
    }
    public String getIdOrderDetail() {
        return IdOrderDetail;
    }
    public void setIdOrderDetail(String idOrderDetail) {
        IdOrderDetail = idOrderDetail;
    }
}

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

@@ -0,0 +1,160 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockup")
public class Mediicinestockup implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstockup
     */
    @Column(length = 40)
    private String idStockUp;
    /**
     * community
     */
    @Column(length = 40)
    private String community;
    /**
     * replenisher
     */
    @Column(length = 40)
    private String replenishEr;
    /**
     * state
     */
    @Column(length = 40)
    private String state;
    /**
     * replenishequ
     */
    @Column(length = 40)
    private String replenishEqu;
    /**
     * replenishcate
     */
    @Column(length = 40)
    private String replenishCate;
    /**
     * replenishinventory
     */
    @Column(length = 40)
    private String replenishInventory;
    /**
     * doctime
     */
    @Column(length = 40)
    private Date docTime;
    /**
     * remark
     */
    @Column(length = 40)
    private String remark;
    /**
     * 单号
     */
    @Column(length = 40)
    private Integer trackNum;
    public Mediicinestockup() {
    }
    public String getIdStockUp() {
        return idStockUp;
    }
    public void setIdStockUp(String idStockUp) {
        this.idStockUp = idStockUp;
    }
    public String getCommunity() {
        return community;
    }
    public void setCommunity(String community) {
        this.community = community;
    }
    public String getReplenishEr() {
        return replenishEr;
    }
    public void setReplenishEr(String replenishEr) {
        this.replenishEr = replenishEr;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public String getReplenishEqu() {
        return replenishEqu;
    }
    public void setReplenishEqu(String replenishEqu) {
        this.replenishEqu = replenishEqu;
    }
    public String getReplenishCate() {
        return replenishCate;
    }
    public void setReplenishCate(String replenishCate) {
        this.replenishCate = replenishCate;
    }
    public String getReplenishInventory() {
        return replenishInventory;
    }
    public void setReplenishInventory(String replenishInventory) {
        this.replenishInventory = replenishInventory;
    }
    public Date getDocTime() {
        return docTime;
    }
    public void setDocTime(Date docTime) {
        this.docTime = docTime;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getTrackNum() {
        return trackNum;
    }
    public void setTrackNum(Integer trackNum) {
        this.trackNum = trackNum;
    }
}

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

@@ -0,0 +1,186 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_stockup_detail")
public class Mediicinestockupdetail implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstockupdetail
     */
    @Column(length = 40)
    private String idStockUpDetail;
    /**
     * idstockup
     */
    @Column(length = 40)
    private String idStockUp;
    /**
     * orderno
     */
    @Column(length = 40)
    private String orderNo;
    /**
     * 药品信息
     */
    @Column(length = 40)
    private String medInfo;
    /**
     * 售价
     */
    @Column(length = 40)
    private double price;
    /**
     * 数量
     */
    @Column(length = 40)
    private String quantity;
    /**
     * 批次号
     */
    @Column(length = 40)
    private Integer batchNum;
    /**
     * cargoinfo
     */
    @Column(length = 40)
    private String cargoInfo;
    /**
     * drugcode
     */
    @Column(length = 40)
    private String drugCode;
    /**
     * 生产日期
     */
    @Column(length = 40)
    private Date proDate;
    /**
     * 有效期至
     */
    private Date expDate;
    /**
     * 商品图
     */
    @Column(length = 40)
    private String productPic;
    public Mediicinestockupdetail() {
    }
    public String getIdStockUpDetail() {
        return idStockUpDetail;
    }
    public void setIdStockUpDetail(String idStockUpDetail) {
        this.idStockUpDetail = idStockUpDetail;
    }
    public String getIdStockUp() {
        return idStockUp;
    }
    public void setIdStockUp(String idStockUp) {
        this.idStockUp = idStockUp;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getMedInfo() {
        return medInfo;
    }
    public void setMedInfo(String medInfo) {
        this.medInfo = medInfo;
    }
    public double getPrice() {
        return price;
    }
    public void setPrice(double price) {
        this.price = price;
    }
    public String getQuantity() {
        return quantity;
    }
    public void setQuantity(String quantity) {
        this.quantity = quantity;
    }
    public Integer getBatchNum() {
        return batchNum;
    }
    public void setBatchNum(Integer batchNum) {
        this.batchNum = batchNum;
    }
    public String getCargoInfo() {
        return cargoInfo;
    }
    public void setCargoInfo(String cargoInfo) {
        this.cargoInfo = cargoInfo;
    }
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    public Date getProDate() {
        return proDate;
    }
    public void setProDate(Date proDate) {
        this.proDate = proDate;
    }
    public Date getExpDate() {
        return expDate;
    }
    public void setExpDate(Date expDate) {
        this.expDate = expDate;
    }
    public String getProductPic() {
        return productPic;
    }
    public void setProductPic(String productPic) {
        this.productPic = productPic;
    }
}

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

@@ -0,0 +1,104 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_store")
public class Mediicinestore implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idstore
     */
    @Column(length = 40)
    private String idStore;
    /**
     * 设备id
     */
    @Column(length = 40)
    private String idDevice;
    /**
     * sku
     */
    @Column(length = 40)
    private String sku;
    /**
     * state
     */
    @Column(length = 40)
    private String state;
    /**
     * num
     */
    @Column(length = 40)
    private Integer num;
    /**
     * num
     */
    @Column(length = 40)
    private Date longtime;
    public Mediicinestore() {
    }
    public String getIdStore() {
        return idStore;
    }
    public void setIdStore(String idStore) {
        this.idStore = idStore;
    }
    public String getIdDevice() {
        return idDevice;
    }
    public void setIdDevice(String idDevice) {
        this.idDevice = idDevice;
    }
    public String getSku() {
        return sku;
    }
    public void setSku(String sku) {
        this.sku = sku;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public Date getLongtime() {
        return longtime;
    }
    public void setLongtime(Date longtime) {
        this.longtime = longtime;
    }
}

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

@@ -0,0 +1,189 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_user")
public class Mediicineuser implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * iduser
     */
    @Column(length = 40)
    private String idUser;
    /**
     * 姓名
     */
    @Column(length = 40)
    private String name;
    /**
     * 性别
     */
    @Column(length = 40)
    private String sex;
    /**
     * 出生日期
     */
    @Column(length = 40)
    private Date birDate;
    /**
     * 所属区域
     */
    @Column(length = 40)
    private String belongCommunity;
    /**
     * 角色
     */
    @Column(length = 40)
    private String role;
    /**
     * contactinfo
     */
    @Column(length = 40)
    private String contactInfo;
    /**
     * account
     */
    @Column(length = 40)
    private String account;
    /**
     * password
     */
    @Column(length = 40)
    private String password;
    /**
     * confirmpassword
     */
    @Column(length = 40)
    private String confirmPassword;
    /**
     * 负责药柜
     */
    @Column(length = 40)
    private String resMedCabinet;
    /**
     * responarea
     */
    private String resPonArea;
    public Mediicineuser() {
    }
    public String getIdUser() {
        return idUser;
    }
    public void setIdUser(String idUser) {
        this.idUser = idUser;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    public Date getBirDate() {
        return birDate;
    }
    public void setBirDate(Date birDate) {
        this.birDate = birDate;
    }
    public String getBelongCommunity() {
        return belongCommunity;
    }
    public void setBelongCommunity(String belongCommunity) {
        this.belongCommunity = belongCommunity;
    }
    public String getRole() {
        return role;
    }
    public void setRole(String role) {
        this.role = role;
    }
    public String getContactInfo() {
        return contactInfo;
    }
    public void setContactInfo(String contactInfo) {
        this.contactInfo = contactInfo;
    }
    public String getAccount() {
        return account;
    }
    public void setAccount(String account) {
        this.account = account;
    }
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    public String getConfirmPassword() {
        return confirmPassword;
    }
    public void setConfirmPassword(String confirmPassword) {
        this.confirmPassword = confirmPassword;
    }
    public String getResMedCabinet() {
        return resMedCabinet;
    }
    public void setResMedCabinet(String resMedCabinet) {
        this.resMedCabinet = resMedCabinet;
    }
    public String getResPonArea() {
        return resPonArea;
    }
    public void setResPonArea(String resPonArea) {
        this.resPonArea = resPonArea;
    }
}

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

@@ -0,0 +1,436 @@
package com.yihu.jw.entity.a1entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name="t_mediicine_warray")
public class Mediicinewarray implements Serializable {
    private static final long serialVersionUID = 1L;
    @Id
    /**
     * idwarray
     */
    @Column(length = 40)
    private String idWarray;
    /**
     * 类型
     */
    @Column(length = 40)
    private String type;
    /**
     * 开方时间
     */
    @Column(length = 40)
    private Date logTime;
    @Column(length = 50)
    private String idDevice;
    /**
     * 设备分类
     */
    @Column(length = 50)
    private String equClass;
    /**
     * 所属
     */
    @Column(length = 50)
    private String belongCommunity;
    /**
     * 网络状态
     */
    private Integer networkStatus;
    /**
     * 售卖状态
     */
    private Integer saleStatus;
    /**
     * 设备名称
     */
    @Column(length = 50)
    private String equName;
    /**
     * 设备编号
     */
    @Column(length = 50)
    private String equNum;
    /**
     * 机器编码
     */
    @Column(length = 50)
    private String machineCode;
    /**
     * 设备型号
     */
    @Column(length = 50)
    private String equType;
    /**
     * 上电测试
     */
    @Column(length = 50)
    private String poweronTest;
    /**
     * 设备详情
     */
    @Column(length = 100)
    private String equInfo;
    /**
     * 注册日期
     */
    private Date regDate;
    /**
     * 信号强度
     */
    private Integer signalIntensity;
    /**
     * 温度信息
     */
    private float temperature;
    /**
     * 湿度信息
     */
    private float humidity;
    /**
     * 所属
     */
    private String fbelongCommunity;
    /**
     * 社区中心名称
     */
    @Column(length = 100)
    private String community;
    /**
     * 投放地址
     */
    @Column(length = 200)
    private String deliveryAddress;
    /**
     * 升级情况
     */
    @Column(length = 40)
    private String upgrAdesit;
    /**
     * 设备区域
     */
    @Column(length = 40)
    private String equArea;
    /**
     * 详细地址
     */
    @Column(length = 140)
    private String detailAddress;
    /**
     * 删除
     */
    private Integer del;
    /**
     * 状态
     */
    private Integer status;
    /**
     * 到期日
     */
    private Date exceed;
    /**
     * 使用时长
     */
    private long duration;
    /**
     * 出货异常次数
     */
    private Integer shipCouont;
    /**
     * 插口异常次数
     */
    private Integer plusCouont;
    /**
     * 其他异常次数
     */
    private Integer otherCouont;
    public Mediicinewarray() {
    }
    public String getIdWarray() {
        return idWarray;
    }
    public void setIdWarray(String idWarray) {
        this.idWarray = idWarray;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public Date getLogTime() {
        return logTime;
    }
    public void setLogTime(Date logTime) {
        this.logTime = logTime;
    }
    public String getIdDevice() {
        return idDevice;
    }
    public void setIdDevice(String idDevice) {
        this.idDevice = idDevice;
    }
    public String getEquClass() {
        return equClass;
    }
    public void setEquClass(String equClass) {
        this.equClass = equClass;
    }
    public String getBelongCommunity() {
        return belongCommunity;
    }
    public void setBelongCommunity(String belongCommunity) {
        this.belongCommunity = belongCommunity;
    }
    public Integer getNetworkStatus() {
        return networkStatus;
    }
    public void setNetworkStatus(Integer networkStatus) {
        this.networkStatus = networkStatus;
    }
    public Integer getSaleStatus() {
        return saleStatus;
    }
    public void setSaleStatus(Integer saleStatus) {
        this.saleStatus = saleStatus;
    }
    public String getEquName() {
        return equName;
    }
    public void setEquName(String equName) {
        this.equName = equName;
    }
    public String getEquNum() {
        return equNum;
    }
    public void setEquNum(String equNum) {
        this.equNum = equNum;
    }
    public String getMachineCode() {
        return machineCode;
    }
    public void setMachineCode(String machineCode) {
        this.machineCode = machineCode;
    }
    public String getEquType() {
        return equType;
    }
    public void setEquType(String equType) {
        this.equType = equType;
    }
    public String getPoweronTest() {
        return poweronTest;
    }
    public void setPoweronTest(String poweronTest) {
        this.poweronTest = poweronTest;
    }
    public String getEquInfo() {
        return equInfo;
    }
    public void setEquInfo(String equInfo) {
        this.equInfo = equInfo;
    }
    public Date getRegDate() {
        return regDate;
    }
    public void setRegDate(Date regDate) {
        this.regDate = regDate;
    }
    public Integer getSignalIntensity() {
        return signalIntensity;
    }
    public void setSignalIntensity(Integer signalIntensity) {
        this.signalIntensity = signalIntensity;
    }
    public float getTemperature() {
        return temperature;
    }
    public void setTemperature(float temperature) {
        this.temperature = temperature;
    }
    public float getHumidity() {
        return humidity;
    }
    public void setHumidity(float humidity) {
        this.humidity = humidity;
    }
    public String getFbelongCommunity() {
        return fbelongCommunity;
    }
    public void setFbelongCommunity(String fbelongCommunity) {
        this.fbelongCommunity = fbelongCommunity;
    }
    public String getCommunity() {
        return community;
    }
    public void setCommunity(String community) {
        this.community = community;
    }
    public String getDeliveryAddress() {
        return deliveryAddress;
    }
    public void setDeliveryAddress(String deliveryAddress) {
        this.deliveryAddress = deliveryAddress;
    }
    public String getUpgrAdesit() {
        return upgrAdesit;
    }
    public void setUpgrAdesit(String upgrAdesit) {
        this.upgrAdesit = upgrAdesit;
    }
    public String getEquArea() {
        return equArea;
    }
    public void setEquArea(String equArea) {
        this.equArea = equArea;
    }
    public String getDetailAddress() {
        return detailAddress;
    }
    public void setDetailAddress(String detailAddress) {
        this.detailAddress = detailAddress;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Date getExceed() {
        return exceed;
    }
    public void setExceed(Date exceed) {
        this.exceed = exceed;
    }
    public long getDuration() {
        return duration;
    }
    public void setDuration(long duration) {
        this.duration = duration;
    }
    public Integer getShipCouont() {
        return shipCouont;
    }
    public void setShipCouont(Integer shipCouont) {
        this.shipCouont = shipCouont;
    }
    public Integer getPlusCouont() {
        return plusCouont;
    }
    public void setPlusCouont(Integer plusCouont) {
        this.plusCouont = plusCouont;
    }
    public Integer getOtherCouont() {
        return otherCouont;
    }
    public void setOtherCouont(Integer otherCouont) {
        this.otherCouont = otherCouont;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/adv/AdvertisementPuttingAdminDO.java

@@ -0,0 +1,205 @@
package com.yihu.jw.entity.adv;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@Entity
@Table(name = "advertisement_putting_admin")
public class AdvertisementPuttingAdminDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "title")
    private String title;//标题
    @Column(name = "category_code")
    private int categoryCode; //广告类型 1视频 2图片
    @Column(name = "category_name")
    private String categoryName;//缩略图
    @Column(name = "url")
    private String url;//视频或图片路径
    @Column(name = "del")
    private int del; //是否删除 1删除 0没删除
    @Column(name = "launch")
    private int launch; //是否投放 1投放
    @Column(name = "forbidden")
    private int forbidden; //是否禁用 1禁用
    @Column(name = "play_id")
    private int playId; //播放方式对应id
//    //创建时间
//    @CreatedDate
//    @Column(name = "create_time", updatable = false)
//    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
//    private Date createTime;
//
//    //创建者
//    @CreatedBy
//    @Column(name = "create_user", updatable = false)
//    private String createUser;
//
//    //创建者
//    @CreatedBy
//    @Column(name = "create_user_name", updatable = false)
//    private String createUserName;
//
//    //更新时间
//    @LastModifiedDate
//    @Column(name = "update_time")
//    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
//    private Date updateTime;
//
//    //更新者
//    @LastModifiedBy
//    @Column(name = "update_user")
//    private String updateUser;
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    public int getCategoryCode() {
        return categoryCode;
    }
    public void setCategoryCode(int categoryCode) {
        this.categoryCode = categoryCode;
    }
    public String getCategoryName() {
        return categoryName;
    }
    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public int getDel() {
        return del;
    }
    public void setDel(int del) {
        this.del = del;
    }
    public int getLaunch() {
        return launch;
    }
    public void setLaunch(int launch) {
        this.launch = launch;
    }
    public int getForbidden() {
        return forbidden;
    }
    public void setForbidden(int forbidden) {
        this.forbidden = forbidden;
    }
//    //更新者
//    @LastModifiedBy
//    @Column(name = "update_user_username")
//    private String updateUserName;
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "create_time", updatable = false)
//    public Date getCreateTime() {
//        return createTime;
//    }
//
//    public void setCreateTime(Date createTime) {
//        this.createTime = createTime;
//    }
//
//    @Column(name = "create_user", updatable = false)
//    public String getCreateUser() {
//        return createUser;
//    }
//
//    public void setCreateUser(String createUser) {
//        this.createUser = createUser;
//    }
//
//    @Column(name = "create_user_name", updatable = false)
//    public String getCreateUserName() {
//        return createUserName;
//    }
//
//    public void setCreateUserName(String createUserName) {
//        this.createUserName = createUserName;
//    }
//
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    @Column(name = "update_time", length = 0)
//    public Date getUpdateTime() {
//        return updateTime;
//    }
//
//    public void setUpdateTime(Date updateTime) {
//        this.updateTime = updateTime;
//    }
//
//    @Column(name = "update_user")
//    public String getUpdateUser() {
//        return updateUser;
//    }
//
//    public void setUpdateUser(String updateUser) {
//        this.updateUser = updateUser;
//    }
//
//    @Column(name = "update_user_name")
//    public String getUpdateUserName() {
//        return updateUserName;
//    }
//
//    public void setUpdateUserName(String updateUserName) {
//        this.updateUserName = updateUserName;
//    }
    @Override
    public String toString() {
        return "AdvertisementPuttingAdminDO{" +
                "title='" + title + '\'' +
                ", categoryCode=" + categoryCode +
                ", categoryName='" + categoryName + '\'' +
                ", url='" + url + '\'' +
                ", del=" + del +
                ", launch=" + launch +
                ", forbidden=" + forbidden +
                ", playId=" + playId +
                ", createTime=" + createTime +
                ", createUser='" + createUser + '\'' +
                ", createUserName='" + createUserName + '\'' +
                ", updateTime=" + updateTime +
                ", updateUser='" + updateUser + '\'' +
                ", updateUserName='" + updateUserName + '\'' +
                ", id='" + id + '\'' +
                '}';
    }
    public int getPlayId() {
        return playId;
    }
    public void setPlayId(int playId) {
        this.playId = playId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageSignRecordDO.java

@@ -138,4 +138,5 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntityWithCreateTime
        this.packageList = packageList;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/adv/AdvsementMapping.java

@@ -0,0 +1,16 @@
package com.yihu.jw.rm.adv;
public class AdvsementMapping {
    public static class AdvsementReusetMapping{
        public static final String ADVERTISEMENT = "/advertisement";//广告相关
        public static final String SENDADVERTISEMENT = "/send"; //上传广告
        public static final String LAUNCHADVERTISEMENT = "/launch"; //投放广告
        public static final String DELADVERTISEMENT = "/del";//删除广告
        public static final String FORBIDDENADVERTISEMENT = "/forbidden";//禁用广告
        public static final String UPDATE = "/update";//更新广告内容
        public static final String SEL = "/selectByTit";//根据标题模糊查询所有广告
        public static final String SELECTLike = "/selectByLike";//根据标题模糊查询可投放的广告
        }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/advertisement/AdvPlaySetVo.java

@@ -0,0 +1,64 @@
//package com.yihu.jw.restmodel.advertisement;
//
//
//import io.swagger.annotations.ApiModel;
//import io.swagger.annotations.ApiModelProperty;
//
//import javax.persistence.Id;
//
//@ApiModel(value = "AdvPlaySetVo", description = "播放设置")
//public class AdvPlaySetVo {
//    @Id
//    private int id;
//    @ApiModelProperty(value = "method_code")
//    private int methodCode;
//
//    @ApiModelProperty(value = "method_name")
//    private String methodName;
//
//    @ApiModelProperty(value = "interval")
//    private int interval;
//
//    public int getId() {
//        return id;
//    }
//
//    public void setId(int id) {
//        this.id = id;
//    }
//
//    public int getMethodCode() {
//        return methodCode;
//    }
//
//    public void setMethodCode(int methodCode) {
//        this.methodCode = methodCode;
//    }
//
//    public String getMethodName() {
//        return methodName;
//    }
//
//    public void setMethodName(String methodName) {
//        this.methodName = methodName;
//    }
//
//    public int getInterval() {
//        return interval;
//    }
//
//    public void setInterval(int interval) {
//        this.interval = interval;
//    }
//
//    @Override
//    public String toString() {
//        return "AdvPlaySetVo{" +
//                "id=" + id +
//                ", methodCode=" + methodCode +
//                ", methodName='" + methodName + '\'' +
//                ", interval=" + interval +
//                '}';
//    }
//
//}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/advertisement/AdvertisementPuttingAdminVO.java

@@ -0,0 +1,151 @@
package com.yihu.jw.restmodel.advertisement;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.data.annotation.LastModifiedBy;
import javax.persistence.Column;
import java.util.Date;
@ApiModel(value = "AdvertisementPuttingAdminVO", description = "广告管理")
public class AdvertisementPuttingAdminVO extends UuidIdentityEntityWithOperator {
    @ApiModelProperty(value = "标题")
    private String title;//标题
    @ApiModelProperty(value = "广告分类")
    private Integer categoryCode; //广告类型 1视频 2图片
    @ApiModelProperty(value = "广告分类名")
    private String categoryName;//缩略图
    @ApiModelProperty(value = "路径")
    private String url;//视频或图片路径
    @ApiModelProperty(value = "删除状态")
    private Integer del; //是否删除 1删除 0没删除
    @ApiModelProperty(value = "投放状态")
    private Integer launch; //是否投放 1投放
    @ApiModelProperty(value = "是否禁用")
    private Integer forbidden; //是否禁用 1禁用
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    public Integer getCategoryCode() {
        return categoryCode;
    }
    public void setCategoryCode(Integer categoryCode) {
        this.categoryCode = categoryCode;
    }
    public String getCategoryName() {
        return categoryName;
    }
    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Integer getLaunch() {
        return launch;
    }
    public void setLaunch(Integer launch) {
        this.launch = launch;
    }
    public Integer getForbidden() {
        return forbidden;
    }
    public void setForbidden(Integer forbidden) {
        this.forbidden = forbidden;
    }
    //更新者
    @LastModifiedBy
    @Column(name = "update_user_username")
    private String updateUserName;
    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "create_user", updatable = false)
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "create_user_name", updatable = false)
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time", length = 0)
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "update_user")
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
}

svr/svr-base/pom.xml

@@ -214,7 +214,21 @@
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
        <!--视频缩略图-->
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>javacv</artifactId>
            <version>0.8</version>
        </dependency>
        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-core</artifactId>
            <version>3.4.0</version>
        </dependency>
    </dependencies>
    <build>

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

@@ -0,0 +1,19 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicinedevice, String> {
    //所有设备
    @Query("select count(1) from Mediicinedevice a ")
    long countAll();
    //在线设备 离线设备 直接减
    @Query("select count(1) from Mediicinedevice a where a.status = 1 ")
    long countOnline();
}

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

@@ -0,0 +1,17 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineuser;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicineUserDao extends PagingAndSortingRepository<Mediicineuser, String> {
    //显示用户明细
    @Query("select a from Mediicineuser a  ")
    List<Mediicinedrugs> getorderdetail();
}

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

@@ -0,0 +1,16 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicinedrugsDao extends PagingAndSortingRepository<Mediicinedrugs, String> {
    //返回订单明细
    @Query("select a from Mediicinedrugs a  ")
    List<Mediicinedrugs> getorderdetail();
}

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

@@ -0,0 +1,23 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.patient.Message;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineorder, Long>, JpaSpecificationExecutor<Mediicineorder> {
    //统计时间段的销售额
    @Query("select sum(a.amount) from Mediicineorder a where a.prescribeTime >=?1 and a.prescribeTime<=?2")
    float getsumamount(Date beg , Date end);
    //统计时间段的天的订单数量
    @Query("select count(1) from Mediicineorder a where a.prescribeTime >= ?1 and a.prescribeTime<=?2")
    int getcount(Date beg , Date end);
}

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

@@ -0,0 +1,22 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
public interface MediicineorderdetailDao extends PagingAndSortingRepository<Mediicineorderdetail, String> {
    //统计时间段的药品销量
    @Query("select sum(a.quantity) from Mediicineorderdetail a where a.prescribeTime >=  ?1 and a.prescribeTime<= ?2")
    float getsumquantity(Date beg , Date end);
    //返回订单明细
    @Query("select a from Mediicineorderdetail a where a.idOrder =  ?1 ")
    List<Mediicineorderdetail> getorderdetail(String idOrder);
}

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

@@ -0,0 +1,19 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicinestockoutDao extends PagingAndSortingRepository<Mediicinestockout, String> {
    //返回出货信息
    @Query("select a from Mediicinestockout a")
    List<Mediicinestockout> getlist();
}

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

@@ -0,0 +1,20 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicinestockoutdetailDao extends PagingAndSortingRepository<Mediicinestockoutdetail, String> {
    //按订单号出货明细
    @Query("select a from Mediicinestockoutdetail a where a.idOrder =  ?1 ")
    List<Mediicinestockoutdetail> getoutdetailbyorderid(String idOrder);
    //按出货明细
    @Query("select a from Mediicinestockoutdetail a where a.idStockOut =  ?1 ")
    List<Mediicinestockoutdetail> getoutdetail(String idstockout);
}

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

@@ -0,0 +1,17 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicinestockupDao extends PagingAndSortingRepository<Mediicinestockup, String> {
    //返回出货信息
    @Query("select a from Mediicinestockup a  ")
    List<Mediicinestockup> getlist();
}

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

@@ -0,0 +1,16 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinestockupdetail;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicinestockupdetailDao extends PagingAndSortingRepository<Mediicinestockupdetail, String> {
    //按订单号出货明细
    @Query("select a from Mediicinestockupdetail a where a.idStockUp =  ?1 ")
    List<Mediicinestockupdetail> getoutdetail(String idstockup);
}

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

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinestore;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.sql.Date;
import java.util.List;
public interface MediicinestoreDao extends PagingAndSortingRepository<Mediicinestore, String> {
    //所有设备
    @Query("select a from Mediicinestore a where a.longtime >=  ?1 and a.longtime<= ?2")
    List<Mediicinestore> get蔽(Date beg , Date end);
    //所有设备
    @Query("select a from Mediicinestore a where a.longtime >=  ?1 and a.longtime<= ?2")
    List<Mediicinestore> se(Date beg , Date end);
}

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

@@ -0,0 +1,36 @@
package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
public interface MediicinewarrayDao extends PagingAndSortingRepository<Mediicinewarray, String> {
    //温度报警
    @Query("select a from Mediicinewarray a where a.type='temperature' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> gettemperature(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
    //湿度报警
    @Query("select a from Mediicinewarray a where a.type='humidity' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> gethumidity(String idDevice,String equClass,float networkStatus,float humiditybeg,float humidityend,String codename,Date beg , Date end);
    //离线报警
    @Query("select a from Mediicinewarray a where a.type='offline' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> getoffline(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
    //故障报警
    @Query("select a from Mediicinewarray a where a.type='fault' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> getfault(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
    //网络报警
    @Query("select a from Mediicinewarray a where a.type='network' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> getnetwork(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
    //流量报警
    @Query("select a from Mediicinewarray a where a.type='flow' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> getflow(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
    //到期报警
    @Query("select a from Mediicinewarray a where a.type='exceed' and a.idDevice like %?1% and a.equClass like  %?2% and  (?3 = -999  or a.networkStatus=?3 ) and  (?4 = -999  or (a.temperature between ?4 and ?5)) and ( a.equName like %?6% or a.equNum like %?6%  ) and a.logTime between ?7 and  ?8 ")
    List<Mediicinewarray> getexceed(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,Date beg , Date end);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvPlaySetDAO.java

@@ -0,0 +1,12 @@
//package com.yihu.jw.base.dao.advertisement;
//
//import com.yihu.jw.restmodel.advertisement.AdvPlaySetVo;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//
//import java.util.List;
//
//public interface AdvPlaySetDAO extends PagingAndSortingRepository<AdvPlaySetVo,String> {
//    @Query(value = "select * from adv_play_set",nativeQuery = true)
//    List<AdvPlaySetVo> lists();
//}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvertisementPuttingAdminDAO.java

@@ -0,0 +1,64 @@
package com.yihu.jw.base.dao.advertisement;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import org.apache.ibatis.annotations.Insert;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
public interface AdvertisementPuttingAdminDAO extends PagingAndSortingRepository<AdvertisementPuttingAdminDO, String>, JpaSpecificationExecutor<AdvertisementPuttingAdminDO> {
    @Query(value = "select * FROM advertisement_putting_admin  where id=?1",nativeQuery = true) //查询id为参数的数据信息 主要用于删除禁用投放操作
    AdvertisementPuttingAdminDO findAdvertisementPuttingAdminDOById(String id);
    @Query(value = "select * from advertisement_putting_admin order by update_time  desc limit ?1,?2",nativeQuery = true) //按照修改时间进行排序 并从前端页面获取请求分页的数据
    List<AdvertisementPuttingAdminDO>findAdvertisementPuttingAdminUtilsByUpdateTime(int page,int size);
    @Query(value = "select * from advertisement_putting_admin where del=0 and launch = 1 and forbidden = 0 order by update_time desc limit ?1,?2" ,nativeQuery = true)//查询所有不在删除状态并且处于投放状态并且没有被禁用的数据 可以用于投放广告的播放
    List<AdvertisementPuttingAdminDO>findAdvertisementPuttingAdminUtilsByDelStatusAndLaunchStatusAndForbiddenStatus(int page,int size);
    @Query(value = "select * from advertisement_putting_admin where title like concat('%',?1,'%') order by update_time desc limit ?2,?3",nativeQuery = true)//按照标题模糊查询所有数据
    List<AdvertisementPuttingAdminDO>findAdvertisementSByLike(String title,int page,int size);
    @Query(value = "select * from advertisement_putting_admin where title like concat('%',?1,'%') and del = 0 and launch = 1 and forbidden = 0 order by update_time desc limit ?2,?3" ,nativeQuery = true)//按照标题模糊查询可以使用的数据
    List<AdvertisementPuttingAdminDO>findAdvertisementsCanByLike(String title,int page,int size);
    @Transactional
    @Modifying
    @Query(value = "update advertisement_putting_admin set del=0 where id=?1",nativeQuery = true)//取消删除
    void updateDelStatus(String id);
    @Transactional
    @Modifying
    @Query(value = "update advertisement_putting_admin set del=1 where id=?1",nativeQuery = true)//将广告设置为删除状态
    void updateDelStatusTo1(String id);
    @Transactional
    @Modifying
    @Query(value = "update advertisement_putting_admin set launch=0 where id=?1 ",nativeQuery = true)//取消广告投放
    void updateLaunStatus(String id);
    @Transactional
    @Modifying
    @Query(value = "update advertisement_putting_admin set launch=1 where id=?1",nativeQuery = true)//广告投放
    void updateLaunStatusTo1(String id);
    @Transactional
    @Modifying
    @Query(value = "update advertisement_putting_admin set forbidden=1 where id=?1",nativeQuery = true)//禁用广告
    void updateForbiddenStatusTo1(String id);
    @Transactional
    @Modifying
    @Query(value = "update advertisement_putting_admin set forbidden=0 where id=?1",nativeQuery = true)//取消禁用广告
    void updateForbiddenStatus(String id);
//    @Transactional
//    @Modifying
//    @Query(value = "update advertisement_putting_admin set playId=?1 where playId in (1,3)" ,nativeQuery = true)
//    void updatePlay(int playId);
}

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

@@ -0,0 +1,39 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.restmodel.base.area.BaseCityVO;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "设备管理")
@RestController
@RequestMapping("/MedicineDeviceEndpoint")
public class MedicineDeviceEndpoint {
    @Autowired
    MedicinedeviceService deviceService;
    @ApiOperation(value = "获取设备总数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/countall")
    public Long countall(){
        return deviceService.countAll();
    }
    @ApiOperation(value = "获取在线设备总数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/countOnline")
    public Long countOnline(){
        return deviceService.countOnline();
    }
}

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

@@ -0,0 +1,58 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineDrugsService;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "药品信息")
@RestController
@RequestMapping("/MedicineDrugsEndpoint")
public class MedicineDrugsEndpoint {
    @Autowired
    MedicineDrugsService drugsService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
    private ObjectMapper objectMapper;
    @ApiOperation(value = "提交药品列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")
    public List<Mediicinedrugs> list(){
        return drugsService.getMediicinedrugs();
    }
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")
//    public PageEnvelop<Mediicineorder> findDevices(
//            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
//            @RequestParam(value = "fields", required = false) String fields,
//            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
//            @RequestParam(value = "filters", required = false) String filters,
//            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
//            @RequestParam(value = "sorts", required = false) String sorts,
//            @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){
//        try {
//            List<Mediicineorder> list = deviceManageService.search(fields,filters,sorts,page,size);
//            int count = (int) deviceManageService.getCount(filters);
//            return success(list, count, page, size, Mediicineorder.class);
//        }catch (Exception e){
//            return failedPageEnvelopException2(e);
//        }
//
//    }
}

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

@@ -0,0 +1,105 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "处方订单列表")
@RestController
@RequestMapping("/MedicineOrderEndpoint")
public class MedicineOrderEndpoint {
    @Autowired
    MedicinedeviceService deviceService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
    private ObjectMapper objectMapper;
//------合计类
    @ApiOperation(value = "获得时间段内的销售金额", notes="获得时间段内的销售金额")
    @GetMapping("/sumamount")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
    public float sumamount(String beg, String end){
        return orderservice.sumamount(beg, end);
    }
    @ApiOperation(value = "获取订单数量", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getcount")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
    public float getcount(String beg, String end){
        return orderservice.getcount(beg, end);
    }
    @ApiOperation(value = "获时间段内的取药品销售数量合计", notes="获取药品信息")
    @GetMapping("/getsumquantity")
    @ApiImplicitParams({
            @ApiImplicitParam(name="beg",value="开始日期 yyyy-mm-dd",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期 yyyy-mm-dd",dataType="string", paramType = "query")})
    public float getsumquantity(String beg, String end){
        return orderservice.getsumquantity(beg, end);
    }
//---------操作类
    @ApiOperation(value = "获取订货药品信息【订单明细】", notes="获取药品信息")
    @GetMapping("/getorderdetail")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idOrder",value="订单ID",dataType="string", paramType = "query"),
           })
    public List<Mediicineorderdetail> getorderdetail(String idOrder){
        return orderservice.getorderdetail(idOrder);
    }
    @ApiOperation(value = "获取药品出货信息", notes="获取药品信息")
    @GetMapping("/getoutdetail")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idOrder",value="订单ID",dataType="string", paramType = "query"),
    })
    public List<Mediicinestockoutdetail> getoutdetail(String idOrder){
        return orderservice.getoutdetail(idOrder);
    }
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")
//    public PageEnvelop<Mediicineorder> findDevices(
//            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
//            @RequestParam(value = "fields", required = false) String fields,
//            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
//            @RequestParam(value = "filters", required = false) String filters,
//            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
//            @RequestParam(value = "sorts", required = false) String sorts,
//            @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){
//        try {
//            List<Mediicineorder> list = deviceManageService.search(fields,filters,sorts,page,size);
//            int count = (int) deviceManageService.getCount(filters);
//            return success(list, count, page, size, Mediicineorder.class);
//        }catch (Exception e){
//            return failedPageEnvelopException2(e);
//        }
//
//    }
}

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

@@ -0,0 +1,56 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineStockOutService;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "出货单")
@RestController
@RequestMapping("/MedicineOutEndpoint")
public class MedicineOutEndpoint {
    @Autowired
    MedicineStockOutService stockoutService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
    private ObjectMapper objectMapper;
    @ApiOperation(value = "读出货单列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")
    public List<Mediicinestockout> list(){
        return stockoutService.getoutlist();
    }
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")
//    public PageEnvelop<Mediicineorder> findDevices(
//            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
//            @RequestParam(value = "fields", required = false) String fields,
//            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
//            @RequestParam(value = "filters", required = false) String filters,
//            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
//            @RequestParam(value = "sorts", required = false) String sorts,
//            @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){
//        try {
//            List<Mediicineorder> list = deviceManageService.search(fields,filters,sorts,page,size);
//            int count = (int) deviceManageService.getCount(filters);
//            return success(list, count, page, size, Mediicineorder.class);
//        }catch (Exception e){
//            return failedPageEnvelopException2(e);
//        }
//
//    }
}

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

@@ -0,0 +1,37 @@
package com.yihu.jw.base.endpoint.a4endpoint;//package com.cocoit.medicine.ms.a4endpoint;
//
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.util.List;
//
//@Api(description = "设备管理")
//@RestController
//public class MedicineStoreEndpoint {
//    @Autowired
//    UserService userService;
//    @ApiOperation(value = "获取设备总数量", notes="通过数据区域查询获取")
//    @GetMapping("/medicinedevicecount")
//    @ApiImplicitParam(name = "telephone", value = "运营单位", paramType = "query", required = true)
//    public List<User> medicinedeviceOnlinecount(){
//
//        return userService.Selall();
//    }
//    @ApiOperation(value = "获取otp", notes="通过手机号获取OTP验证码")
//    @GetMapping("/coountx")
//    public Integer medicinedevicecount(){
//        return userService.coountx();
//    }
//
//
//    @ApiOperation(value = "获取otp", notes="通过手机号获取OTP验证码")
//    @ApiImplicitParam(name = "telephone", value = "电话号码", paramType = "query", required = true, dataType = "Integer")
//    @GetMapping("/getUserById")
//    public List<User> getUserById(){
//        return userService.Selall();
//    }
//}

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

@@ -0,0 +1,55 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineStockUpService;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "补货单")
@RestController
@RequestMapping("/MedicineUpEndpoint")
public class MedicineUpEndpoint {
    @Autowired
    MedicineStockUpService stockupService;
    @Autowired
    private ObjectMapper objectMapper;
    @ApiOperation(value = "读出货单列表", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/list")
    public List<Mediicinestockup> list(){
        return stockupService.getuplist();
    }
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")
//    public PageEnvelop<Mediicineorder> findDevices(
//            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
//            @RequestParam(value = "fields", required = false) String fields,
//            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
//            @RequestParam(value = "filters", required = false) String filters,
//            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
//            @RequestParam(value = "sorts", required = false) String sorts,
//            @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){
//        try {
//            List<Mediicineorder> list = deviceManageService.search(fields,filters,sorts,page,size);
//            int count = (int) deviceManageService.getCount(filters);
//            return success(list, count, page, size, Mediicineorder.class);
//        }catch (Exception e){
//            return failedPageEnvelopException2(e);
//        }
//
//    }
}

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

@@ -0,0 +1,48 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineStockOutService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(description = "用户管理")
@RestController
@RequestMapping("/MedicineUserEndpoint")
public class MedicineUserEndpoint {
    @Autowired
    MedicineStockOutService stockoutService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
    private ObjectMapper objectMapper;
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")
//    public PageEnvelop<Mediicineorder> findDevices(
//            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
//            @RequestParam(value = "fields", required = false) String fields,
//            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
//            @RequestParam(value = "filters", required = false) String filters,
//            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
//            @RequestParam(value = "sorts", required = false) String sorts,
//            @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){
//        try {
//            List<Mediicineorder> list = deviceManageService.search(fields,filters,sorts,page,size);
//            int count = (int) deviceManageService.getCount(filters);
//            return success(list, count, page, size, Mediicineorder.class);
//        }catch (Exception e){
//            return failedPageEnvelopException2(e);
//        }
//
//    }
}

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

@@ -0,0 +1,169 @@
package com.yihu.jw.base.endpoint.a4endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineWarrayService;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(description = "报警信息列表")
@RestController
@RequestMapping("/MedicineUpEndpoint")
public class MedicineWarrayEndpoint {
    @Autowired
    MedicineWarrayService warraytService;
    @Autowired
    private MedicineOrderService orderservice;
    @Autowired
    private ObjectMapper objectMapper;
    //温度报警
    @ApiOperation(value = "温度报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/gettemperature")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="temperaturebeg",value="湿度起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="temperatureend",value="温度终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> gettemperature(String idDevice, String equClass, float networkStatus, float temperaturebeg, float temperatureend, String codename, String beg, String end) {
        return   warraytService.gettemperature( idDevice, equClass, networkStatus, temperaturebeg, temperatureend, codename,beg,end);
    }
    //湿度报警
    @ApiOperation(value = "湿度报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/gethumidity")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="humiditybeg",value="湿度起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="humidityend",value="湿度终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> gethumidity(String idDevice,String equClass,float networkStatus,float humiditybeg,float humidityend,String codename,String beg,String end){
        return   warraytService.gethumidity( idDevice, equClass, networkStatus, humiditybeg, humidityend, codename,beg,end);
    }
    //离线报区合计，直接从设备上读取，然后按设备上读取数据合计值
    //离线报警
    @ApiOperation(value = "离线报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getoffline")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="durationbeg",value="时长起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="durationend",value="时长终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> getoffline(String idDevice,String equClass,float networkStatus,float durationbeg,float durationend,String codename,String beg,String end){
        return   warraytService.getoffline( idDevice, equClass, networkStatus, durationbeg, durationend, codename,beg,end);
    }
    //故障报警
    @ApiOperation(value = "故障报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getfault")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countbeg",value="计数起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countend",value="计数终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> getfault(String idDevice,String equClass,float networkStatus,float countbeg,float countend,String codename,String beg,String end){
        return   warraytService.getfault( idDevice, equClass, networkStatus, countbeg, countend, codename,beg,end);
    }
    //网络报警
    @ApiOperation(value = "网络报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getnetwork")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countbeg",value="计数起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countend",value="计数终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> getnetwork(String idDevice,String equClass,float networkStatus,float temperaturebeg,float temperatureend,String codename,String beg,String end){
        return   warraytService.getnetwork( idDevice, equClass, networkStatus, temperaturebeg, temperatureend, codename,beg,end);
    }
    //流量报警
    @ApiOperation(value = "流量报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getflow")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countbeg",value="计数起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countend",value="计数终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> getflow(String idDevice,String equClass,float flowbeg,float flowend,float temperatureend,String codename,String beg,String end) {
        return   warraytService.getflow( idDevice, equClass, flowbeg, flowend, temperatureend, codename,beg,end);
    }
    //到期报警
    @ApiOperation(value = "到期报警", notes="参数未添加通过数据区域查询获取")
    @GetMapping("/getexceed")
    @ApiImplicitParams({
            @ApiImplicitParam(name="idDevice",value="设备id",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="equClass",value="设备类",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="networkStatus",value="网络状态",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countbeg",value="计数起",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="countend",value="计数终",dataType="float", paramType = "query"),
            @ApiImplicitParam(name="codename",value="代号名称",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="beg",value="开日期",dataType="string", paramType = "query"),
            @ApiImplicitParam(name="end",value="结束日期",dataType="string", paramType = "query"),
    })
    public List<Mediicinewarray> getexceed(String idDevice,String equClass,float networkStatus,float countbeg,float countend,String codename,String beg,String end) {
        return   warraytService.getexceed( idDevice, equClass, networkStatus, countbeg, countend, codename,beg,end);
    }
//---------众建平台，无法转移，
//    @GetMapping("getorderlist")
//    @ApiOperation("获取订单列表")
//    public PageEnvelop<Mediicineorder> findDevices(
//            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
//            @RequestParam(value = "fields", required = false) String fields,
//            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
//            @RequestParam(value = "filters", required = false) String filters,
//            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
//            @RequestParam(value = "sorts", required = false) String sorts,
//            @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){
//        try {
//            List<Mediicineorder> list = deviceManageService.search(fields,filters,sorts,page,size);
//            int count = (int) deviceManageService.getCount(filters);
//            return success(list, count, page, size, Mediicineorder.class);
//        }catch (Exception e){
//            return failedPageEnvelopException2(e);
//        }
//
//    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvPlaySetEndPoint.java

@@ -0,0 +1,26 @@
//package com.yihu.jw.base.endpoint.adv;
//
//import com.yihu.jw.base.service.advrtisement.AdvPlaySetService;
//import com.yihu.jw.restmodel.advertisement.AdvPlaySetVo;
//import com.yihu.jw.rm.adv.AdvsementMapping;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiModelProperty;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.util.List;
//
//@RestController
//@RequestMapping(value = "play")
//@Api(value = "播放设置",description = "播放设置",tags = {"播放设置"})
//public class AdvPlaySetEndPoint {
//    @Autowired
//    AdvPlaySetService advPlaySetService;
//
//    @GetMapping("/list")
//    public List<AdvPlaySetVo> list(){
//        return advPlaySetService.list();
//    }
//}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvertisementPuttingAdminEndPoint.java

@@ -0,0 +1,170 @@
package com.yihu.jw.base.endpoint.adv;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.advrtisement.AdvrtisementService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.restmodel.advertisement.AdvertisementPuttingAdminVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.adv.AdvsementMapping;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.text.ParseException;
import java.util.List;
@RestController
@RequestMapping(value = AdvsementMapping.AdvsementReusetMapping.ADVERTISEMENT)
@Api(value = "广告管理",description = "广告管理",tags = {"广告管理"})
public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @Autowired
    AdvrtisementService advrtisementService;
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.DELADVERTISEMENT)
    @ApiOperation(value = "删除广告")
    public String delAdvertisement(@RequestParam String id){
        if (id==null||"".equals(id)){
            return "请确认该广告是否存在！";
        }
        System.out.println(id);
        String str=advrtisementService.updateDelStatus(id);
        System.out.println(str);
        return str;
    }
//    @GetMapping(value = "/single")
//    @ApiOperation(value = "获取单条广告信息")
//    public Envelop doctorHosplist(
//            @ApiParam(name = "id", value = "广告id")
//            @RequestParam(value = "id", required = true) String doctorId) throws Exception {
//        JSONObject jsonObject = advrtisementService.getOneDoctorInfo(doctorId);
//        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
//            return failed(jsonObject.getString("msg"));
//        }
//        return success(jsonObject.getJSONObject("msg"));
//    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.LAUNCHADVERTISEMENT )
    @ApiOperation(value = "投放广告")
    public String launchAdvertisement(@RequestParam String id){
        if (id==null||"".equals(id)){
            return "请确认该广告是否存在！";
        }
        return advrtisementService.updateLaunchStatus(id);
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.FORBIDDENADVERTISEMENT)
    @ApiOperation(value = "禁用广告")
    public String forbiddenAdverisement(@RequestParam String id){
        if (id==null||"".equals(id)){
            return "请确认广告是否存在";
        }
        return advrtisementService.updateForbiddenStatus(id);
    }
    @PostMapping(value = AdvsementMapping.AdvsementReusetMapping.SENDADVERTISEMENT)
    @ApiOperation(value = "新增广告")
    public ObjEnvelop<AdvertisementPuttingAdminVO> sendAdvertisement(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        AdvertisementPuttingAdminDO adminDO=toEntity(jsonData,AdvertisementPuttingAdminDO.class);
        advrtisementService.save(adminDO);
        return success(adminDO,AdvertisementPuttingAdminVO.class);
    }
    @PostMapping(value = AdvsementMapping.AdvsementReusetMapping.UPDATE,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新广告")
    public ObjEnvelop<AdvertisementPuttingAdminVO> update(
            @ApiParam(name = "json_data",value = "json数据",required = true)
            @RequestBody String jsonData) throws IOException {
        AdvertisementPuttingAdminDO adminDO=toEntity(jsonData,AdvertisementPuttingAdminDO.class);
        if (null == adminDO.getId()||"".equals(adminDO.getId())) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        adminDO=advrtisementService.save(adminDO);
        return success(adminDO,AdvertisementPuttingAdminVO.class);
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SEL)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<AdvertisementPuttingAdminVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @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 {
        List<AdvertisementPuttingAdminDO> list = advrtisementService.search(fields, filters, sorts, page, size);
        int count = (int)advrtisementService.getCount(filters);
        return success(list, count, page, size, AdvertisementPuttingAdminVO.class);
    }
//    public List<AdvertisementPuttingAdminDO>findLike(
//            @ApiParam(name = "title",value = "模糊查询",required = false)
//            @RequestParam(value = "title",required = false) String title,
//            @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){
//        if (title==null){
//            return advrtisementService.findAllAdvertisement((page-1)*size,size);
//        }
//        return advrtisementService.titleLike(title,(page-1)*size,size);
//    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SELECTLike)
    @ApiOperation(value = "获取列表")
//    public List<AdvertisementPuttingAdminDO>findLikeCan(
//            @ApiParam(name = "title",value = "模糊查询",required = false,defaultValue = "")
//            @RequestParam(value = "title",required = false) String title,
//            @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) {
//        if (title==null){
//            return advrtisementService.findAdvertisementList((page-1)*size,size);
//        }
//        return advrtisementService.titleLikeAndCan(title,(page-1)*size,size);
//    }
    public ListEnvelop<AdvertisementPuttingAdminVO> page(
            @ApiParam(name = "fields",value = "返回的字段,为空返回全部字段")
            @RequestParam(value = "fields",required = false)String fields,
            @ApiParam(name = "filters",value = "过滤器,为空检索所有条件")
            @RequestParam(name = "filters",required = false)String filters,
            @ApiParam(name = "sorts",value = "排序,规则参见说明文档")
            @RequestParam(value = "sorts",required = false)String sorts) throws ParseException {
        List<AdvertisementPuttingAdminDO>list=advrtisementService.search(fields,filters,sorts);
        return success(list,AdvertisementPuttingAdminVO.class);
    }
//    @GetMapping(value = "/play")
//    @ApiOperation(value = "播放设置")
//    public String updatePlay(@ApiParam(value = "play_id")
//                                 @RequestParam(value = "play_id") int playId){
//        advrtisementService.updatePlay(playId);
//        return "设置成功";
//    }
}

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

@@ -0,0 +1,70 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.util.List;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineDrugsService  {
    @Autowired
    private MediicinedrugsDao drugsDao;
    @Autowired
    private ObjectMapper objectMapper;
    //获取药品信息列表
    public List<Mediicinedrugs> getMediicinedrugs() {
        return drugsDao.getorderdetail();
    }
    public JSONObject saveDmMedicineDevice(String json) throws IOException {
        JSONObject result = new JSONObject();
//        MedicineDevice device = objectMapper.readValue(json,MedicineDevice.class);
//        Integer deviceType = device.getMedicineDeviceType();
//        String categoryCode = device.getCategoryCode();
//        String name = device.getName();
//        String model = device.getCategoryCode();
//        String brands = device.getBrands();
//        String photo =device.getPhoto();
//        String isMultiUser = device.getIsMultiUser();
//        if (null==deviceType||StringUtils.isBlank(categoryCode)||StringUtils.isBlank(name)||StringUtils.isBlank(model)||
//                StringUtils.isBlank(brands)||StringUtils.isBlank(photo)||StringUtils.isBlank(isMultiUser)){
//            result.put(ResponseContant.resultFlag,ResponseContant.fail);
//            result.put(ResponseContant.resultMsg,"数据数据错误,必填字段为空");
//            return result;
//        }
//        //判断型号是否重复
//        MedicineDevice deviceTmp = deviceDao.findByModel(device.getModel());
//        if (null!=deviceTmp){
//            if (null==device.getId()){
//                result.put(ResponseContant.resultFlag,ResponseContant.fail);
//                result.put(ResponseContant.resultMsg,"设备型号已存在");
//                return result;
//            }else if (deviceTmp.getId().longValue()!=device.getId().longValue()){//
//                result.put(ResponseContant.resultFlag,ResponseContant.fail);
//                result.put(ResponseContant.resultMsg,"设备型号已存在");
//                return result;
//            }
//        }
//        if (null==device.getId()){
//            device.setDel("1");
//        }
//        deviceDao.save(device);
//        result.put(ResponseContant.resultFlag,ResponseContant.success);
//        result.put(ResponseContant.resultMsg,"success");
        return result;
    }
}

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

@@ -0,0 +1,70 @@
package com.yihu.jw.base.service.a3service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineorderDao;
import com.yihu.jw.base.dao.a2dao.MediicineorderdetailDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutdetailDao;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.util.date.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineOrderService{
    @Autowired
    private MediicineorderDao orderDao;
    @Autowired
    private MediicineorderdetailDao orderdetailDao;
    @Autowired
    private MediicinestockoutDao stockoutDao;
    @Autowired
    private MediicinestockoutdetailDao stockoutdetailDao;
    @Autowired
    private ObjectMapper objectMapper;
    //订单明细
    public   List<Mediicineorderdetail> getorderdetail(String idOrder) {
      return   orderdetailDao.getorderdetail(idOrder);
    }
    //时间范围内的订单销售额
    public  float sumamount(String beg, String end)
    {
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return orderDao.getsumamount(startDate, endDate);
    }
    //时间范围内的订单数量
    public  float getcount(String beg, String end) {
            Date startDate = DateUtil.strToDateShort(beg);
            Date endDate = DateUtil.strToDateShort(end);
            return orderDao.getsumamount(startDate, endDate);
        }
            //订单明细中的总药品销量
    public  float getsumquantity(String beg, String end) {
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return orderdetailDao.getsumquantity(startDate, endDate);
    }
    //订单明细中的总药品销量
    public  List<Mediicinestockoutdetail> getoutdetail(String idorder) {
        return stockoutdetailDao.getoutdetailbyorderid(idorder);
    }
}

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

@@ -0,0 +1,32 @@
package com.yihu.jw.base.service.a3service;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutdetailDao;
import com.yihu.jw.entity.a1entity.Mediicinestockout;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineStockOutService {
    @Autowired
    private MediicinestockoutDao outDao;
    @Autowired
    private MediicinestockoutdetailDao outdetailDao;
    //订单明细
    public List<Mediicinestockout> getoutlist() {
        return   outDao.getlist();
    }
    //明细
    public List<Mediicinestockoutdetail> getoutdetail(String idstockout) {
        return   outdetailDao.getoutdetail(idstockout);
    }
}

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

@@ -0,0 +1,33 @@
package com.yihu.jw.base.service.a3service;
import com.yihu.jw.base.dao.a2dao.MediicinestockupDao;
import com.yihu.jw.base.dao.a2dao.MediicinestockupdetailDao;
import com.yihu.jw.entity.a1entity.Mediicinestockup;
import com.yihu.jw.entity.a1entity.Mediicinestockupdetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineStockUpService{
    @Autowired
    private MediicinestockupDao upDao;
    @Autowired
    private MediicinestockupdetailDao updetailDao;
    //订单明细
    public List<Mediicinestockup> getuplist() {
        return upDao.getlist();
    }
    //明细
    public List<Mediicinestockupdetail> getupdetail(String idstockup) {
        return updetailDao.getoutdetail(idstockup);
    }
}

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

@@ -0,0 +1,23 @@
package com.yihu.jw.base.service.a3service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinestoreDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineStoreService  {
    @Autowired
    private MediicinestoreDao storeDao;
    @Autowired
    private ObjectMapper objectMapper;
}

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

@@ -0,0 +1,69 @@
package com.yihu.jw.base.service.a3service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinewarrayDao;
import com.yihu.jw.entity.a1entity.Mediicinewarray;
import com.yihu.jw.util.date.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineWarrayService {
    @Autowired
    private MediicinewarrayDao warrayDao;
    @Autowired
    private ObjectMapper objectMapper;
    //温度报警
    public List<Mediicinewarray> gettemperature(String idDevice, String equClass, float networkStatus, float temperaturebeg, float temperatureend, String codename, String beg, String end) {
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.gettemperature( idDevice, equClass, networkStatus, temperaturebeg, temperatureend, codename,startDate,endDate);
    }
    //湿度报警
    public List<Mediicinewarray> gethumidity(String idDevice,String equClass,float networkStatus,float humiditybeg,float humidityend,String codename,String beg,String end){
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.gethumidity( idDevice, equClass, networkStatus, humiditybeg, humidityend, codename,startDate,endDate);
    }
    //离线报警
    public List<Mediicinewarray> getoffline(String idDevice,String equClass,float networkStatus,float durationebeg,float durationend,String codename,String beg,String end){
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.getoffline( idDevice, equClass, networkStatus, durationebeg, durationend, codename,startDate,endDate);
    }
    //故障报警
    public List<Mediicinewarray> getfault(String idDevice,String equClass,float networkStatus,float countbeg,float countend,String codename,String beg,String end){
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.getfault( idDevice, equClass, networkStatus, countbeg, countend, codename,startDate,endDate);
    }
    //网络报警
    public List<Mediicinewarray> getnetwork(String idDevice,String equClass,float networkStatus,float countbeg,float countend,String codename,String beg,String end){
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.getnetwork( idDevice, equClass, networkStatus, countbeg, countend, codename,startDate,endDate);
    }
    //流量报警
    public List<Mediicinewarray> getflow(String idDevice,String equClass,float networkStatus,float flowbeg,float flowend,String codename,String beg,String end) {
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.getflow( idDevice, equClass, networkStatus, flowbeg, flowend, codename,startDate,endDate);
    }
    //到期报警
    public List<Mediicinewarray> getexceed(String idDevice,String equClass,float networkStatus,float durationebeg,float durationend,String codename,String beg,String end) {
        Date startDate = DateUtil.strToDateShort(beg);
        Date endDate = DateUtil.strToDateShort(end);
        return   warrayDao.getexceed( idDevice, equClass, networkStatus, durationebeg, durationend, codename,startDate,endDate);
    }
}

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

@@ -0,0 +1,74 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicinedeviceService  {
    @Autowired
    private MediicineDeviceDao deviceDao;
    @Autowired
    private ObjectMapper objectMapper;
    //获取当前设备数量
    public  long countAll() {
        return deviceDao.countAll();
    }
    //获取当前设备数量
    public  long countOnline() {
        return deviceDao.countOnline();
    }
    public JSONObject saveDmMedicineDevice(String json) throws IOException {
        JSONObject result = new JSONObject();
//        MedicineDevice device = objectMapper.readValue(json,MedicineDevice.class);
//        Integer deviceType = device.getMedicineDeviceType();
//        String categoryCode = device.getCategoryCode();
//        String name = device.getName();
//        String model = device.getCategoryCode();
//        String brands = device.getBrands();
//        String photo =device.getPhoto();
//        String isMultiUser = device.getIsMultiUser();
//        if (null==deviceType||StringUtils.isBlank(categoryCode)||StringUtils.isBlank(name)||StringUtils.isBlank(model)||
//                StringUtils.isBlank(brands)||StringUtils.isBlank(photo)||StringUtils.isBlank(isMultiUser)){
//            result.put(ResponseContant.resultFlag,ResponseContant.fail);
//            result.put(ResponseContant.resultMsg,"数据数据错误,必填字段为空");
//            return result;
//        }
//        //判断型号是否重复
//        MedicineDevice deviceTmp = deviceDao.findByModel(device.getModel());
//        if (null!=deviceTmp){
//            if (null==device.getId()){
//                result.put(ResponseContant.resultFlag,ResponseContant.fail);
//                result.put(ResponseContant.resultMsg,"设备型号已存在");
//                return result;
//            }else if (deviceTmp.getId().longValue()!=device.getId().longValue()){//
//                result.put(ResponseContant.resultFlag,ResponseContant.fail);
//                result.put(ResponseContant.resultMsg,"设备型号已存在");
//                return result;
//            }
//        }
//        if (null==device.getId()){
//            device.setDel("1");
//        }
//        deviceDao.save(device);
//        result.put(ResponseContant.resultFlag,ResponseContant.success);
//        result.put(ResponseContant.resultMsg,"success");
        return result;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvPlaySetService.java

@@ -0,0 +1,18 @@
//package com.yihu.jw.base.service.advrtisement;
//
//import com.yihu.jw.base.dao.advertisement.AdvPlaySetDAO;
//import com.yihu.jw.restmodel.advertisement.AdvPlaySetVo;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service;
//
//import java.util.List;
//
//@Service
//public class AdvPlaySetService {
//    @Autowired
//    AdvPlaySetDAO advPlaySetDAO;
//
//    public List<AdvPlaySetVo> list() {
//        return advPlaySetDAO.lists();
//    }
//}

svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvrtisementService.java

@@ -0,0 +1,183 @@
package com.yihu.jw.base.service.advrtisement;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.advertisement.AdvertisementPuttingAdminDAO;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@Service
public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdminDO, AdvertisementPuttingAdminDAO> {
    @Autowired
    AdvertisementPuttingAdminDAO advertisementPuttingAdminDAO;
    //按照分页查询
    public List<AdvertisementPuttingAdminDO>findAllAdvertisement(int page,int size){
        return advertisementPuttingAdminDAO.findAdvertisementPuttingAdminUtilsByUpdateTime(page, size);
    }
    //可投放的广告
    public List<AdvertisementPuttingAdminDO> findAdvertisementList(int page,int size){
        return advertisementPuttingAdminDAO.findAdvertisementPuttingAdminUtilsByDelStatusAndLaunchStatusAndForbiddenStatus(page, size);
    }
    //根据title模糊分页查询
    //所有广告
    public List<AdvertisementPuttingAdminDO>titleLike(String title,int page,int size){
        return advertisementPuttingAdminDAO.findAdvertisementSByLike(title, page, size);
    }
    //可投放的广告
    public List<AdvertisementPuttingAdminDO>titleLikeAndCan(String title,int page,int size){
        return advertisementPuttingAdminDAO.findAdvertisementsCanByLike(title, page, size);
    }
    //删除
    public String updateDelStatus(String id){
        if (advertisementExist(id)==null){
            return "广告不存在！";
        }
        if (advertisementExist(id).getDel()==0) {
            advertisementPuttingAdminDAO.updateDelStatusTo1(id);
            return "删除成功";
        }else {
            advertisementPuttingAdminDAO.updateDelStatus(id);
            return "广告恢复成功";
        }
    }
    //投放
    public String updateLaunchStatus(String id){
        if (advertisementExist(id)==null) {
            return "广告不存在！";
        }
        if (advertisementExist(id).getDel()==1){
            return "广告已删除";
        }
        if (advertisementExist(id).getForbidden()==1){
            return "广告已禁用";
        }
        if (advertisementExist(id).getLaunch()==1){
            advertisementPuttingAdminDAO.updateLaunStatus(id);
            return "已取消投放！";
        }else {
            advertisementPuttingAdminDAO.updateLaunStatusTo1(id);
            return "已投放广告！";
        }
    }
    //禁用
    public String updateForbiddenStatus(String id){
        if (advertisementExist(id)==null){
            return "广告不存在";
        }
        if (advertisementExist(id).getDel()==1){
            return "广告已删除";
        }
        if (advertisementExist(id).getForbidden()==0) {
           // SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            advertisementPuttingAdminDAO.updateForbiddenStatusTo1(id);
            return "广告已禁用";
        }else {
            advertisementPuttingAdminDAO.updateForbiddenStatus( id);
            return "广告已解禁";
        }
    }
//    //播放设置
//    public void updatePlay(int playId){
//        advertisementPuttingAdminDAO.updatePlay(playId);
//    }
    private AdvertisementPuttingAdminDO advertisementExist(String id){
        AdvertisementPuttingAdminDO advertisementPuttingAdminDO=advertisementPuttingAdminDAO.findAdvertisementPuttingAdminDOById(id);
        if (advertisementPuttingAdminDO==null){
            return null;
        }
        System.out.println(advertisementPuttingAdminDO);
        return advertisementPuttingAdminDO;
    }
//    public JSONObject getOneDoctorInfo(String id) throws Exception{
//        JSONObject result = new JSONObject();
//        if(StringUtils.isEmpty(id)){
//            result.put("msg","parameter id is null ");
//            result.put("response", ConstantUtils.FAIL);
//            return result;
//        }
//
//
//        AdvertisementPuttingAdminDO adminDO = advertisementPuttingAdminDAO.findOne(id);
//        if(null == adminDO){
//            result.put("msg","广告不存在:" + id);
//            result.put("response",ConstantUtils.FAIL);
//            return result;
//        }
//        List<AdvertisementPuttingAdminDO> list = advertisementPuttingAdminDAO.findByDictName("doctor_level");
//        for (AdvertisementPuttingAdminDO advertisementPuttingAdminDO:list){
//            if (adminDO.getCategoryCode()==(advertisementPuttingAdminDO.getCategoryCode())){
//                adminDO.setCategoryName(advertisementPuttingAdminDO.getCategoryName());
//            }
//        }
//        //医生归属业务模块角色信息，非必填，数据可有可没有
//        String[] paramNames = {"doctorCode"};
//        Object[] paramValue = {doctorId};
//        JSONObject jsonObject = new JSONObject();
//        List<BaseTeamMemberDO> baseTeamMemberDO = baseTeamMemberDao.findUseDoctorCode(doctorId);
//        List<BaseTeamDO> teamlist = new ArrayList<>();
//        if (baseTeamMemberDO!=null&&baseTeamMemberDO.size()>0){
//            for (BaseTeamMemberDO baseTeamMemberDO1:baseTeamMemberDO){
//                String teamCode = baseTeamMemberDO1.getTeamCode();
//                BaseTeamDO baseTeamDO = baseTeamDao.findOne(teamCode);
//                teamlist.add(baseTeamDO);
//            }
//            jsonObject.put("teamInfo",teamlist);
//        }
//        List<BaseDoctorRoleDO> roleList = baseDoctorRoleService.findByFields(paramNames,paramValue);
//        jsonObject.put("doctor",doctors);
//        jsonObject.put("role",roleList);
//        List<BaseDoctorHospitalDO> baseDoctorHospitalDO = baseDoctorHospitalDao.findByDoctorCode(doctorId);
//        jsonObject.put("hospital",baseDoctorHospitalDO);
//        result.put("response",ConstantUtils.SUCCESS);
//        result.put("msg",jsonObject);
//        return result;
//    }
//    public AdvertisementPuttingAdminDO saveUpdate(String id,AdvertisementPuttingAdminDO puttingAdminDO) {
//        AdvertisementPuttingAdminDO adminDO=advertisementExist(id);
//        System.out.println(adminDO);
//        if (adminDO!=null){
//            adminDO.setTitle(puttingAdminDO.getTitle());
//            adminDO.setCategoryCode(puttingAdminDO.getCategoryCode());
//            adminDO.setUrl(puttingAdminDO.getUrl());
//            adminDO.setDel(puttingAdminDO.getDel());
//            adminDO.setForbidden(puttingAdminDO.getForbidden());
//            adminDO.setCreateUserName(puttingAdminDO.getCreateUserName());
//            adminDO.setCreateUser(puttingAdminDO.getCreateUserName());
//            adminDO.setCreateTime(puttingAdminDO.getCreateTime());
//            adminDO.setUpdateTime(new Date());
//            adminDO.setUpdateUser(puttingAdminDO.getUpdateUser());
//            adminDO.setUpdateUserName(puttingAdminDO.getUpdateUserName());
//            adminDO.setCategoryName(puttingAdminDO.getCategoryName());
//            return  advertisementPuttingAdminDAO.save(adminDO);
//        }
//        return null;
//    }
}

svr/svr-base/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-base
    name: svr-base-cjs
  cloud:
    config:
      failFast: true

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -381,6 +381,51 @@ express:
  sf_check_word: BEWFSCXSyjt4314rz
---
#心脏中心前置机配置
spring:
  profiles: xzprod
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.16.100.240:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: jkzl
    password: jkzl@2020
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false
#支付支付
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.16.100.65:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://172.16.100.240:8888/
fast-dfs:
  tracker-server: 172.16.100.240:22122 #服务器地址
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: WH000061
  sf_check_word: BEWFSCXSyjt4314rz
---
spring:
  profiles: jwystest

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.consult;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/healthCare/HealthCareEndPoint.java

@@ -33,7 +33,7 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
    private HttpClientUtil httpClientUtil;
    @Value("${wechat.id}")
    private String wechatId;
    public static String entranceHealthCareUrl = "http://172.16.100.240:10023/healthCare/";
    public static String entranceHealthCareUrl = "http://127.0.0.1:10023/healthCare/";
    @GetMapping(value = "doctorAuthentication")
    @ApiOperation(value = "医师身份验证", notes = "医师身份验证")

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/HcyyPrescriptionCotroller.java

@@ -383,7 +383,7 @@ public class HcyyPrescriptionCotroller extends EnvelopRestEndpoint {
    /**
     * 获取检查单据信息
     * 获取检查项目信息
     * @return
     * @throws Exception
     */

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -256,7 +256,7 @@ qywx:
express:
  sf_url: http://mrds-admin-ci.sit.sf-express.com:45478
  sf_code: HD000001
  sa_code: HD000001
  sf_check_word: AAAABBBBCCCCDDDD
---
spring:

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-internet-hospital
    name:  svr-internet-hospital-cjs
  cloud:
    config:
      failFast: true

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientService.java

@@ -251,6 +251,8 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
                e.printStackTrace();
            } catch (MyException e) {
                e.printStackTrace();
            } catch (Exception e) {
                e.printStackTrace();
            }
            patientBrief.setPhoto(uploadedFile.getFullUrl());
        }

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/servicepackage/PackageService.java

@@ -1,5 +1,6 @@
package com.yihu.jw.patient.service.servicepackage;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
@@ -17,7 +18,6 @@ import com.yihu.jw.patient.dao.servicepackage.ServicePackageDao;
import com.yihu.jw.patient.dao.servicepackage.ServicePackageItemDao;
import com.yihu.jw.patient.dao.servicepackage.ServicePackageSignRecordDao;
import com.yihu.jw.patient.service.myFamily.MyFamilyService;
import com.yihu.jw.patient.useragent.UserAgent;
import com.yihu.jw.restmodel.base.doctor.BaseDoctorOrgVO;
import com.yihu.jw.restmodel.base.org.OrgDistanceVO;
import com.yihu.jw.restmodel.patient.signPackage.ServicePackageRecordVO;
@@ -26,7 +26,7 @@ import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -71,7 +71,7 @@ public class PackageService {
    @Autowired
    private PatientLabelDao patientLabelDao;
    public MixEnvelop findPackageService(String city,String saasId ,String labelCode,String labelType,String patient,Integer page,Integer size){
    public MixEnvelop findPackageService(String city, String saasId , String labelCode, String labelType, String patient, Integer page, Integer size){
        String totalSql ="SELECT " +
                " count(1) as total " +