[解决bug]

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

@@ -6,8 +6,10 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "t_mediicine_order")
@@ -235,6 +237,13 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    private String community;
    /**
     * 订单详情
     */
    @Transient
    private List<Mediicineorderdetail> mediicineorderdetails;
    public Mediicineorder() {
    }
@@ -593,4 +602,13 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    public void setShippingType(Integer shippingType) {
        this.shippingType = shippingType;
    }
    @Transient
    public List<Mediicineorderdetail> getMediicineorderdetails() {
        return mediicineorderdetails;
    }
    public void setMediicineorderdetails(List<Mediicineorderdetail> mediicineorderdetails) {
        this.mediicineorderdetails = mediicineorderdetails;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/MenuDO.java

@@ -20,6 +20,11 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	 * 名称
	 */
	private String name;
	/**
	 * 1菜单0按钮
	 */
	private Integer type;
	/**
	 * 请求路径
	 */
@@ -164,4 +169,13 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
	public void setParentName(String parentName) {
		this.parentName = parentName;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
}

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

@@ -231,6 +231,7 @@ public class BaseRequestMapping {
        public static final String getDeviceList = "/getDeviceList";
        public static final String getDeviceInfo = "/getDeviceInfo";
        public static final String getDeviceOrderInfo = "/getDeviceOrderInfo";
        public static final String getDeviceStatistics = "/getDeviceStatistics";
        public static final String getDevicePriceStatistics = "/getDevicePriceStatistics";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/role/MenuVO.java

@@ -17,6 +17,8 @@ public class MenuVO extends UuidIdentityVOWithOperator {
    private String name;
    @ApiModelProperty(value = "请求路径", example = "/usr/var")
    private String url;
    @ApiModelProperty(value = "1菜单0按钮", example = "1/0")
    private Integer type;
    @ApiModelProperty(value = "菜单图标", example = "icon")
    private String icon;
//    @ApiModelProperty(value = "请求方式", example = "get,post")
@@ -135,4 +137,12 @@ public class MenuVO extends UuidIdentityVOWithOperator {
    public void setChecked(Boolean checked) {
        this.checked = checked;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
}

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

@@ -32,6 +32,9 @@ public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineo
    @Query("select a from Mediicineorder a where a.shippingEqu=?1 and a.sellState=1 order by a.shippingTime desc ")
    List<Mediicineorder> findByEquNum(String equNum);
    @Query("select a from Mediicineorder a where a.shippingEqu=?1 and a.shippingTime>=?2 and a.shippingTime<=?3 and a.sellState=1 order by a.shippingTime desc ")
    List<Mediicineorder> findByEquNumAndDate(String equNum,Date startTime,Date endTime);
    Mediicineorder findMediicineorderByPickUpNum(String pickUpNum);

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/MenuDao.java

@@ -26,6 +26,9 @@ public interface MenuDao extends PagingAndSortingRepository<MenuDO, String>, Jpa
    @Query("select count(*) from MenuDO a where a.name = ?1 ")
    int isExistName(String name);
    @Query("select count(*) from MenuDO a where a.name = ?1 and a.parentId=?2")
    int isExistNameAndParentId(String name,String parentId);
    @Query("select count(*) from MenuDO a where a.parentId = ?1 ")
    int countMenuByParentId(String parentId);
}

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

@@ -260,6 +260,18 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(deviceService.getDeviceInfo(deviceId,day));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceOrderInfo)
    @ApiOperation(value = "物联网大屏-获取某台设备订单详情")
    public Envelop getDeviceInfo(
            @ApiParam(name = "deviceId", value = "设备Id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId,
            @ApiParam(name = "startTime", value = "开始时间", required = true)
            @RequestParam(value = "startTime", required = true) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = true)
            @RequestParam(value = "endTime", required = true) String endTime) throws Exception {
        return success(deviceService.getDeviceOrderInfo(deviceId,startTime,endTime));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceList)
    @ApiOperation(value = "物联网大屏-获取设备列表")
    public Envelop getDeviceList() throws Exception {
@@ -342,4 +354,13 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return "更新成功";
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.FINDBYID)
    @ApiOperation(value = "根据设备编码获取设备信息", notes = "根据设备编码获取设备信息")
    public Envelop getdevicedetail(
            @ApiParam(name = "equNum", value = "设备编码", required = true)
            @RequestParam(value = "equNum") String equNum) throws Exception {
        return success(deviceService.findByEquNum(equNum));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/MenuEndpoint.java

@@ -49,7 +49,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        MenuDO menuDO = toEntity(jsonData, MenuDO.class);
        int count = menuService.isExistName(menuDO.getName());
        int count = menuService.isExistNameAndParentId(menuDO.getName(),menuDO.getParentId());
        if(count>0){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Menu.NAME_IS_EXIST), ObjEnvelop.class);
        }
@@ -103,7 +103,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
        if (null == menuDO.getId()) {
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Common.ID_IS_NULL), Envelop.class);
        }
        int count = menuService.isExistName(menuDO.getName());
        int count = menuService.isExistNameAndParentId(menuDO.getName(),menuDO.getParentId());
        if(count>1){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Menu.NAME_IS_EXIST), ObjEnvelop.class);
        }

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

@@ -77,7 +77,7 @@ public class MedOrderService {
            mediicineorder.setDeptNum(params.getString("rx_department_no"));
            mediicineorder.setDeptName(params.getString("rx_department_name"));
            mediicineorder.setDoctorNum(params.getString("rx_doctor_no"));
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(order);
@@ -105,6 +105,7 @@ public class MedOrderService {
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString("drug_use_dose"));
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setMedInfo(jsonObject.getString("package_uint"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString("drug_firm_name"));
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));

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

@@ -318,7 +318,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "    t.allergy_info AS allergyInfo,\n" +
                "    t.info AS info,\n" +
                "    t.social_security_card_num AS socialSecurityCardNum,\n" +
                "    t.belong_community AS belongCommunity\n" +
                "    t.belong_community AS belongCommunity, \n" +
                "    t.community AS community\n" +
                "FROM\n" +
                "    t_mediicine_order AS t left join t_mediicine_device tmd on t.shipping_equ = tmd.equ_num where 1=1 \n";
@@ -1491,6 +1492,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                map.put("qrCodeContent", devicePrintMessage.getPicture());
                map.put("info",devicePrintMessage.getInfo());
            }
            map.put("doctorName",order.getDoctorName());
            map.put("prescriptionDate",DateUtil.dateToStrLong(order.getPrescribeTime()));
            map.put("orderId", order.getId());
            map.put("prescribeNum", order.getPrescribeNum());
            map.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());

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

@@ -44,8 +44,11 @@ public class MedicinedevicePrintMessageService extends BaseJpaService<Medicinede
            printMessageDao.deleteAll();
            List<Mediicinedevice> mediicinedeviceList = mediicineDeviceDao.selectByBelongComminity();
            for (Mediicinedevice mediicinedevice:mediicinedeviceList){
               printMessage.setDeviceId(mediicinedevice.getEquNum());
               printMessageDao.save(printMessage);
                MedicineDevicePrintMessage medicineDevicePrintMessage = new MedicineDevicePrintMessage();
                medicineDevicePrintMessage = printMessage;
                medicineDevicePrintMessage.setId(null);
                medicineDevicePrintMessage.setDeviceId(mediicinedevice.getEquNum());
                printMessageDao.save(medicineDevicePrintMessage);
            }
            return printMessage;

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

@@ -85,6 +85,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicineorderDao mediicineorderDao;
    @Autowired
    private MediicineorderdetailDao mediicineorderdetailDao;
    @Autowired
    private MedicineShipmentLogDao medicineShipmentLogDao;
@@ -3644,6 +3647,24 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    /**
     * 物联网大屏单个设备信息数据
     * @return
     */
    public List<Mediicineorder> getDeviceOrderInfo(String deviceId,String startTime,String endTime) throws ParseException {
        JSONObject jsonObject = new JSONObject();
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        Date startDate = DateUtil.strToDateLong(startTime);
        Date endDate = DateUtil.strToDateLong(endTime);
        List<Mediicineorder> mediicineorderList = mediicineorderDao.findByEquNumAndDate(mediicinedevice.getEquNum(),startDate,endDate);
        for (Mediicineorder mediicineorder:mediicineorderList){
            List<Mediicineorderdetail> mediicineorderdetails = mediicineorderdetailDao.findMediicineorderdetailsByIdOrder(mediicineorder.getId());
            mediicineorder.setMediicineorderdetails(mediicineorderdetails);
        }
        return mediicineorderList;
    }
    /**
     * 总览-设备
     * @param level 1、市级、2、区级、3、社区
@@ -3910,4 +3931,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    public Mediicinedevice findByEquNum(String equNum){
        return deviceDao.findByEquNum(equNum);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/MenuService.java

@@ -123,6 +123,15 @@ public class MenuService extends BaseJpaService<MenuDO, MenuDao> {
        return menuDao.isExistName(name);
    }
    /**
     * 父级菜单名称是否存在
     * @param name
     * @return
     */
    public int isExistNameAndParentId(String name,String parentId){
        return menuDao.isExistNameAndParentId(name,parentId);
    }
    public MenuDO findOne(String id){
        return menuDao.findOne(id);
    }